[Silabs] Adds bugfix for building applications on SiWx917 SoC (#28468)

* Build Error fix for Window app on CSA for 917 SOC

* Added Conditions for 917 SOC

* Adds fix for 917SoC button and LED0 issue

* Restyled by clang-format

* Removed not required ifndef condition for 917 SOC

* Removed OTA Requestor changes from scripts file

* using release interrupt for button 1

* Restyled by clang-format

---------

Co-authored-by: srningap <Srishylam.Ningapuram@silabs.com>
Co-authored-by: Restyled.io <commits@restyled.io>

examples/lighting-app/silabs/src/AppTask.cpp

@@ -40,7 +40,7 @@
 
 #include <platform/CHIPDeviceLayer.h>
 
-#if (defined(SL_CATALOG_SIMPLE_LED_LED1_PRESENT) || defined(BRD4325B))
+#if (defined(SL_CATALOG_SIMPLE_LED_LED1_PRESENT) || defined(SIWX_917))
 #define LIGHT_LED 1
 #else
 #define LIGHT_LED 0

examples/platform/silabs/BaseApplication.cpp

@@ -25,9 +25,8 @@
 #include "AppEvent.h"
 #include "AppTask.h"
 
-#if defined(ENABLE_WSTK_LEDS) && defined(SL_CATALOG_SIMPLE_LED_LED1_PRESENT)
+#if (defined(ENABLE_WSTK_LEDS) && (defined(SL_CATALOG_SIMPLE_LED_LED1_PRESENT) || defined(SIWX_917)))
 #include "LEDWidget.h"
-#include "sl_simple_led_instances.h"
 #endif // ENABLE_WSTK_LEDS
 
 #ifdef DISPLAY_ENABLED
@@ -79,7 +78,7 @@
 #define APP_EVENT_QUEUE_SIZE 10
 #define EXAMPLE_VENDOR_ID 0xcafe
 
-#if defined(ENABLE_WSTK_LEDS) && defined(SL_CATALOG_SIMPLE_LED_LED1_PRESENT)
+#if (defined(ENABLE_WSTK_LEDS) && (defined(SL_CATALOG_SIMPLE_LED_LED1_PRESENT) || defined(SIWX_917)))
 #define SYSTEM_STATE_LED 0
 #endif // ENABLE_WSTK_LEDS
 #define APP_FUNCTION_BUTTON 0
@@ -101,7 +100,7 @@ TimerHandle_t sLightTimer;
 TaskHandle_t sAppTaskHandle;
 QueueHandle_t sAppEventQueue;
 
-#if defined(ENABLE_WSTK_LEDS) && defined(SL_CATALOG_SIMPLE_LED_LED1_PRESENT)
+#if (defined(ENABLE_WSTK_LEDS) && (defined(SL_CATALOG_SIMPLE_LED_LED1_PRESENT) || defined(SIWX_917)))
 LEDWidget sStatusLED;
 #endif // ENABLE_WSTK_LEDS
 
@@ -236,7 +235,7 @@ CHIP_ERROR BaseApplication::Init()
  SILABS_LOG("Current Software Version String: %s", CHIP_DEVICE_CONFIG_DEVICE_SOFTWARE_VERSION_STRING);
  SILABS_LOG("Current Software Version: %d", CHIP_DEVICE_CONFIG_DEVICE_SOFTWARE_VERSION);
 
-#if defined(ENABLE_WSTK_LEDS) && defined(SL_CATALOG_SIMPLE_LED_LED1_PRESENT)
+#if (defined(ENABLE_WSTK_LEDS) && (defined(SL_CATALOG_SIMPLE_LED_LED1_PRESENT) || defined(SIWX_917)))
  LEDWidget::InitGpio();
  sStatusLED.Init(SYSTEM_STATE_LED);
 #endif // ENABLE_WSTK_LEDS
@@ -292,7 +291,7 @@ void BaseApplication::FunctionEventHandler(AppEvent * aEvent)
 
  mFunction = kFunction_FactoryReset;
 
-#if defined(ENABLE_WSTK_LEDS) && defined(SL_CATALOG_SIMPLE_LED_LED1_PRESENT)
+#if (defined(ENABLE_WSTK_LEDS) && (defined(SL_CATALOG_SIMPLE_LED_LED1_PRESENT) || defined(SIWX_917)))
  // Turn off all LEDs before starting blink to make sure blink is
  // co-ordinated.
  sStatusLED.Set(false);
@@ -315,7 +314,7 @@ void BaseApplication::FunctionEventHandler(AppEvent * aEvent)
 bool BaseApplication::ActivateStatusLedPatterns()
 {
  bool isPatternSet = false;
-#if defined(ENABLE_WSTK_LEDS) && defined(SL_CATALOG_SIMPLE_LED_LED1_PRESENT)
+#if (defined(ENABLE_WSTK_LEDS) && (defined(SL_CATALOG_SIMPLE_LED_LED1_PRESENT) || defined(SIWX_917)))
 #ifdef EMBER_AF_PLUGIN_IDENTIFY_SERVER
  if (gIdentify.mActive)
  {
@@ -417,7 +416,7 @@ void BaseApplication::LightEventHandler()
  }
 #endif // CHIP_CONFIG_ENABLE_ICD_SERVER
 
-#if defined(ENABLE_WSTK_LEDS) && defined(SL_CATALOG_SIMPLE_LED_LED1_PRESENT)
+#if (defined(ENABLE_WSTK_LEDS) && (defined(SL_CATALOG_SIMPLE_LED_LED1_PRESENT) || defined(SIWX_917)))
  // Update the status LED if factory reset has not been initiated.
  //
  // If system has "full connectivity", keep the LED On constantly.
@@ -556,7 +555,7 @@ void BaseApplication::StartStatusLEDTimer()
 
 void BaseApplication::StopStatusLEDTimer()
 {
-#if defined(ENABLE_WSTK_LEDS) && defined(SL_CATALOG_SIMPLE_LED_LED1_PRESENT)
+#if (defined(ENABLE_WSTK_LEDS) && (defined(SL_CATALOG_SIMPLE_LED_LED1_PRESENT) || defined(SIWX_917)))
  sStatusLED.Set(false);
 #endif // ENABLE_WSTK_LEDS
 

examples/platform/silabs/MatterConfig.cpp

@@ -172,7 +172,7 @@ CHIP_ERROR SilabsMatterConfig::InitMatter(const char * appName)
 
 // WiFi needs to be initialized after Memory Init for some reason
 #ifdef SL_WIFI
- InitWiFi();
+ ReturnErrorOnFailure(InitWiFi());
 #endif
 
  ReturnErrorOnFailure(PlatformMgr().InitChipStack());

examples/platform/silabs/SiWx917/SiWx917/hal/rsi_hal_mcu_m4.c

@@ -82,9 +82,10 @@ void IRQ021_Handler(void)
  RSI_NPSSGPIO_ClrIntr(NPSS_GPIO_0_INTR);
  RSI_NPSSGPIO_ClrIntr(NPSS_GPIO_2_INTR);
  // if the btn is not pressed setting the state to 1
- if (RSI_NPSSGPIO_GetPin(NPSS_GPIO_2))
+ if (RSI_NPSSGPIO_GetPin(NPSS_GPIO_2) && (!btn1))
  {
  btn1 = 1;
+ sl_button_on_change(1, 0);
  }
  // geting the state of the gpio 2 pin and checking if the btn is already pressed or not
  if (!RSI_NPSSGPIO_GetPin(NPSS_GPIO_2) && btn1)

src/platform/silabs/platformAbstraction/WiseMcuSpam.cpp

@@ -20,6 +20,10 @@
 #include <FreeRTOS.h>
 #include <task.h>
 
+#if SILABS_LOG_ENABLED
+#include "silabs_utils.h"
+#endif
+
 // TODO add includes ?
 extern "C" void RSI_Board_LED_Set(int, bool);
 extern "C" void RSI_Board_LED_Toggle(int);