Skip to content

Commit

Permalink
PLTOS-261: Update to Zephyr v3.4.0 (from v3.3.0) (#8)
Browse files Browse the repository at this point in the history
  • Loading branch information
IvoBCD authored Sep 20, 2023
1 parent b842a71 commit 4a925de
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 14 deletions.
2 changes: 1 addition & 1 deletion .github/actions/action-zephyr/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# SPDX-License-Identifier: Apache-2.0
#

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

RUN pip3 install --no-cache-dir nrfutil

Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# SPDX-License-Identifier: Apache-2.0
#
# Copyright (c) 2020-2021 Blue Clover Devices
# Copyright (c) 2020-2023 Blue Clover Devices

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

RUN pip3 install --no-cache-dir nrfutil

Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ DOCKER_BUILD_ARGS += --network=host
DOCKER_RUN_ARGS :=
DOCKER_RUN_ARGS += --network=none

ZEPHYR_TAG := 3.3.0
ZEPHYR_TAG := 3.4.0
ZEPHYR_SYSROOT := /usr/src/zephyr-$(ZEPHYR_TAG)/zephyr
ZEPHYR_USRROOT := $(HOME)/src/zephyr-$(ZEPHYR_TAG)/zephyr

Expand Down
16 changes: 6 additions & 10 deletions docs/program-nrf52840-dongle.rst
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ For other methods, please refer to `nRF52840 Dongle — Zephyr Project Documenta

These instructions cover two ways to program the device:

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

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

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

#. 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.
#. 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.

.. image:: img/04_add_file.png
:alt: Add File

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

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

.. code-block:: shell
nrfutil dfu usb-serial -pkg hci_usb_h4-nrf52840dongle-2.7.0-dfu.zip -p /dev/ttyACM0
nrfutil dfu usb-serial -pkg hci_usb_h4-nrf52840dongle-3.4.0-dfu.zip -p /dev/ttyACM0
.. code-block:: console
$ nrfutil dfu usb-serial -pkg hci_usb_h4-nrf52840dongle-2.7.0-dfu.zip -p /dev/ttyACM0
$ nrfutil dfu usb-serial -pkg hci_usb_h4-nrf52840dongle-3.4.0-dfu.zip -p /dev/ttyACM0
[####################################] 100%
Device programmed.
$
Expand Down Expand Up @@ -123,7 +123,3 @@ References
https://www.nordicsemi.com/Products/Development-tools/nRF-Connect-for-desktop
.. _nrfutil:
https://github.com/NordicSemiconductor/pc-nrfutil
.. _hci_usb_h4-nrf52840dongle-2.7.0.hex:
https://github.com/bcdevices/ly11-ble-fw/releases/download/v1.1.0/hci_usb_h4-nrf52840dongle-2.7.0.hex
.. _hci_usb_h4-nrf52840dongle-2.7.0-dfu.zip:
https://github.com/bcdevices/ly11-ble-fw/releases/download/v1.1.0/hci_usb_h4-nrf52840dongle-2.7.0-dfu.zip

0 comments on commit 4a925de

Please sign in to comment.