Upgrade Zigbee NCP

NabuCasa · Oct 15, 2024 · 484867a · 484867a
1 parent 8d38918
commit 484867a
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 30 deletions.
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: "gecko_sdk:4.4.4"
+sdk: "simplicity_sdk:2024.6.2"
 toolchain: "12.2.1.20221205"
 
 gbl:
@@ -11,16 +11,15 @@ gbl:
   baudrate: 115200
 
 configuration:
-  EMBER_CHILD_TABLE_SIZE: 32
+  SL_ZIGBEE_CHILD_TABLE_SIZE: 32
 
 c_defines:
-  EMBER_APS_UNICAST_MESSAGE_COUNT: 32
-  EMBER_BINDING_TABLE_SIZE: 32
-  EMBER_BROADCAST_TABLE_SIZE: 64
-  EMBER_KEY_TABLE_SIZE: 12
-  EMBER_MAX_END_DEVICE_CHILDREN: 32
-  EMBER_PACKET_BUFFER_COUNT: 255
-  EMBER_SOURCE_ROUTE_TABLE_SIZE: 200
+  SL_ZIGBEE_APS_UNICAST_MESSAGE_COUNT: 32
+  SL_ZIGBEE_BINDING_TABLE_SIZE: 32
+  SL_ZIGBEE_BROADCAST_TABLE_SIZE: 64
+  SL_ZIGBEE_KEY_TABLE_SIZE: 12
+  SL_ZIGBEE_MAX_END_DEVICE_CHILDREN: 32
+  SL_ZIGBEE_SOURCE_ROUTE_TABLE_SIZE: 200
 
   SL_IOSTREAM_USART_VCOM_BAUDRATE: 115200
   SL_IOSTREAM_USART_VCOM_FLOW_CONTROL_TYPE: usartHwFlowControlCtsAndRts

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: "gecko_sdk:4.4.4"
+sdk: "simplicity_sdk:2024.6.2"
 toolchain: "12.2.1.20221205"
 
 gbl:
@@ -15,16 +15,15 @@ add_components:
   instance: [board_activity]
 
 configuration:
-  EMBER_CHILD_TABLE_SIZE: 32
+  SL_ZIGBEE_CHILD_TABLE_SIZE: 32
 
 c_defines:
-  EMBER_APS_UNICAST_MESSAGE_COUNT: 32
-  EMBER_BINDING_TABLE_SIZE: 32
-  EMBER_BROADCAST_TABLE_SIZE: 64
-  EMBER_KEY_TABLE_SIZE: 12
-  EMBER_MAX_END_DEVICE_CHILDREN: 32
-  EMBER_PACKET_BUFFER_COUNT: 255
-  EMBER_SOURCE_ROUTE_TABLE_SIZE: 200
+  SL_ZIGBEE_APS_UNICAST_MESSAGE_COUNT: 32
+  SL_ZIGBEE_BINDING_TABLE_SIZE: 32
+  SL_ZIGBEE_BROADCAST_TABLE_SIZE: 64
+  SL_ZIGBEE_KEY_TABLE_SIZE: 12
+  SL_ZIGBEE_MAX_END_DEVICE_CHILDREN: 32
+  SL_ZIGBEE_SOURCE_ROUTE_TABLE_SIZE: 200
 
   SL_IOSTREAM_USART_VCOM_BAUDRATE: 115200
   SL_IOSTREAM_USART_VCOM_FLOW_CONTROL_TYPE: usartHwFlowControlCtsAndRts

diff --git a/src/zigbee_ncp/app.c b/src/zigbee_ncp/app.c
@@ -16,23 +16,23 @@
  ******************************************************************************/
 
 #include PLATFORM_HEADER
-#include "ember.h"
+#include "sl_zigbee.h"
 
 //----------------------
 // Implemented Callbacks
 
 /** @brief
  *
- * Application framework equivalent of ::emberRadioNeedsCalibratingHandler
+ * Application framework equivalent of ::sl_zigbee_radio_needs_calibrating_handler
  */
-void emberAfRadioNeedsCalibratingCallback(void)
+void sl_zigbee_af_radio_needs_calibrating_cb(void)
 {
   sl_mac_calibrate_current_channel();
 }
 
 /** @brief Init
  * Application init function
  */
-void emberAfMainInitCallback(void)
+void sl_zigbee_af_main_init_cb(void)
 {
 }
diff --git a/src/zigbee_ncp/main.c b/src/zigbee_ncp/main.c
@@ -28,7 +28,7 @@
 #include "sl_system_process_action.h"
 #endif  // SL_CATALOG_KERNEL_PRESENT
 
-#ifdef EMBER_TEST
+#ifdef SL_ZIGBEE_TEST
 #define main nodeMain
 #endif
 

diff --git a/src/zigbee_ncp/zigbee_ncp.slcp b/src/zigbee_ncp/zigbee_ncp.slcp
@@ -21,29 +21,28 @@ component:
   - id: zigbee_r22_support
   - id: zigbee_security_link_keys
   - id: zigbee_zll
-  - id: zigbee_app_framework_common
+  - id: zigbee_system_common
   - id: zigbee_ncp_uart_hardware
   - id: zigbee_debug_basic
   - id: zigbee_debug_extended
   - id: rail_util_rssi
+  - id: clock_manager
 
 define:
   - name: EMBER_CUSTOM_MAC_FILTER_TABLE_SIZE
     value: 15
 
 configuration:
-  - name: SL_CLI_MAX_INPUT_ARGUMENTS
-    value: 16
   - name: SL_BOARD_ENABLE_VCOM
     value: 1
   - name: SL_IOSTREAM_USART_VCOM_FLOW_CONTROL_TYPE
     value: usartHwFlowControlCtsAndRts
+  - name: SL_CLI_MAX_INPUT_ARGUMENTS
+    value: 16
+  - name: SL_ZIGBEE_PACKET_BUFFER_HEAP_SIZE
+    value: SL_ZIGBEE_LARGE_PACKET_BUFFER_HEAP
   - name: SL_CLI_EXAMPLE_IOSTREAM_HANDLE
     value: sl_iostream_vuart_handle
-  - name: NVM3_DEFAULT_NVM_SIZE
-    value: 36864
-    condition:
-      - device_series_1
   - name: NVM3_DEFAULT_NVM_SIZE
     value: 32768
     condition: