Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

openthread-border-router: Bump firmwares, flasher, and OTBR to latest versions #3808

Merged
merged 12 commits into from
Nov 15, 2024
Merged

openthread-border-router: Bump firmwares, flasher, and OTBR to latest versions #3808

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
73bfaae
Bump firmwares
puddly Oct 21, 2024
2803fbb
Bump flasher
puddly Oct 21, 2024
bb5b198
Bump OTBR itself
puddly Oct 21, 2024
75feb65
Bump versions
puddly Oct 21, 2024
d76c021
Bump Thread version to 1.4
puddly Oct 21, 2024
04d91f0
Disable `DHCPV6_PD_REF`
puddly Oct 21, 2024
0a5eeb4
Revert "Bump Thread version to 1.4"
puddly Nov 14, 2024
22eb17c
Bump flasher and OTBR
puddly Nov 14, 2024
d883e81
Coprocessor version API
puddly Nov 14, 2024
c3a1b1c
Revert "Coprocessor version API"
puddly Nov 14, 2024
d4d12ca
Broadcast the current device and firmware in discovery
puddly Nov 14, 2024
bc15777
Update openthread_border_router/CHANGELOG.md
frenck Nov 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions openthread_border_router/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# Changelog

## 2.12.0
- Bump universal-silabs-flasher to 0.0.23
- Bump OTBR firmwares to latest versions
- Bump to OTBR POSIX version b041fa52daa (2024-11-14 08:18:28 -0800)
- Add radio firmware version to discovery information

## 2.11.1

- Fix issue with USB TI CC2652 based devices
Expand Down
1 change: 1 addition & 0 deletions openthread_border_router/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ ENV PLATFORM debian
ENV RELEASE 1
ENV WEB_GUI 1
ENV REST_API 1
ENV DHCPV6_PD_REF 0
ENV DOCKER 1

COPY 0001-support-deleting-the-dataset.patch /usr/src
Expand Down
4 changes: 2 additions & 2 deletions openthread_border_router/build.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@ build_from:
aarch64: ghcr.io/home-assistant/aarch64-base-debian:bookworm
amd64: ghcr.io/home-assistant/amd64-base-debian:bookworm
args:
OTBR_VERSION: ff7227ea9a2dc0e50f92ab93bd5c9a29e82fe793
UNIVERSAL_SILABS_FLASHER: 0.0.22
OTBR_VERSION: b041fa52daaa4dfbf6aa4665d8925c1be0350ca5
UNIVERSAL_SILABS_FLASHER: 0.0.25
2 changes: 1 addition & 1 deletion openthread_border_router/config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
version: 2.11.1
version: 2.12.0
slug: openthread_border_router
name: OpenThread Border Router
description: OpenThread Border Router add-on
Expand Down
2 changes: 2 additions & 0 deletions openthread_border_router/rootfs/etc/s6-overlay/scripts/otbr-agent-rest-discovery.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ declare config
config=$(bashio::var.json \
host "$(bashio::addon.hostname)" \
port "^8081" \
device "$(bashio::config 'device')" \
firmware "$(ot-ctl rcp version | head -n 1)" \
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🛠️ Refactor suggestion

Add error handling for firmware version retrieval

The current implementation might fail silently if ot-ctl is not available or returns an error. Consider adding error handling and validation.

Here's a suggested improvement:

-    firmware "$(ot-ctl rcp version | head -n 1)" \
+    firmware "$(if output=$(ot-ctl rcp version 2>/dev/null); then echo "$output" | head -n 1; else echo "unknown"; fi)" \

This change will:

  1. Capture potential errors from ot-ctl
  2. Return "unknown" if the command fails
  3. Prevent the JSON construction from failing due to command errors
📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
firmware "$(ot-ctl rcp version | head -n 1)" \
firmware "$(if output=$(ot-ctl rcp version 2>/dev/null); then echo "$output" | head -n 1; else echo "unknown"; fi)" \

)

# Send discovery info
Expand Down
6 changes: 3 additions & 3 deletions openthread_border_router/rootfs/etc/s6-overlay/scripts/universal-silabs-flasher-up
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ fi
# Assume to run on Yellow if UART4 is mapped to ttyAMA1
if [ -d /sys/devices/platform/soc/fe201800.serial/tty/ttyAMA1 ] && [ "${device}" == "/dev/ttyAMA1" ]; then
bashio::log.info "Detected Home Assistant Yellow"
firmware="yellow_ot-rcp_2.4.0.0_GitHub-7074a43e4_gsdk_4.4.3.gbl"
firmware="yellow_openthread_rcp_2.4.4.0_GitHub-7074a43e4_gsdk_4.4.4.gbl"
gpio_reset_flag="--bootloader-reset yellow"
else
# Check device manufacturer/product information
Expand All @@ -52,9 +52,9 @@ else

bashio::log.info "Checking ${device} identifying ${usb_product} from ${usb_manufacturer}."
if [[ "${usb_manufacturer}" == "Nabu Casa" && "${usb_product}" == "SkyConnect"* ]]; then
firmware="skyconnect_ot-rcp_2.4.0.0_GitHub-7074a43e4_gsdk_4.4.3.gbl"
firmware="skyconnect_openthread_rcp_2.4.4.0_GitHub-7074a43e4_gsdk_4.4.4.gbl"
elif [[ "${usb_manufacturer}" == "Nabu Casa" && "${usb_product}" == "Home Assistant Connect ZBT-1"* ]]; then
firmware="skyconnect_ot-rcp_2.4.0.0_GitHub-7074a43e4_gsdk_4.4.3.gbl"
firmware="skyconnect_openthread_rcp_2.4.4.0_GitHub-7074a43e4_gsdk_4.4.4.gbl"
elif [[ "${usb_manufacturer}" == "ITEAD" && "${usb_product}" == "SONOFF Zigbee 3.0 USB Dongle Plus V2" ]]; then
firmware="ot-rcp-v2.4.2.0-zbdonglee-460800.gbl"
gpio_reset_flag="--bootloader-reset sonoff"
Expand Down
Binary file renamed ...p_2.4.0.0_GitHub-7074a43e4_gsdk_4.4.3.gbl → ...p_2.4.4.0_GitHub-7074a43e4_gsdk_4.4.4.gbl
View file
Open in desktop
Binary file not shown.
Binary file renamed ...p_2.4.0.0_GitHub-7074a43e4_gsdk_4.4.3.gbl → ...p_2.4.4.0_GitHub-7074a43e4_gsdk_4.4.4.gbl
View file
Open in desktop
Binary file not shown.