Merge branch 'master' into telink_ota_resume_support

Author: s07641069

.github/workflows/examples-linux-standalone.yaml

@@ -247,7 +247,7 @@ jobs:
                         build"
                   .environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \
                     linux debug camera-controller \
-                    out/linux-x64-camera-controller/camera-controller \
+                    out/linux-x64-camera-controller/chip-camera-controller \
                     /tmp/bloat_reports/                                                     
             - name: Uploading Size Reports
               uses: ./.github/actions/upload-size-reports

.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

BUILD.gn

@@ -394,9 +394,9 @@ if (current_toolchain != "${dir_pw_toolchain}/default:default") {
     enable_linux_rvc_app_build =
         enable_default_builds && (host_os == "linux" || host_os == "mac")
 
+    # TODO: #37983: Add darwin support for libdatachannel and then add host_os == "mac" here.
     # Build the Linux Camera app example.
-    enable_linux_camera_app_build =
-        enable_default_builds && (host_os == "linux" || host_os == "mac")
+    enable_linux_camera_app_build = enable_default_builds && host_os == "linux"
 
     # Build the cc13x2x7_26x2x7 lock app example.
     enable_cc13x2x7_26x2x7_lock_app_build = enable_ti_simplelink_builds

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/AppTask.h

@@ -89,11 +89,11 @@ class AppTask : public BaseApplication
     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/air-quality-sensor-app/silabs/src/AppTask.cpp

@@ -68,7 +68,7 @@ using namespace chip::app::Clusters;
 
 AppTask AppTask::sAppTask;
 
-CHIP_ERROR AppTask::Init()
+CHIP_ERROR AppTask::AppInit()
 {
     CHIP_ERROR err = CHIP_NO_ERROR;
     chip::DeviceLayer::Silabs::GetPlatform().SetButtonsCb(AppTask::ButtonEventHandler);
@@ -77,12 +77,6 @@ CHIP_ERROR AppTask::Init()
     GetLCD().SetCustomUI(AirQualitySensorUI::DrawUI);
 #endif
 
-    err = BaseApplication::Init();
-    if (err != CHIP_NO_ERROR)
-    {
-        ChipLogDetail(AppServer, "BaseApplication::Init() failed");
-        appError(err);
-    }
     err = SensorManager::SensorMgr().Init();
     if (err != CHIP_NO_ERROR)
     {