[Silabs] : matter_support update and integrations fixes (#43412)

Sarthak-Shaha · restyled-commits · web-flow · commit 9f960eb4cfa8 · 2026-03-03T23:21:08.000-05:00
* matter_support update and integrations fixes

* Restyled by clang-format

* Restyled by gn

* fix spaces

* fix esp

---------

Co-authored-by: Restyled.io &lt;commits@restyled.io&gt;
diff --git a/examples/air-quality-sensor-app/silabs/src/AirQualitySensorUI.cpp b/examples/air-quality-sensor-app/silabs/src/AirQualitySensorUI.cpp
@@ -25,7 +25,7 @@
 #include "demo-ui-bitmaps.h"
 #include "dmd.h"
 #include <air-quality-sensor-manager.h>
-#if DISPLAY_ENABLED
+#if defined(DISPLAY_ENABLED) && DISPLAY_ENABLED
 #include "glib.h"
 #include "lcd.h"
 #endif
diff --git a/examples/closure-app/silabs/src/ClosureUI.cpp b/examples/closure-app/silabs/src/ClosureUI.cpp
@@ -27,9 +27,9 @@
 #include "lcd.h"
 
 // Only needed for wifi NCP devices
-#if SL_WIFI && !defined(SLI_SI91X_MCU_INTERFACE)
+#if defined(SL_WIFI) && SL_WIFI && !defined(SLI_SI91X_MCU_INTERFACE)
 #include <platform/silabs/wifi/ncp/spi_multiplex.h>
-#endif // SL_WIFI && !defined(SLI_SI91X_MCU_INTERFACE)
+#endif // defined(SL_WIFI) && SL_WIFI && !defined(SLI_SI91X_MCU_INTERFACE)
 
 // Layout positions
 #define STATUS_ICON_LINE 0
diff --git a/examples/platform/silabs/BaseApplication.cpp b/examples/platform/silabs/BaseApplication.cpp
@@ -914,12 +914,12 @@ void BaseApplication::DoProvisioningReset()
     });
 }
 
-#if SILABS_OTA_ENABLED
+#if defined(SILABS_OTA_ENABLED) && SILABS_OTA_ENABLED
 void BaseApplication::InitOTARequestorHandler(System::Layer * systemLayer, void * appState)
 {
     OTAConfig::Init();
 }
-#endif
+#endif // defined(SILABS_OTA_ENABLED) && SILABS_OTA_ENABLED
 
 void BaseApplication::OnPlatformEvent(const ChipDeviceEvent * event, intptr_t)
 {
@@ -963,21 +963,21 @@ void BaseApplication::OnPlatformEvent(const ChipDeviceEvent * event, intptr_t)
 #endif // CHIP_CONFIG_ENABLE_ICD_SERVER
 #endif // SL_WIFI
 
-#if SILABS_OTA_ENABLED
+#if defined(SILABS_OTA_ENABLED) && SILABS_OTA_ENABLED
             ChipLogProgress(AppServer, "Scheduling OTA Requestor initialization");
             TEMPORARY_RETURN_IGNORED chip::DeviceLayer::SystemLayer().StartTimer(
                 chip::System::Clock::Seconds32(OTAConfig::kInitOTARequestorDelaySec), InitOTARequestorHandler, nullptr);
-#endif // SILABS_OTA_ENABLED
+#endif // defined(SILABS_OTA_ENABLED) && SILABS_OTA_ENABLED
         }
     }
     break;
 
     case DeviceEventType::kDnssdInitialized: {
-#if SILABS_OTA_ENABLED
+#if defined(SILABS_OTA_ENABLED) && SILABS_OTA_ENABLED
         ChipLogProgress(AppServer, "DNS-SD initialized, scheduling OTA Requestor initialization");
         TEMPORARY_RETURN_IGNORED chip::DeviceLayer::SystemLayer().StartTimer(
             chip::System::Clock::Seconds32(OTAConfig::kInitOTARequestorDelaySec), InitOTARequestorHandler, nullptr);
-#endif // SILABS_OTA_ENABLED
+#endif // defined(SILABS_OTA_ENABLED) && SILABS_OTA_ENABLED
     }
     break;
 
diff --git a/examples/refrigerator-app/silabs/src/RefrigeratorUI.cpp b/examples/refrigerator-app/silabs/src/RefrigeratorUI.cpp
@@ -27,9 +27,9 @@
 #include <lib/support/logging/CHIPLogging.h>
 
 // Only needed for wifi NCP devices
-#if SL_WIFI && !defined(SLI_SI91X_MCU_INTERFACE)
+#if defined(SL_WIFI) && SL_WIFI && !defined(SLI_SI91X_MCU_INTERFACE)
 #include <platform/silabs/wifi/ncp/spi_multiplex.h>
-#endif // SL_WIFI && !defined(SLI_SI91X_MCU_INTERFACE)
+#endif // defined(SL_WIFI) && SL_WIFI && !defined(SLI_SI91X_MCU_INTERFACE)
 
 // LCD line define
 constexpr uint8_t kTempLcdInitialX = 30;
diff --git a/src/platform/silabs/platformAbstraction/GsdkSpam.cpp b/src/platform/silabs/platformAbstraction/GsdkSpam.cpp
@@ -81,13 +81,15 @@ extern "C" {
 
 #include "sl_component_catalog.h"
 #include "sl_mbedtls.h"
-#if SILABS_LOG_OUT_UART || (defined(ENABLE_CHIP_SHELL) && ENABLE_CHIP_SHELL) || CHIP_DEVICE_CONFIG_THREAD_ENABLE_CLI
+#if SILABS_LOG_OUT_UART || (defined(ENABLE_CHIP_SHELL) && ENABLE_CHIP_SHELL) ||                                                    \
+    defined(CHIP_DEVICE_CONFIG_THREAD_ENABLE_CLI) && CHIP_DEVICE_CONFIG_THREAD_ENABLE_CLI
 #ifdef SL_CATALOG_CLI_PRESENT
 #include "sl_iostream.h"
 #include "sl_iostream_stdio.h"
-#endif //
+#endif // SL_CATALOG_CLI_PRESENT
 #include "uart.h"
-#endif
+#endif // SILABS_LOG_OUT_UART || (defined(ENABLE_CHIP_SHELL) && ENABLE_CHIP_SHELL) || defined(CHIP_DEVICE_CONFIG_THREAD_ENABLE_CLI)
+       // && CHIP_DEVICE_CONFIG_THREAD_ENABLE_CLI
 
 #ifdef SL_CATALOG_SYSTEMVIEW_TRACE_PRESENT
 #include "SEGGER_SYSVIEW.h"
@@ -143,13 +145,15 @@ CHIP_ERROR SilabsPlatform::Init(void)
     SEGGER_SYSVIEW_Conf();
 #endif
 
-#if SILABS_LOG_OUT_UART || (defined(ENABLE_CHIP_SHELL) && ENABLE_CHIP_SHELL) || CHIP_DEVICE_CONFIG_THREAD_ENABLE_CLI
+#if SILABS_LOG_OUT_UART || (defined(ENABLE_CHIP_SHELL) && ENABLE_CHIP_SHELL) ||                                                    \
+    defined(CHIP_DEVICE_CONFIG_THREAD_ENABLE_CLI) && CHIP_DEVICE_CONFIG_THREAD_ENABLE_CLI
     uartConsoleInit();
-#endif
+#endif // SILABS_LOG_OUT_UART || (defined(ENABLE_CHIP_SHELL) && ENABLE_CHIP_SHELL) || defined(CHIP_DEVICE_CONFIG_THREAD_ENABLE_CLI)
+       // && CHIP_DEVICE_CONFIG_THREAD_ENABLE_CLI
 
 #if SILABS_LOG_ENABLED
     silabsInitLog();
-#endif
+#endif // SILABS_LOG_ENABLED
     return CHIP_NO_ERROR;
 }
 
diff --git a/third_party/silabs/efr32_sdk.gni b/third_party/silabs/efr32_sdk.gni
@@ -245,6 +245,7 @@ template("efr32_sdk") {
       "${efr32_sdk_root}/glib/platform/middleware/glib/dmd",
       "${efr32_sdk_root}/bluetooth_common/inc ",
       "${efr32_sdk_root}/bluetooth_le_host/inc",
+      "${efr32_sdk_root}/bluetooth_le_host/config",
       "${efr32_sdk_root}/bluetooth_le_controller/inc",
       "${efr32_sdk_root}/platform_core/util/silicon_labs/silabs_core/graphics",
       "${efr32_sdk_root}/platform_core/util/silicon_labs/silabs_core/memory_manager",
@@ -334,7 +335,7 @@ template("efr32_sdk") {
       ]
 
       libs += [
-        "${efr32_sdk_root}/bluetooth_le_controller/build/gcc/xg24/release/liblinklayer.a ",
+        "${efr32_sdk_root}/bluetooth_le_controller/build/gcc/xg24/release/liblinklayer.a",
         "${efr32_sdk_root}/rail_library/autogen/librail_release/librail_multiprotocol_module_efr32xg24_gcc_release.a",
       ]
 
@@ -905,6 +906,7 @@ template("efr32_sdk") {
         "${efr32_sdk_root}/bluetooth_le_host/src/sl_bt_stack_init.c",
         "${efr32_sdk_root}/bluetooth_le_host/src/sli_bt_advertiser_config.c",
         "${efr32_sdk_root}/bluetooth_le_host/src/sli_bt_connection_config.c",
+        "${efr32_sdk_root}/bluetooth_le_host/src/sli_bt_dynamic_gattdb_config.c",
         "${efr32_sdk_root}/bluetooth_le_host/src/sli_bt_hci_event_table.c",
         "${efr32_sdk_root}/bluetooth_le_host/src/sli_bt_host_adaptation.c",
       ]
diff --git a/third_party/silabs/matter_support b/third_party/silabs/matter_support
@@ -1 +1 @@
-Subproject commit 7a686c41f650737b6d34efe0ccd938507aec839c
+Subproject commit 4a50c51841f800431838ba83e240618f2bcc8189

Original file line number	Diff line number	Diff line change
`@@ -914,12 +914,12 @@ void BaseApplication::DoProvisioningReset()`
`914`	`914`	`});`
`915`	`915`	`}`
`916`	`916`
`917`		`-#if SILABS_OTA_ENABLED`
	`917`	`+#if defined(SILABS_OTA_ENABLED) && SILABS_OTA_ENABLED`
`918`	`918`	`void BaseApplication::InitOTARequestorHandler(System::Layer * systemLayer, void * appState)`
`919`	`919`	`{`
`920`	`920`	`OTAConfig::Init();`
`921`	`921`	`}`
`922`		`-#endif`
	`922`	`+#endif // defined(SILABS_OTA_ENABLED) && SILABS_OTA_ENABLED`
`923`	`923`
`924`	`924`	`void BaseApplication::OnPlatformEvent(const ChipDeviceEvent * event, intptr_t)`
`925`	`925`	`{`
`@@ -963,21 +963,21 @@ void BaseApplication::OnPlatformEvent(const ChipDeviceEvent * event, intptr_t)`
`963`	`963`	`#endif // CHIP_CONFIG_ENABLE_ICD_SERVER`
`964`	`964`	`#endif // SL_WIFI`
`965`	`965`
`966`		`-#if SILABS_OTA_ENABLED`
	`966`	`+#if defined(SILABS_OTA_ENABLED) && SILABS_OTA_ENABLED`
`967`	`967`	`ChipLogProgress(AppServer, "Scheduling OTA Requestor initialization");`
`968`	`968`	`TEMPORARY_RETURN_IGNORED chip::DeviceLayer::SystemLayer().StartTimer(`
`969`	`969`	`chip::System::Clock::Seconds32(OTAConfig::kInitOTARequestorDelaySec), InitOTARequestorHandler, nullptr);`
`970`		`-#endif // SILABS_OTA_ENABLED`
	`970`	`+#endif // defined(SILABS_OTA_ENABLED) && SILABS_OTA_ENABLED`
`971`	`971`	`}`
`972`	`972`	`}`
`973`	`973`	`break;`
`974`	`974`
`975`	`975`	`case DeviceEventType::kDnssdInitialized: {`
`976`		`-#if SILABS_OTA_ENABLED`
	`976`	`+#if defined(SILABS_OTA_ENABLED) && SILABS_OTA_ENABLED`
`977`	`977`	`ChipLogProgress(AppServer, "DNS-SD initialized, scheduling OTA Requestor initialization");`
`978`	`978`	`TEMPORARY_RETURN_IGNORED chip::DeviceLayer::SystemLayer().StartTimer(`
`979`	`979`	`chip::System::Clock::Seconds32(OTAConfig::kInitOTARequestorDelaySec), InitOTARequestorHandler, nullptr);`
`980`		`-#endif // SILABS_OTA_ENABLED`
	`980`	`+#endif // defined(SILABS_OTA_ENABLED) && SILABS_OTA_ENABLED`
`981`	`981`	`}`
`982`	`982`	`break;`
`983`	`983`