Revert "Gecko SDK 4.4.6 (#89)" for stable (#107)

* Revert "Gecko SDK 4.4.6 (#89)"

This reverts commit 18a0155.

* Update OpenThread RCP firmware README

Author: puddly

Dockerfile

@@ -59,11 +59,11 @@ RUN \
     && unzip -q -d simplicity_sdk_2024.6.2 simplicity_sdk_2024.6.2.zip \
     && rm simplicity_sdk_2024.6.2.zip
 
-# Gecko SDK 4.4.6
+# Gecko SDK 4.4.4
 RUN \
-    curl -o gecko_sdk_4.4.6.zip -L https://github.com/SiliconLabs/gecko_sdk/releases/download/v4.4.6/gecko-sdk.zip \
-    && unzip -q -d gecko_sdk_4.4.6 gecko_sdk_4.4.6.zip \
-    && rm gecko_sdk_4.4.6.zip
+    curl -o gecko_sdk_4.4.4.zip -L https://github.com/SiliconLabs/gecko_sdk/releases/download/v4.4.4/gecko-sdk.zip \
+    && unzip -q -d gecko_sdk_4.4.4 gecko_sdk_4.4.4.zip \
+    && rm gecko_sdk_4.4.4.zip
 
 # ZCL Advanced Platform (ZAP) v2024.09.27
 RUN \

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: "gecko_sdk:4.4.6"
+sdk: "gecko_sdk:4.4.4"
 toolchain: "12.2.1.20221205"
 
 gbl:

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: "gecko_sdk:4.4.6"
+sdk: "gecko_sdk:4.4.4"
 toolchain: "12.2.1.20221205"
 
 gbl:

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.6"
+sdk: "gecko_sdk:4.4.4"
 toolchain: "12.2.1.20221205"
 
 gbl:

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: "gecko_sdk:4.4.6"
+sdk: "gecko_sdk:4.4.4"
 toolchain: "12.2.1.20221205"
 
 gbl:

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: "gecko_sdk:4.4.6"
+sdk: "gecko_sdk:4.4.4"
 toolchain: "12.2.1.20221205"
 
 gbl:

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.6"
+sdk: "gecko_sdk:4.4.4"
 toolchain: "12.2.1.20221205"
 
 gbl:

src/openthread_rcp/CHANGELOG.md

@@ -1,2 +1,5 @@
 # 2.4.6.0_GitHub-bdb394eb3
+Beta release built with Gecko SDK 4.4.6.
+
+# SL-OPENTHREAD/2.4.4.0_GitHub-7074a43e4
 Initial release with the new firmware builder. This firmware is identical to the firmware bundled with the OpenThread Border Router addon.

src/openthread_rcp/app.c

@@ -1,4 +1,4 @@
-/*******************************************************************************
+/***************************************************************************//**
  * @file
  * @brief Core application logic.
  *******************************************************************************
@@ -18,35 +18,24 @@
 #include <openthread-core-config.h>
 #include <openthread/config.h>
 
-#include <openthread/diag.h>
 #include <openthread/ncp.h>
+#include <openthread/diag.h>
 #include <openthread/tasklet.h>
 
-#include "app.h"
 #include "openthread-system.h"
+#include "app.h"
 
 #include "reset_util.h"
 
-#if OPENTHREAD_CONFIG_MULTIPAN_RCP_ENABLE
-#if OPENTHREAD_CONFIG_MULTIPLE_STATIC_INSTANCE_ENABLE == 0
-#error "Support for multiple OpenThread static instance is disabled."
-#endif
-otInstance *sInstances[OPENTHREAD_CONFIG_MULTIPLE_INSTANCE_NUM] = {NULL};
-#endif // OPENTHREAD_CONFIG_MULTIPAN_RCP_ENABLE
-
 /**
  * This function initializes the NCP app.
  *
  * @param[in]  aInstance  The OpenThread instance structure.
  *
  */
-#if OPENTHREAD_CONFIG_MULTIPAN_RCP_ENABLE
-extern void otAppNcpInitMulti(otInstance **aInstances, uint8_t aCount);
-#else
 extern void otAppNcpInit(otInstance *aInstance);
-#endif
 
-static otInstance *sInstance = NULL;
+static otInstance* sInstance = NULL;
 
 otInstance *otGetInstance(void)
 {
@@ -55,15 +44,7 @@ otInstance *otGetInstance(void)
 
 void sl_ot_create_instance(void)
 {
-#if OPENTHREAD_CONFIG_MULTIPAN_RCP_ENABLE
-    for (int i = 0; i < OPENTHREAD_CONFIG_MULTIPLE_INSTANCE_NUM; i++)
-    {
-        sInstances[i] = otInstanceInitMultiple(i);
-
-        assert(sInstances[i]);
-    }
-    sInstance = sInstances[0];
-#elif OPENTHREAD_CONFIG_MULTIPLE_INSTANCE_ENABLE && !OPENTHREAD_CONFIG_MULTIPAN_RCP_ENABLE
+#if OPENTHREAD_CONFIG_MULTIPLE_INSTANCE_ENABLE
     size_t   otInstanceBufferLength = 0;
     uint8_t *otInstanceBuffer       = NULL;
 
@@ -84,14 +65,10 @@ void sl_ot_create_instance(void)
 
 void sl_ot_ncp_init(void)
 {
-#if OPENTHREAD_CONFIG_MULTIPAN_RCP_ENABLE
-    otAppNcpInitMulti(sInstances, OPENTHREAD_CONFIG_MULTIPLE_INSTANCE_NUM);
-#else
     otAppNcpInit(sInstance);
-#endif
 }
 
-/******************************************************************************
+/**************************************************************************//**
  * Application Init.
  *****************************************************************************/
 
@@ -100,7 +77,7 @@ void app_init(void)
     OT_SETUP_RESET_JUMP(argv);
 }
 
-/******************************************************************************
+/**************************************************************************//**
  * Application Process Action.
  *****************************************************************************/
 void app_process_action(void)
@@ -109,13 +86,13 @@ void app_process_action(void)
     otSysProcessDrivers(sInstance);
 }
 
-/******************************************************************************
+/**************************************************************************//**
  * Application Exit.
  *****************************************************************************/
 void app_exit(void)
 {
     otInstanceFinalize(sInstance);
-#if OPENTHREAD_CONFIG_MULTIPLE_INSTANCE_ENABLE && !OPENTHREAD_CONFIG_MULTIPAN_RCP_ENABLE
+#if OPENTHREAD_CONFIG_MULTIPLE_INSTANCE_ENABLE
     free(otInstanceBuffer);
 #endif
     // TO DO : pseudo reset?

src/openthread_rcp/app.h

@@ -1,4 +1,4 @@
-/*******************************************************************************
+/***************************************************************************//**
  * @file
  * @brief Application interface provided to main().
  *******************************************************************************
@@ -18,19 +18,19 @@
 #ifndef APP_H
 #define APP_H
 
-/******************************************************************************
+/**************************************************************************//**
  * Application Init.
  *****************************************************************************/
 void app_init(void);
 
-/******************************************************************************
+/**************************************************************************//**
  * Application Exit.
  *****************************************************************************/
 void app_exit(void);
 
-/******************************************************************************
+/**************************************************************************//**
  * Application Process Action.
  *****************************************************************************/
 void app_process_action(void);
 
-#endif
+#endif

src/openthread_rcp/main.c

@@ -1,4 +1,4 @@
-/*******************************************************************************
+/***************************************************************************//**
  * @file
  * @brief main() function.
  *******************************************************************************
@@ -14,9 +14,9 @@
  * sections of the MSLA applicable to Source Code.
  *
  ******************************************************************************/
-#include "app.h"
 #include "sl_component_catalog.h"
 #include "sl_system_init.h"
+#include "app.h"
 #if defined(SL_CATALOG_POWER_MANAGER_PRESENT)
 #include "sl_power_manager.h"
 #endif // SL_CATALOG_POWER_MANAGER_PRESENT
@@ -28,34 +28,33 @@
 
 int main(void)
 {
-    // Initialize Silicon Labs device, system, service(s) and protocol stack(s).
-    // Note that if the kernel is present, processing task(s) will be created by
-    // this call.
-    sl_system_init();
+  // Initialize Silicon Labs device, system, service(s) and protocol stack(s).
+  // Note that if the kernel is present, processing task(s) will be created by
+  // this call.
+  sl_system_init();
 
-    // Initialize the application. For example, create periodic timer(s) or
-    // task(s) if the kernel is present.
-    app_init();
+  // Initialize the application. For example, create periodic timer(s) or
+  // task(s) if the kernel is present.
+  app_init();
 
 #if defined(SL_CATALOG_KERNEL_PRESENT)
-    // Start the kernel. Task(s) created in app_init() will start running.
-    sl_system_kernel_start();
+  // Start the kernel. Task(s) created in app_init() will start running.
+  sl_system_kernel_start();
 #else // SL_CATALOG_KERNEL_PRESENT
-    while (1)
-    {
-        // Do not remove this call: Silicon Labs components process action routine
-        // must be called from the super loop.
-        sl_system_process_action();
+  while (1) {
+    // Do not remove this call: Silicon Labs components process action routine
+    // must be called from the super loop.
+    sl_system_process_action();
 
-        // Application process.
-        app_process_action();
+    // Application process.
+    app_process_action();
 
 #if defined(SL_CATALOG_POWER_MANAGER_PRESENT)
-        // Let the CPU go to sleep if the system allows it.
-        sl_power_manager_sleep();
+    // Let the CPU go to sleep if the system allows it.
+    sl_power_manager_sleep();
 #endif
-    }
-    // Clean-up when exiting the application.
-    app_exit();
+  }
+  // Clean-up when exiting the application.
+  app_exit();
 #endif // SL_CATALOG_KERNEL_PRESENT
-}
+}

src/openthread_rcp/openthread_rcp.slcp

@@ -46,12 +46,6 @@ configuration:
   - name: BUFFER_SIZE_DOWN
     value: 0
     condition: [ot_rtt_log]
-  - name: SL_UARTDRV_USART_VCOM_FLOW_CONTROL_TYPE
-    value: uartdrvFlowControlHwUart
-    condition: [uartdrv_usart]
-  - name: SL_UARTDRV_EUSART_VCOM_FLOW_CONTROL_TYPE
-    value: uartdrvFlowControlHwUart
-    condition: [uartdrv_eusart]
 
 filter:
   - name: "Wireless Technology"

src/openthread_rcp/reset_util.h

@@ -32,8 +32,8 @@
 #if defined(OPENTHREAD_ENABLE_COVERAGE) && OPENTHREAD_ENABLE_COVERAGE && defined(__GNUC__)
 #if __GNUC__ >= 11 || (defined(__clang__) && (defined(__APPLE__) && (__clang_major__ >= 13)) || \
                        (!defined(__APPLE__) && (__clang_major__ >= 12)))
-void __gcov_dump(void);
-void __gcov_reset(void);
+void __gcov_dump();
+void __gcov_reset();
 
 static void flush_gcov(void)
 {

src/zigbee_ncp/config/zigbee_watchdog_periodic_refresh_config.h

@@ -40,9 +40,6 @@ void app_process_action(void)
 {
 }
 
-#if defined(__ICCARM__)
-#pragma diag_suppress=Pe111
-#endif // defined(__ICCARM__)
 int main(void)
 {
   // Initialize Silicon Labs device, system, service(s) and protocol stack(s).