Merge branch 'master' into master

Author: suneelsignify

.github/workflows/restyled.yml

@@ -15,11 +15,6 @@ jobs:
         uses: actions/checkout@v4
 
       - uses: restyled-io/actions/setup@v4
-        with:
-          # TODO: Pinned to v0.6.0.2 because the latest release does not have a pre-built
-          # 'restyler-linux' asset. This broke our workflow as we rely on the pre-built binary.
-          # Remove this pin once a new release with the 'restyler-linux' asset is available.          
-          tag: 'v0.6.0.2'
 
       - id: restyler
         uses: restyled-io/actions/run@v4

CONTRIBUTING.md

@@ -253,6 +253,15 @@ out of convenience.
     fixing a typo in an ID still requires some description on how you checked
     that the new ID takes effect.
 
+> [!TIP]
+>
+> When working on a pull request for Matter SDK refrain from using the "Update
+> branch" feature in the GitHub UI too often. Updating the PR branch in this way
+> triggers the CI workflows cancellation and restart. This feature should be
+> used only when a PR has not been worked on for a long time and a lot of
+> divergence has accumulated. Your PR branch being out of sync with master is
+> not a blocker for merging an approved PR.
+
 ### Review Requirements
 
 #### Documentation Best Practices

examples/air-quality-sensor-app/silabs/include/AppConfig.h

@@ -25,7 +25,7 @@
 
 #define APP_TASK_NAME "AQS"
 
-#define BLE_DEV_NAME "SiLabs-Air-Quality-Sensor"
+#define BLE_DEV_NAME "SL-" APP_TASK_NAME
 
 // Time it takes in ms for the simulated actuator to move from one
 // APP Logo, boolean only. must be 64x64

examples/air-quality-sensor-app/silabs/src/AppTask.cpp

@@ -73,7 +73,6 @@ CHIP_ERROR AppTask::AppInit()
     CHIP_ERROR err = CHIP_NO_ERROR;
     chip::DeviceLayer::Silabs::GetPlatform().SetButtonsCb(AppTask::ButtonEventHandler);
 #ifdef DISPLAY_ENABLED
-    GetLCD().Init((uint8_t *) "Air-Quality-Sensor");
     GetLCD().SetCustomUI(AirQualitySensorUI::DrawUI);
 #endif
 

examples/chef/silabs/include/AppConfig.h

@@ -22,7 +22,7 @@
 
 // ---- Lighting Example App Config ----
 
-#define APP_TASK_NAME "Lit"
+#define APP_TASK_NAME "Chef"
 
 // Time it takes in ms for the simulated actuator to move from one
 // state to another.

examples/dishwasher-app/silabs/include/AppTask.h

@@ -75,11 +75,11 @@ class AppTask : public BaseApplication
 private:
     static AppTask sAppTask;
     /**
-     * @brief AppTask initialisation function
+     * @brief Override of BaseApplication::AppInit() virtual method, called by BaseApplication::Init()
      *
      * @return CHIP_ERROR
      */
-    CHIP_ERROR Init();
+    CHIP_ERROR AppInit() override;
 
     /**
      * @brief PB0 Button event processing function

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

@@ -60,22 +60,11 @@ static EnergyReportingTestEventTriggerHandler sEnergyReportingTestEventTriggerHa
 static DeviceEnergyManagementTestEventTriggerHandler sDeviceEnergyManagementTestEventTriggerHandler;
 #endif
 
-CHIP_ERROR AppTask::Init()
+CHIP_ERROR AppTask::AppInit()
 {
     CHIP_ERROR err = CHIP_NO_ERROR;
     chip::DeviceLayer::Silabs::GetPlatform().SetButtonsCb(AppTask::ButtonEventHandler);
 
-#ifdef DISPLAY_ENABLED
-    GetLCD().Init((uint8_t *) "Dishwasher-App");
-#endif
-
-    err = BaseApplication::Init();
-    if (err != CHIP_NO_ERROR)
-    {
-        SILABS_LOG("BaseApplication::Init() failed");
-        appError(err);
-    }
-
     PlatformMgr().LockChipStack();
     err = DeviceEnergyManager::Instance().Init();
     PlatformMgr().UnlockChipStack();

examples/energy-management-app/silabs/include/AppConfig.h

@@ -23,6 +23,10 @@
 
 // ---- EVSE Example App Config ----
 
+#if SL_MATTER_CONFIG_ENABLE_EXAMPLE_EVSE_DEVICE
 #define APP_TASK_NAME "EVSE"
+#else
+#define APP_TASK_NAME "W-Heater"
+#endif
 
-#define BLE_DEV_NAME "SiLabs-EVSE"
+#define BLE_DEV_NAME "SL-" APP_TASK_NAME

examples/energy-management-app/silabs/src/AppTask.cpp

@@ -181,15 +181,6 @@ CHIP_ERROR AppTask::AppInit()
 {
     CHIP_ERROR err = CHIP_NO_ERROR;
     chip::DeviceLayer::Silabs::GetPlatform().SetButtonsCb(AppTask::ButtonEventHandler);
-
-#ifdef DISPLAY_ENABLED
-#if SL_MATTER_CONFIG_ENABLE_EXAMPLE_EVSE_DEVICE
-    GetLCD().Init((uint8_t *) "energy-management-App (EVSE)");
-#elif SL_CONFIG_ENABLE_EXAMPLE_WATER_HEATER_DEVICE
-    GetLCD().Init((uint8_t *) "energy-management-App (WaterHeater)");
-#endif
-#endif
-
     ApplicationInit();
 
 #ifdef SL_MATTER_TEST_EVENT_TRIGGER_ENABLED

examples/light-switch-app/silabs/include/AppConfig.h

@@ -23,9 +23,9 @@
 
 // ---- Lighting Example App Config ----
 
-#define APP_TASK_NAME "Lit"
+#define APP_TASK_NAME "Light-Sw"
 
-#define BLE_DEV_NAME "SiLabs-Light-Switch"
+#define BLE_DEV_NAME "SL-" APP_TASK_NAME
 
 // Time it takes in ms for the simulated actuator to move from one
 // state to another.

examples/light-switch-app/silabs/src/AppTask.cpp

@@ -76,10 +76,6 @@ CHIP_ERROR AppTask::AppInit()
     CHIP_ERROR err = CHIP_NO_ERROR;
     chip::DeviceLayer::Silabs::GetPlatform().SetButtonsCb(AppTask::ButtonEventHandler);
 
-#ifdef DISPLAY_ENABLED
-    GetLCD().Init((uint8_t *) "Light Switch");
-#endif
-
     err = LightSwitchMgr::GetInstance().Init(kLightSwitchEndpoint, kGenericSwitchEndpoint);
     if (err != CHIP_NO_ERROR)
     {

examples/lighting-app/silabs/include/AppConfig.h

@@ -23,9 +23,9 @@
 
 // ---- Lighting Example App Config ----
 
-#define APP_TASK_NAME "Lit"
+#define APP_TASK_NAME "Light"
 
-#define BLE_DEV_NAME "SiLabs-Light"
+#define BLE_DEV_NAME "SL-" APP_TASK_NAME
 
 // Time it takes in ms for the simulated actuator to move from one
 // state to another.

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

@@ -67,10 +67,6 @@ CHIP_ERROR AppTask::AppInit()
     CHIP_ERROR err = CHIP_NO_ERROR;
     chip::DeviceLayer::Silabs::GetPlatform().SetButtonsCb(AppTask::ButtonEventHandler);
 
-#ifdef DISPLAY_ENABLED
-    GetLCD().Init((uint8_t *) "Lighting-App");
-#endif
-
     err = LightMgr().Init();
     if (err != CHIP_NO_ERROR)
     {

examples/lit-icd-app/silabs/include/AppConfig.h

@@ -24,7 +24,7 @@
 
 #define APP_TASK_NAME "Lit"
 
-#define BLE_DEV_NAME "SiLabs-LIT-ICD"
+#define BLE_DEV_NAME "SL-" APP_TASK_NAME
 
 // APP Logo, boolean only. must be 64x64
 #define ON_DEMO_BITMAP                                                                                                             \

examples/lit-icd-app/silabs/src/AppTask.cpp

@@ -72,11 +72,6 @@ CHIP_ERROR AppTask::AppInit()
 {
     CHIP_ERROR err = CHIP_NO_ERROR;
     chip::DeviceLayer::Silabs::GetPlatform().SetButtonsCb(AppTask::ButtonEventHandler);
-
-#ifdef DISPLAY_ENABLED
-    GetLCD().Init((uint8_t *) "LIT ICD");
-#endif
-
     return err;
 }
 

examples/lock-app/silabs/include/AppConfig.h

@@ -25,7 +25,7 @@
 
 #define APP_TASK_NAME "Lock"
 
-#define BLE_DEV_NAME "SiLabs-Door-Lock"
+#define BLE_DEV_NAME "SL-" APP_TASK_NAME
 
 // Time it takes in ms for the simulated actuator to move from one
 // state to another.

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

@@ -122,10 +122,6 @@ CHIP_ERROR AppTask::AppInit()
 
     chip::DeviceLayer::Silabs::GetPlatform().SetButtonsCb(AppTask::ButtonEventHandler);
 
-#ifdef DISPLAY_ENABLED
-    GetLCD().Init((uint8_t *) "Lock-App", true);
-#endif
-
 #if defined(ENABLE_CHIP_SHELL)
     err = RegisterLockEvents();
     if (err != CHIP_NO_ERROR)

examples/platform/silabs/BaseApplication.cpp

@@ -288,6 +288,10 @@ CHIP_ERROR BaseApplication::BaseInit()
 {
     CHIP_ERROR err = CHIP_NO_ERROR;
 
+#ifdef DISPLAY_ENABLED
+    GetLCD().Init((uint8_t *) APP_TASK_NAME);
+#endif
+
 #ifdef SL_WIFI
     /*
      * Wait for the WiFi to be initialized

examples/pump-app/silabs/include/AppConfig.h

@@ -23,9 +23,9 @@
 
 // ---- Lighting Example App Config ----
 
-#define APP_TASK_NAME "Lit"
+#define APP_TASK_NAME "Pump"
 
-#define BLE_DEV_NAME "SiLabs-Pump"
+#define BLE_DEV_NAME "SL-" APP_TASK_NAME
 
 #define ON_DEMO_BITMAP                                                                                                             \
     0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,  \

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

@@ -76,10 +76,6 @@ CHIP_ERROR AppTask::AppInit()
     CHIP_ERROR err = CHIP_NO_ERROR;
     chip::DeviceLayer::Silabs::GetPlatform().SetButtonsCb(AppTask::ButtonEventHandler);
 
-#ifdef DISPLAY_ENABLED
-    GetLCD().Init((uint8_t *) "Pump-App");
-#endif
-
     err = PumpMgr().Init();
     if (err != CHIP_NO_ERROR)
     {

examples/refrigerator-app/silabs/include/AppConfig.h

@@ -24,7 +24,7 @@
 
 #define APP_TASK_NAME "Refr"
 
-#define BLE_DEV_NAME "SiLabs-Refrigerator"
+#define BLE_DEV_NAME "SL-" APP_TASK_NAME
 
 // Time it takes in ms for the simulated actuator to move from one
 // state to another.

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

@@ -80,10 +80,6 @@ CHIP_ERROR AppTask::AppInit()
     CHIP_ERROR err = CHIP_NO_ERROR;
     chip::DeviceLayer::Silabs::GetPlatform().SetButtonsCb(AppTask::ButtonEventHandler);
 
-#ifdef DISPLAY_ENABLED
-    GetLCD().Init((uint8_t *) "Refrigrator-App");
-#endif
-
     err = RefrigeratorMgr().Init();
     if (err != CHIP_NO_ERROR)
     {

examples/smoke-co-alarm-app/silabs/include/AppConfig.h

@@ -21,9 +21,9 @@
 
 // ---- Smoke CO Alarm Example App Config ----
 
-#define APP_TASK_NAME "Alm"
+#define APP_TASK_NAME "Smoke"
 
-#define BLE_DEV_NAME "SiLabs-Alarm"
+#define BLE_DEV_NAME "SL-" APP_TASK_NAME
 
 // Time it takes in ms for the simulated actuator to move from one
 // state to another.

examples/smoke-co-alarm-app/silabs/src/AppTask.cpp

@@ -59,10 +59,6 @@ CHIP_ERROR AppTask::AppInit()
     CHIP_ERROR err = CHIP_NO_ERROR;
     chip::DeviceLayer::Silabs::GetPlatform().SetButtonsCb(AppTask::ButtonEventHandler);
 
-#ifdef DISPLAY_ENABLED
-    GetLCD().Init((uint8_t *) "Smoke-CO-Alarm-App");
-#endif
-
     err = AlarmMgr().Init();
     if (err != CHIP_NO_ERROR)
     {

examples/thermostat/silabs/include/AppConfig.h

@@ -23,9 +23,9 @@
 
 // ---- Lighting Example App Config ----
 
-#define APP_TASK_NAME "Lit"
+#define APP_TASK_NAME "Therm"
 
-#define BLE_DEV_NAME "SiLabs-Thermostat"
+#define BLE_DEV_NAME "SL-" APP_TASK_NAME
 
 // Time it takes in ms for the simulated actuator to move from one
 // state to another.

examples/thermostat/silabs/src/AppTask.cpp

@@ -79,7 +79,6 @@ CHIP_ERROR AppTask::AppInit()
     chip::DeviceLayer::Silabs::GetPlatform().SetButtonsCb(AppTask::ButtonEventHandler);
 
 #ifdef DISPLAY_ENABLED
-    GetLCD().Init((uint8_t *) "Thermostat-App");
     GetLCD().SetCustomUI(ThermostatUI::DrawUI);
 #endif
 

examples/window-app/silabs/include/AppConfig.h

@@ -22,9 +22,9 @@
 #include "silabs_utils.h"
 
 // ---- Window Example App Config ----
-#define APP_TASK_NAME "APP"
+#define APP_TASK_NAME "Window"
 #define APP_EVENT_QUEUE_SIZE 20
-#define BLE_DEV_NAME "SiLabs-Window"
+#define BLE_DEV_NAME "SL-" APP_TASK_NAME
 
 #define LCD_SIZE 128
 #define LCD_MARGIN_SIZE 1

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

@@ -50,10 +50,6 @@ CHIP_ERROR AppTask::AppInit()
     CHIP_ERROR err = CHIP_NO_ERROR;
     chip::DeviceLayer::Silabs::GetPlatform().SetButtonsCb(WindowManager::ButtonEventHandler);
 
-#ifdef DISPLAY_ENABLED
-    GetLCD().Init((uint8_t *) "Window-App");
-#endif
-
     err = WindowManager::sWindow.Init();
 
     if (err != CHIP_NO_ERROR)

src/inet/tests/TestInetEndPoint.cpp

@@ -277,8 +277,13 @@ TEST_F(TestInetEndPoint, TestInetEndPointInternal)
 
     err = InterfaceId::Null().GetLinkLocalAddr(&addr);
 
-    // We should skip the following checks if the interface does not have the Link local address
-    ASSERT_NE(err, INET_ERROR_ADDRESS_NOT_FOUND);
+    // We should skip the following checks if the interface does not have the Link local address.
+    // This can happen if you don't have network interfaces connected to any link (like happened
+    // to the author of this comment at YYZ before CSA 2025 Chicago Member Meeting).
+    if (err == INET_ERROR_ADDRESS_NOT_FOUND)
+    {
+        return;
+    }
 
     EXPECT_EQ(err, CHIP_NO_ERROR);
     intId = InterfaceId::FromIPAddress(addr);