Merge pull request #58 from darkxst/4.4.1

Builds for Gecko 4.4.1
darkxst · Feb 27, 2024 · b4e1fee · b4e1fee
2 parents 6ce4f0c + 07e70cf
commit b4e1fee
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 14 deletions.
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
@@ -2,10 +2,10 @@
 // README at: https://github.com/devcontainers/templates/tree/main/src/docker-existing-dockerfile
 {
 	"name": "Silabs Firmware Builder",
-	"image": "ghcr.io/darkxst/silabs-firmware-builder:4.4.0",
+	"image": "ghcr.io/darkxst/silabs-firmware-builder:4.4.1",
 
     "containerEnv": {
-        "GECKO_SDK_VERSION": "v4.4.0"
+        "GECKO_SDK_VERSION": "v4.4.1"
     }
 	// Features to add to the dev container. More info: https://containers.dev/features.
 	// "features": {},

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -16,7 +16,7 @@ on:
   workflow_dispatch:
 
 env:
-  sdk_version: 4.4.0
+  sdk_version: 4.4.1
 
 jobs:
   build-container:
@@ -26,8 +26,8 @@ jobs:
       packages: write
     outputs:
       sdk_version: ${{ env.sdk_version }}
-      ot_version: 2.4.0.0
-      ezsp_version: 7.4.0.0
+      ot_version: 2.4.1.0
+      ezsp_version: 7.4.1.0
     steps:
       - uses: actions/[email protected]
       - name: Log in to the GitHub container registry
@@ -157,7 +157,7 @@ jobs:
       sdk_version: ${{ needs.build-container.outputs.sdk_version}}
       metadata_fw_type: "ot-rcp"
       baudrate: ${{ matrix.baudrate }}
-      metadata_extra: "{ \"ot_rcp_version\": \"SL-OPENTHREAD/2.4.0.0_GitHub-7074a43e4\" }"
+      metadata_extra: "{ \"ot_rcp_version\": \"SL-OPENTHREAD/2.4.1.0_GitHub-7074a43e4\" }"
 
   collect_artifacts:
     name: download and publish all artifacts

diff --git a/Dockerfile b/Dockerfile
@@ -48,7 +48,7 @@ RUN \
 
 ENV PATH="$PATH:/opt/arm-gnu-toolchain-${GCC_ARM_VERSION}-x86_64-arm-none-eabi/bin"
 
-ARG GECKO_SDK_VERSION="v4.4.0"
+ARG GECKO_SDK_VERSION="v4.4.1"
 
 RUN \
     git clone --depth 1 -b ${GECKO_SDK_VERSION} \

diff --git a/EmberZNet/SLZB-07/0001-config-configure-usart-vcom-B1B0-D3D4.patch b/EmberZNet/SLZB-07/0001-config-configure-usart-vcom-B1B0-D3D4.patch
@@ -26,13 +26,13 @@
 -// #define SL_IOSTREAM_USART_VCOM_CTS_PIN         12
 +// USART0 CTS on PD03
 +#define SL_IOSTREAM_USART_VCOM_CTS_PORT          gpioPortB
-+#define SL_IOSTREAM_USART_VCOM_CTS_PIN           1
++#define SL_IOSTREAM_USART_VCOM_CTS_PIN           0
 
 -// #define SL_IOSTREAM_USART_VCOM_RTS_PORT        gpioPortC
 -// #define SL_IOSTREAM_USART_VCOM_RTS_PIN         8
 +// USART0 RTS on PD04
 +#define SL_IOSTREAM_USART_VCOM_RTS_PORT          gpioPortB
-+#define SL_IOSTREAM_USART_VCOM_RTS_PIN           0
++#define SL_IOSTREAM_USART_VCOM_RTS_PIN           1
  // [USART_SL_IOSTREAM_USART_VCOM]$
  // <<< sl:end pin_tool >>>
 
diff --git a/OpenThreadRCP/SLZB-07/0001-config-configure-usart-vcom-A6A5-B1B0.patch b/OpenThreadRCP/SLZB-07/0001-config-configure-usart-vcom-A6A5-B1B0.patch
@@ -24,12 +24,12 @@
 -// #define SL_UARTDRV_USART_VCOM_CTS_PORT          gpioPortA
 -// #define SL_UARTDRV_USART_VCOM_CTS_PIN           2
 +#define SL_UARTDRV_USART_VCOM_CTS_PORT          gpioPortB
-+#define SL_UARTDRV_USART_VCOM_CTS_PIN           1
++#define SL_UARTDRV_USART_VCOM_CTS_PIN           0
 
 -// #define SL_UARTDRV_USART_VCOM_RTS_PORT          gpioPortA
 -// #define SL_UARTDRV_USART_VCOM_RTS_PIN           3
 +#define SL_UARTDRV_USART_VCOM_RTS_PORT          gpioPortB
-+#define SL_UARTDRV_USART_VCOM_RTS_PIN           0
++#define SL_UARTDRV_USART_VCOM_RTS_PIN           1
  // [USART_SL_UARTDRV_USART_VCOM]$
  // <<< sl:end pin_tool >>>
 
diff --git a/RCPMultiPAN/SLZB-07/0001-config-configure-cpc-usart-vcom-A6A5-B1B0.patch b/RCPMultiPAN/SLZB-07/0001-config-configure-cpc-usart-vcom-A6A5-B1B0.patch
@@ -41,10 +41,10 @@ index dbce4ed..816402f 100644
 +#define SL_CPC_DRV_UART_VCOM_RX_PIN                     5
 +
 +#define SL_CPC_DRV_UART_VCOM_CTS_PORT                   gpioPortB
-+#define SL_CPC_DRV_UART_VCOM_CTS_PIN                    1
++#define SL_CPC_DRV_UART_VCOM_CTS_PIN                    0
 +
 +#define SL_CPC_DRV_UART_VCOM_RTS_PORT                   gpioPortB
-+#define SL_CPC_DRV_UART_VCOM_RTS_PIN                    0
++#define SL_CPC_DRV_UART_VCOM_RTS_PIN                    1
  // [USART_SL_CPC_DRV_UART_VCOM]$
  // <<< sl:end pin_tool >>>
 

diff --git a/manifests/slzb-07.json b/manifests/slzb-07.json
@@ -1,5 +1,11 @@
 {
     "name": "SLZB-07",
     "target": "slzb-07",
-    "device": "EFR32MG21A020F768IM32"
+    "device": "EFR32MG21A020F768IM32",
+    "ncp-uart-hw": {
+        "configuration": {
+            "EMBER_APS_UNICAST_MESSAGE_COUNT":32,
+            "EMBER_PACKET_BUFFER_COUNT":255
+        }
+    }
 }