openthread-border-router: Bump firmwares, flasher, and OTBR to latest…

… versions (#3808) Co-authored-by: Stefan Agner <[email protected]> Co-authored-by: Franck Nijhof <[email protected]>
home-assistant · Nov 15, 2024 · 5a91f7a · 5a91f7a
1 parent 7678e87
commit 5a91f7a
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 6 deletions.
diff --git a/openthread_border_router/CHANGELOG.md b/openthread_border_router/CHANGELOG.md
@@ -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

diff --git a/openthread_border_router/Dockerfile b/openthread_border_router/Dockerfile
@@ -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

diff --git a/openthread_border_router/build.yaml b/openthread_border_router/build.yaml
@@ -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
diff --git a/openthread_border_router/config.yaml b/openthread_border_router/config.yaml
@@ -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

diff --git a/openthread_border_router/rootfs/etc/s6-overlay/scripts/otbr-agent-rest-discovery.sh b/openthread_border_router/rootfs/etc/s6-overlay/scripts/otbr-agent-rest-discovery.sh
@@ -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)" \
 )
 
 # Send discovery info

diff --git a/openthread_border_router/rootfs/etc/s6-overlay/scripts/universal-silabs-flasher-up b/openthread_border_router/rootfs/etc/s6-overlay/scripts/universal-silabs-flasher-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
@@ -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"

diff --git a/...p_2.4.0.0_GitHub-7074a43e4_gsdk_4.4.3.gbl → ...p_2.4.4.0_GitHub-7074a43e4_gsdk_4.4.4.gbl b/...p_2.4.0.0_GitHub-7074a43e4_gsdk_4.4.3.gbl → ...p_2.4.4.0_GitHub-7074a43e4_gsdk_4.4.4.gbl
diff --git a/...p_2.4.0.0_GitHub-7074a43e4_gsdk_4.4.3.gbl → ...p_2.4.4.0_GitHub-7074a43e4_gsdk_4.4.4.gbl b/...p_2.4.0.0_GitHub-7074a43e4_gsdk_4.4.3.gbl → ...p_2.4.4.0_GitHub-7074a43e4_gsdk_4.4.4.gbl