Skip to content

Commit 4a925de

Browse files
authored
PLTOS-261: Update to Zephyr v3.4.0 (from v3.3.0) (#8)
https://github.com/zephyrproject-rtos/zephyr/releases/tag/v3.4.0
1 parent b842a71 commit 4a925de

File tree

4 files changed

+10
-14
lines changed

4 files changed

+10
-14
lines changed

.github/actions/action-zephyr/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# SPDX-License-Identifier: Apache-2.0
55
#
66

7-
FROM ghcr.io/bcdevices/zephyr:v3.3.0-7
7+
FROM ghcr.io/bcdevices/zephyr:v3.4.0-0
88

99
RUN pip3 install --no-cache-dir nrfutil
1010

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
# SPDX-License-Identifier: Apache-2.0
22
#
3-
# Copyright (c) 2020-2021 Blue Clover Devices
3+
# Copyright (c) 2020-2023 Blue Clover Devices
44

5-
FROM ghcr.io/bcdevices/zephyr:v3.3.0-7
5+
FROM ghcr.io/bcdevices/zephyr:v3.4.0-0
66

77
RUN pip3 install --no-cache-dir nrfutil
88

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ DOCKER_BUILD_ARGS += --network=host
2727
DOCKER_RUN_ARGS :=
2828
DOCKER_RUN_ARGS += --network=none
2929

30-
ZEPHYR_TAG := 3.3.0
30+
ZEPHYR_TAG := 3.4.0
3131
ZEPHYR_SYSROOT := /usr/src/zephyr-$(ZEPHYR_TAG)/zephyr
3232
ZEPHYR_USRROOT := $(HOME)/src/zephyr-$(ZEPHYR_TAG)/zephyr
3333

docs/program-nrf52840-dongle.rst

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ For other methods, please refer to `nRF52840 Dongle — Zephyr Project Documenta
1313

1414
These instructions cover two ways to program the device:
1515

16-
#. Using `Nordic nRF Connect for Desktop`_ to program the `hci_usb_h4-nrf52840dongle-2.7.0.hex`_ file.
17-
#. Using `nrfutil`_ to program the `hci_usb_h4-nrf52840dongle-2.7.0-dfu.zip`_ file.
16+
#. Using `Nordic nRF Connect for Desktop`_ to program the `hci_usb_h4-nrf52840dongle-3.4.0.hex` file.
17+
#. Using `nrfutil`_ to program the `hci_usb_h4-nrf52840dongle-3.4.0-dfu.zip` file.
1818

1919
In both cases, you will first need to put the nRF52840-Dongle Board into the factory bootloader:
2020

@@ -56,12 +56,12 @@ Using Nordic nRF Connect for Desktop
5656
.. image:: img/03_open_dfu_bootloader.png
5757
:alt: Click the "Open DFU Bootloader" device.
5858

59-
#. Now, either click the "Add File" button to browse for the `hci_usb_h4-nrf52840dongle-2.7.0.hex` file, or drag it to the Drag & Drop area.
59+
#. Now, either click the "Add File" button to browse for the `hci_usb_h4-nrf52840dongle-3.4.0.hex` file, or drag it to the Drag & Drop area.
6060

6161
.. image:: img/04_add_file.png
6262
:alt: Add File
6363

64-
#. With the `hci_usb_h4-nrf52840dongle-2.7.0.hex` file selected, you can now click the "Write" button to program the dongle.
64+
#. With the `hci_usb_h4-nrf52840dongle-3.4.0.hex` file selected, you can now click the "Write" button to program the dongle.
6565

6666
.. image:: img/05_write.png
6767
:alt: Click the "Write" button.
@@ -85,11 +85,11 @@ Using nrfutil
8585

8686
.. code-block:: shell
8787
88-
nrfutil dfu usb-serial -pkg hci_usb_h4-nrf52840dongle-2.7.0-dfu.zip -p /dev/ttyACM0
88+
nrfutil dfu usb-serial -pkg hci_usb_h4-nrf52840dongle-3.4.0-dfu.zip -p /dev/ttyACM0
8989
9090
.. code-block:: console
9191
92-
$ nrfutil dfu usb-serial -pkg hci_usb_h4-nrf52840dongle-2.7.0-dfu.zip -p /dev/ttyACM0
92+
$ nrfutil dfu usb-serial -pkg hci_usb_h4-nrf52840dongle-3.4.0-dfu.zip -p /dev/ttyACM0
9393
[####################################] 100%
9494
Device programmed.
9595
$
@@ -123,7 +123,3 @@ References
123123
https://www.nordicsemi.com/Products/Development-tools/nRF-Connect-for-desktop
124124
.. _nrfutil:
125125
https://github.com/NordicSemiconductor/pc-nrfutil
126-
.. _hci_usb_h4-nrf52840dongle-2.7.0.hex:
127-
https://github.com/bcdevices/ly11-ble-fw/releases/download/v1.1.0/hci_usb_h4-nrf52840dongle-2.7.0.hex
128-
.. _hci_usb_h4-nrf52840dongle-2.7.0-dfu.zip:
129-
https://github.com/bcdevices/ly11-ble-fw/releases/download/v1.1.0/hci_usb_h4-nrf52840dongle-2.7.0-dfu.zip

0 commit comments

Comments
 (0)