Use SimplicitySDK 2024.12.0

darkxst · Jan 2, 2025 · b58e9cc · b58e9cc
1 parent a9ca060
commit b58e9cc
Show file tree

Hide file tree

Showing 32 changed files with 42 additions and 42 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -45,17 +45,17 @@ RUN \
     && tar -C /opt -xf arm-gnu-toolchain-12.2.rel1-x86_64-arm-none-eabi.tar.xz \
     && rm arm-gnu-toolchain-12.2.rel1-x86_64-arm-none-eabi.tar.xz
 
-# Simplicity SDK 2024.6.2
+# Simplicity SDK 2024.12.0
 RUN \
-    curl -o simplicity_sdk_2024.6.2.zip -L https://github.com/SiliconLabs/simplicity_sdk/releases/download/v2024.6.2/gecko-sdk.zip \
-    && unzip -q -d simplicity_sdk_2024.6.2 simplicity_sdk_2024.6.2.zip \
-    && rm simplicity_sdk_2024.6.2.zip
+    curl -o simplicity_sdk_2024.12.0.zip -L https://github.com/SiliconLabs/simplicity_sdk/releases/download/v2024.12.0/gecko-sdk.zip \
+    && unzip -q -d simplicity_sdk_2024.12.0 simplicity_sdk_2024.12.0.zip \
+    && rm simplicity_sdk_2024.12.0.zip
 
-# ZCL Advanced Platform (ZAP) v2024.09.27
+# ZCL Advanced Platform (ZAP) v2024.12.13
 RUN \
-    curl -o zap_2024.09.27.zip -L https://github.com/project-chip/zap/releases/download/v2024.09.27/zap-linux-x64.zip \
-    && unzip -q -d /opt/zap zap_2024.09.27.zip \
-    && rm zap_2024.09.27.zip
+    curl -o zap_2024.12.13.zip -L https://github.com/project-chip/zap/releases/download/v2024.12.13/zap-linux-x64.zip \
+    && unzip -q -d /opt/zap zap_2024.12.13.zip \
+    && rm zap_2024.12.13.zip
 
 ENV STUDIO_ADAPTER_PACK_PATH="/opt/zap"
 

diff --git a/manifests/aeotec/zga008_openthread_rcp.yaml b/manifests/aeotec/zga008_openthread_rcp.yaml
@@ -2,7 +2,7 @@ name: ZGA008 OpenThread RCP
 device: EFR32MG21A020F1024IM32
 base_project: src/openthread_rcp
 filename: "{manifest_name}_{ot_rcp_version.split('/')[-1]}_gsdk_{sdk_version}_{baudrate}"
-sdk: "simplicity_sdk:2024.6.2"
+sdk: "simplicity_sdk:2024.12.0"
 toolchain: "12.2.1.20221205"
 
 gbl:

diff --git a/manifests/aeotec/zga008_zigbee_ncp.yaml b/manifests/aeotec/zga008_zigbee_ncp.yaml
@@ -2,7 +2,7 @@ name: ZGA008 Zigbee
 device: EFR32MG21A020F1024IM32
 base_project: src/zigbee_ncp
 filename: "{manifest_name}_{ezsp_version}_{baudrate}"
-sdk: "simplicity_sdk:2024.6.2"
+sdk: "simplicity_sdk:2024.12.0"
 toolchain: "12.2.1.20221205"
 
 gbl:

diff --git a/manifests/easyiot/zb-gw04-1v1_openthread_rcp.yaml b/manifests/easyiot/zb-gw04-1v1_openthread_rcp.yaml
@@ -2,7 +2,7 @@ name: ZB-GW04-1v1 OpenThread RCP
 device: EFR32MG21A020F768IM32
 base_project: src/openthread_rcp
 filename: "{manifest_name}_{ot_rcp_version.split('/')[-1]}_gsdk_{sdk_version}_{fw_variant}_{baudrate}"
-sdk: "simplicity_sdk:2024.6.2"
+sdk: "simplicity_sdk:2024.12.0"
 toolchain: "12.2.1.20221205"
 
 gbl:

diff --git a/manifests/easyiot/zb-gw04-1v1_zigbee_ncp.yaml b/manifests/easyiot/zb-gw04-1v1_zigbee_ncp.yaml
@@ -2,7 +2,7 @@ name: ZB-GW04-1v1 Zigbee
 device: EFR32MG21A020F768IM32
 base_project: src/zigbee_ncp
 filename: "{manifest_name}_{ezsp_version}_{fw_variant}_{baudrate}"
-sdk: "simplicity_sdk:2024.6.2"
+sdk: "simplicity_sdk:2024.12.0"
 toolchain: "12.2.1.20221205"
 
 gbl:

diff --git a/manifests/easyiot/zb-gw04-1v2_openthread_rcp.yaml b/manifests/easyiot/zb-gw04-1v2_openthread_rcp.yaml
@@ -2,7 +2,7 @@ name: ZB-GW04-1v2 OpenThread RCP
 device: EFR32MG21A020F768IM32
 base_project: src/openthread_rcp
 filename: "{manifest_name}_{ot_rcp_version.split('/')[-1]}_gsdk_{sdk_version}_{baudrate}"
-sdk: "simplicity_sdk:2024.6.2"
+sdk: "simplicity_sdk:2024.12.0"
 toolchain: "12.2.1.20221205"
 
 gbl:

diff --git a/manifests/easyiot/zb-gw04-1v2_zigbee_ncp.yaml b/manifests/easyiot/zb-gw04-1v2_zigbee_ncp.yaml
@@ -2,7 +2,7 @@ name: ZB-GW04-1v2 Zigbee
 device: EFR32MG21A020F768IM32
 base_project: src/zigbee_ncp
 filename: "{manifest_name}_{ezsp_version}_{baudrate}"
-sdk: "simplicity_sdk:2024.6.2"
+sdk: "simplicity_sdk:2024.12.0"
 toolchain: "12.2.1.20221205"
 
 gbl:

diff --git a/manifests/easyiot/zb-gw04_bootloader.yaml b/manifests/easyiot/zb-gw04_bootloader.yaml
@@ -2,7 +2,7 @@ name: ZB-GW04 Bootloader
 device: EFR32MG21A020F768IM32
 base_project: src/bootloader
 filename: "{manifest_name}_{gecko_bootloader_version}"
-sdk: "simplicity_sdk:2024.6.2"
+sdk: "simplicity_sdk:2024.12.0"
 toolchain: "12.2.1.20221205"
 
 gbl:

diff --git a/manifests/nabucasa/skyconnect_bootloader.yaml b/manifests/nabucasa/skyconnect_bootloader.yaml
@@ -2,7 +2,7 @@ name: SkyConnect Bootloader
 device: EFR32MG21A020F512IM32
 base_project: src/bootloader
 filename: "{manifest_name}_{gecko_bootloader_version}"
-sdk: "simplicity_sdk:2024.6.2"
+sdk: "simplicity_sdk:2024.12.0"
 toolchain: "12.2.1.20221205"
 
 gbl:

diff --git a/manifests/nabucasa/skyconnect_openthread_rcp.yaml b/manifests/nabucasa/skyconnect_openthread_rcp.yaml
@@ -2,7 +2,7 @@ name: SkyConnect OpenThread RCP
 device: EFR32MG21A020F512IM32
 base_project: src/openthread_rcp
 filename: "{manifest_name}_{ot_rcp_version.split('/')[-1]}_gsdk_{sdk_version}"
-sdk: "simplicity_sdk:2024.6.2"
+sdk: "simplicity_sdk:2024.12.0"
 toolchain: "12.2.1.20221205"
 
 gbl:

diff --git a/manifests/nabucasa/skyconnect_zigbee_ncp.yaml b/manifests/nabucasa/skyconnect_zigbee_ncp.yaml
@@ -2,7 +2,7 @@ name: SkyConnect Zigbee
 device: EFR32MG21A020F512IM32
 base_project: src/zigbee_ncp
 filename: "{manifest_name}_{ezsp_version}"
-sdk: "simplicity_sdk:2024.6.2"
+sdk: "simplicity_sdk:2024.12.0"
 toolchain: "12.2.1.20221205"
 
 gbl:

diff --git a/manifests/nabucasa/yellow_bootloader.yaml b/manifests/nabucasa/yellow_bootloader.yaml
@@ -2,7 +2,7 @@ name: Yellow Bootloader
 device: MGM210PA32JIA
 base_project: src/bootloader
 filename: "{manifest_name}_{gecko_bootloader_version}"
-sdk: "simplicity_sdk:2024.6.2"
+sdk: "simplicity_sdk:2024.12.0"
 toolchain: "12.2.1.20221205"
 
 gbl:

diff --git a/manifests/nabucasa/yellow_openthread_rcp.yaml b/manifests/nabucasa/yellow_openthread_rcp.yaml
@@ -2,7 +2,7 @@ name: Yellow OpenThread RCP
 device: MGM210PA32JIA
 base_project: src/openthread_rcp
 filename: "{manifest_name}_{ot_rcp_version.split('/')[-1]}_gsdk_{sdk_version}"
-sdk: "simplicity_sdk:2024.6.2"
+sdk: "simplicity_sdk:2024.12.0"
 toolchain: "12.2.1.20221205"
 
 gbl:

diff --git a/manifests/nabucasa/yellow_zigbee_ncp.yaml b/manifests/nabucasa/yellow_zigbee_ncp.yaml
@@ -2,7 +2,7 @@ name: Yellow Zigbee
 device: MGM210PA32JIA
 base_project: src/zigbee_ncp
 filename: "{manifest_name}_{ezsp_version}"
-sdk: "simplicity_sdk:2024.6.2"
+sdk: "simplicity_sdk:2024.12.0"
 toolchain: "12.2.1.20221205"
 
 gbl:

diff --git a/manifests/nabucasa/zwave_stick.yaml b/manifests/nabucasa/zwave_stick.yaml
@@ -2,7 +2,7 @@ name: Z-Wave Stick
 device: EFR32ZG23A020F512GM40
 base_project: src/zwave_ncp
 filename: "{manifest_name}_{zwave_version}"
-sdk: "simplicity_sdk:2024.6.2"
+sdk: "simplicity_sdk:2024.12.0"
 toolchain: "12.2.1.20221205"
 
 gbl:

diff --git a/manifests/smlight/slzb06m_opentread_rcp.yaml b/manifests/smlight/slzb06m_opentread_rcp.yaml
@@ -2,7 +2,7 @@ name: SLZB-06M OpenThread RCP
 device: EFR32MG21A020F768IM32
 base_project: src/openthread_rcp
 filename: "{manifest_name}_{ot_rcp_version.split('/')[-1]}_gsdk_{sdk_version}_{fw_variant}_{baudrate}"
-sdk: "simplicity_sdk:2024.6.2"
+sdk: "simplicity_sdk:2024.12.0"
 toolchain: "12.2.1.20221205"
 
 gbl:

diff --git a/manifests/smlight/slzb06m_zigbee_ncp.yaml b/manifests/smlight/slzb06m_zigbee_ncp.yaml
@@ -2,7 +2,7 @@ name: SLZB-06M Zigbee
 device: EFR32MG21A020F768IM32
 base_project: src/zigbee_ncp
 filename: "{manifest_name}_{ezsp_version}_{fw_variant}_{baudrate}"
-sdk: "simplicity_sdk:2024.6.2"
+sdk: "simplicity_sdk:2024.12.0"
 toolchain: "12.2.1.20221205"
 
 gbl:

diff --git a/manifests/smlight/slzb06m_zigbee_router.yaml b/manifests/smlight/slzb06m_zigbee_router.yaml
@@ -2,7 +2,7 @@ name: SLZB-07 Zigbee Router
 device: EFR32MG21A020F768IM32
 base_project: src/zigbee_router
 filename: "{manifest_name}_{ezsp_version}_{baudrate}"
-sdk: "simplicity_sdk:2024.6.2"
+sdk: "simplicity_sdk:2024.12.0"
 toolchain: "12.2.1.20221205"
 
 gbl:
@@ -29,7 +29,7 @@ json_config:
   - file: "config/zcl/zcl_config.zap"
     jq: |
       ( .endpointTypes[].clusters[].attributes[] | select(.name == "sw build id"))
-      .defaultValue = "2024.6.2"
+      .defaultValue = "2024.12.0"
 add_components:
 - id: simple_led
   instance: [led0]

diff --git a/manifests/smlight/slzb07Mg24_bootloader.yaml b/manifests/smlight/slzb07Mg24_bootloader.yaml
@@ -2,7 +2,7 @@ name: SLZB-07Mg24 Bootloader
 device: EFR32MG24A020F1024IM40
 base_project: src/bootloader
 filename: "{manifest_name}_{gecko_bootloader_version}"
-sdk: "simplicity_sdk:2024.6.2"
+sdk: "simplicity_sdk:2024.12.0"
 toolchain: "12.2.1.20221205"
 
 gbl:

diff --git a/manifests/smlight/slzb07Mg24_opentread_rcp.yaml b/manifests/smlight/slzb07Mg24_opentread_rcp.yaml
@@ -2,7 +2,7 @@ name: SLZB-07Mg24 OpenThread RCP
 device: EFR32MG24A020F1024IM40
 base_project: src/openthread_rcp
 filename: "{manifest_name}_{ot_rcp_version.split('/')[-1]}_gsdk_{sdk_version}_{baudrate}"
-sdk: "simplicity_sdk:2024.6.2"
+sdk: "simplicity_sdk:2024.12.0"
 toolchain: "12.2.1.20221205"
 
 gbl:

diff --git a/manifests/smlight/slzb07Mg24_zigbee_ncp.yaml b/manifests/smlight/slzb07Mg24_zigbee_ncp.yaml
@@ -2,7 +2,7 @@ name: SLZB-07Mg24 Zigbee
 device: EFR32MG24A020F1024IM40
 base_project: src/zigbee_ncp
 filename: "{manifest_name}_{ezsp_version}_{baudrate}"
-sdk: "simplicity_sdk:2024.6.2"
+sdk: "simplicity_sdk:2024.12.0"
 toolchain: "12.2.1.20221205"
 
 gbl:

diff --git a/manifests/smlight/slzb07Mg24_zigbee_router.yaml b/manifests/smlight/slzb07Mg24_zigbee_router.yaml
@@ -2,7 +2,7 @@ name: SLZB-07Mg24 Zigbee Router
 device: EFR32MG24A020F1024IM40
 base_project: src/zigbee_router
 filename: "{manifest_name}_{ezsp_version}_{baudrate}"
-sdk: "simplicity_sdk:2024.6.2"
+sdk: "simplicity_sdk:2024.12.0"
 toolchain: "12.2.1.20221205"
 
 gbl:
@@ -29,7 +29,7 @@ json_config:
   - file: "config/zcl/zcl_config.zap"
     jq: |
       ( .endpointTypes[].clusters[].attributes[] | select(.name == "sw build id"))
-      .defaultValue = "2024.6.2"
+      .defaultValue = "2024.12.0"
 
 add_components:
 - id: simple_led

diff --git a/manifests/smlight/slzb07_bootloader.yaml b/manifests/smlight/slzb07_bootloader.yaml
@@ -2,7 +2,7 @@ name: SLZB-07 Bootloader
 device: EFR32MG21A020F768IM32
 base_project: src/bootloader
 filename: "{manifest_name}_{gecko_bootloader_version}"
-sdk: "simplicity_sdk:2024.6.2"
+sdk: "simplicity_sdk:2024.12.0"
 toolchain: "12.2.1.20221205"
 
 gbl:

diff --git a/manifests/smlight/slzb07_opentread_rcp.yaml b/manifests/smlight/slzb07_opentread_rcp.yaml
@@ -2,7 +2,7 @@ name: SLZB-07 OpenThread RCP
 device: EFR32MG21A020F768IM32
 base_project: src/openthread_rcp
 filename: "{manifest_name}_{ot_rcp_version.split('/')[-1]}_gsdk_{sdk_version}_{baudrate}"
-sdk: "simplicity_sdk:2024.6.2"
+sdk: "simplicity_sdk:2024.12.0"
 toolchain: "12.2.1.20221205"
 
 gbl:

diff --git a/manifests/smlight/slzb07_zigbee_ncp.yaml b/manifests/smlight/slzb07_zigbee_ncp.yaml
@@ -2,7 +2,7 @@ name: SLZB-07 Zigbee
 device: EFR32MG21A020F768IM32
 base_project: src/zigbee_ncp
 filename: "{manifest_name}_{ezsp_version}_{baudrate}"
-sdk: "simplicity_sdk:2024.6.2"
+sdk: "simplicity_sdk:2024.12.0"
 toolchain: "12.2.1.20221205"
 
 gbl:

diff --git a/manifests/smlight/slzb07_zigbee_router.yaml b/manifests/smlight/slzb07_zigbee_router.yaml
@@ -2,7 +2,7 @@ name: SLZB-07 Zigbee Router
 device: EFR32MG21A020F768IM32
 base_project: src/zigbee_router
 filename: "{manifest_name}_{ezsp_version}_{baudrate}"
-sdk: "simplicity_sdk:2024.6.2"
+sdk: "simplicity_sdk:2024.12.0"
 toolchain: "12.2.1.20221205"
 
 gbl:
@@ -29,7 +29,7 @@ json_config:
   - file: "config/zcl/zcl_config.zap"
     jq: |
       ( .endpointTypes[].clusters[].attributes[] | select(.name == "sw build id"))
-      .defaultValue = "2024.6.2"
+      .defaultValue = "2024.12.0"
 
 add_components:
 - id: simple_led

diff --git a/manifests/sonoff/zbdonglee_openthread_rcp.yaml b/manifests/sonoff/zbdonglee_openthread_rcp.yaml
@@ -2,7 +2,7 @@ name: ZBDongle-E OpenThread RCP
 device: EFR32MG21A020F768IM32
 base_project: src/openthread_rcp
 filename: "{manifest_name}_{ot_rcp_version.split('/')[-1]}_gsdk_{sdk_version}_{fw_variant}_{baudrate}"
-sdk: "simplicity_sdk:2024.6.2"
+sdk: "simplicity_sdk:2024.12.0"
 toolchain: "12.2.1.20221205"
 
 gbl:

diff --git a/manifests/sonoff/zbdonglee_zigbee_ncp.yaml b/manifests/sonoff/zbdonglee_zigbee_ncp.yaml
@@ -2,7 +2,7 @@ name: ZBDongle-E Zigbee
 device: EFR32MG21A020F768IM32
 base_project: src/zigbee_ncp
 filename: "{manifest_name}_{ezsp_version}_{fw_variant}_{baudrate}"
-sdk: "simplicity_sdk:2024.6.2"
+sdk: "simplicity_sdk:2024.12.0"
 toolchain: "12.2.1.20221205"
 
 gbl:

diff --git a/manifests/sparkfun/mgm240p_bootloader.yaml b/manifests/sparkfun/mgm240p_bootloader.yaml
@@ -2,7 +2,7 @@ name: MGM240P Bootloader
 device: MGM240PB32VNA
 base_project: src/bootloader
 filename: "{manifest_name}_{gecko_bootloader_version}"
-sdk: "simplicity_sdk:2024.6.2"
+sdk: "simplicity_sdk:2024.12.0"
 toolchain: "12.2.1.20221205"
 
 gbl:

diff --git a/manifests/sparkfun/mgm240p_openthread_rcp.yaml b/manifests/sparkfun/mgm240p_openthread_rcp.yaml
@@ -2,7 +2,7 @@ name: MGM240P OpenThread RCP
 device: MGM240PB32VNA
 base_project: src/openthread_rcp
 filename: "{manifest_name}_{ot_rcp_version.split('/')[-1]}_gsdk_{sdk_version}_{fw_variant}_{baudrate}"
-sdk: "simplicity_sdk:2024.6.2"
+sdk: "simplicity_sdk:2024.12.0"
 toolchain: "12.2.1.20221205"
 
 gbl:

diff --git a/manifests/sparkfun/mgm240p_zigbee_ncp.yaml b/manifests/sparkfun/mgm240p_zigbee_ncp.yaml
@@ -2,7 +2,7 @@ name: MGM240P Zigbee
 device: MGM240PB32VNA
 base_project: src/zigbee_ncp
 filename: "{manifest_name}_{ezsp_version}_{fw_variant}_{baudrate}"
-sdk: "simplicity_sdk:2024.6.2"
+sdk: "simplicity_sdk:2024.12.0"
 toolchain: "12.2.1.20221205"
 
 gbl:

diff --git a/src/zigbee_router/config/zcl/zcl_config.zap b/src/zigbee_router/config/zcl/zcl_config.zap
@@ -19,7 +19,7 @@
   "package": [
     {
       "pathRelativity": "relativeToZap",
-      "path": "../../simplicity_sdk_2024.6.2/app/zcl/zcl-zap.json",
+      "path": "../../simplicity_sdk_2024.12.0/app/zcl/zcl-zap.json",
       "type": "zcl-properties",
       "category": "zigbee",
       "version": 1,