Merge branch 'master' into tizen-arm64-dockerfile

Author: andy31415

.devcontainer/Dockerfile

@@ -56,23 +56,18 @@ RUN curl https://raw.githubusercontent.com/restyled-io/restyler/master/bin/resty
 
 RUN mkdir -p /opt/android/sdk \
     && chown -R $USERNAME:$USERNAME \
-    /opt/android/sdk `# NXP uses a patch_sdk script to change SDK files` \
     $ANDROID_HOME \
     $IDF_TOOLS_PATH \
-    && find $AMEBA_PATH -name "inc_lp" -print0 | xargs -0 chown -R $USERNAME:$USERNAME \
-    && find $AMEBA_PATH -name "inc_hp" -print0 | xargs -0 chown -R $USERNAME:$USERNAME \
-    && find $AMEBA_PATH -name "project_lp" -print0 | xargs -0 chown -R $USERNAME:$USERNAME \
-    && find $AMEBA_PATH -name "project_hp" -print0 | xargs -0 chown -R $USERNAME:$USERNAME \
-    && chmod -R +x \
-    $ANDROID_HOME/cmdline-tools/10.0/bin `# sdkmanager for accepting licenses`\
+    && find $AMEBA_PATH \
+    -name "inc_lp" -print0      -or \
+    -name "inc_hp" -print0      -or \
+    -name "project_lp" -print0  -or \
+    -name "project_hp" -print0 \
+    | xargs -0 -I {} sh -c 'chown -R $USERNAME:$USERNAME {}; chmod -R +w {}' \
+    && find $ANDROID_HOME/cmdline-tools/ -type d -name bin | xargs chmod -R +x `# sdkmanager for accepting licenses` \
     && chmod -R +w \
     $IDF_TOOLS_PATH \
-    && find $AMEBA_PATH -name "inc_lp" -print0 | xargs -0 chmod -R +w \
-    && find $AMEBA_PATH -name "inc_hp" -print0 | xargs -0 chmod -R +w \
-    && find $AMEBA_PATH -name "project_lp" -print0 | xargs -0 chmod -R +w \
-    && find $AMEBA_PATH -name "project_hp" -print0 | xargs -0 chmod -R +w \
-    # Safe directory is preferred over chown.
-    && git config --global --add safe.directory "*" \
+    && git config --global --add safe.directory "*" `# Safe directory is preferred over chown.` \
     && :
 
 # Fix Tizen SDK paths for new user

.devcontainer/build.sh

@@ -18,7 +18,7 @@
 
 HERE="$(dirname "$0")"
 CHIP_ROOT="$(realpath "$HERE"/..)"
-BUILD_VERSION="latest"
+BUILD_VERSION=$(sed 's/ .*//' "$CHIP_ROOT/integrations/docker/images/base/chip-build/version")
 IMAGE_TAG="matter-dev-environment:local"
 USER_UID=$UID
 
@@ -32,7 +32,7 @@ Options:
     -h,--help        Show this help
     -t,--tag         Image tag - default is matter-dev-environment:local
     -u,--uid         User UIDa - default is the current user ID
-    -v,--version     Build version - default is the latest
+    -v,--version     Build version - default is the version of the base chip-build docker image
 EOF
 }
 

.devcontainer/devcontainer.json

@@ -20,7 +20,7 @@
             "type": "bind"
         }
     ],
-    "initializeCommand": "bash .devcontainer/build.sh --tag matter-dev-environment:local --version 97",
+    "initializeCommand": "bash .devcontainer/build.sh",
     "image": "matter-dev-environment:local",
     "remoteUser": "vscode",
     "containerEnv": {

.github/workflows/build.yaml

@@ -210,7 +210,7 @@ jobs:
                   ./scripts/run_in_build_env.sh "./scripts/run_codegen_targets.sh out/sanitizers"
             - name: Find changed files
               id: changed-files
-              uses: tj-actions/changed-files@v45
+              uses: tj-actions/changed-files@v46
               with:
                 # Exclude all files under "third_party/"
                 files-ignore: |
@@ -446,7 +446,7 @@ jobs:
                   ./scripts/run_in_build_env.sh "./scripts/run_codegen_targets.sh out/default"
             - name: Find changed files
               id: changed-files
-              uses: tj-actions/changed-files@v45
+              uses: tj-actions/changed-files@v46
             - name: Clang-tidy validation
               # NOTE: clang-tidy crashes on CodegenDataModel_Write due to Nullable/std::optional check.
               #       See https://github.com/llvm/llvm-project/issues/97426

.github/workflows/chef.yaml

@@ -51,6 +51,28 @@ jobs:
               run: |
                   ./scripts/run_in_build_env.sh "./examples/chef/chef.py --ci -t linux"
 
+    chef_linux_all_devices:
+        name: Chef - Linux CI Examples (All chef devices)
+        timeout-minutes: 60
+        runs-on: ubuntu-latest
+        if: github.actor != 'restyled-io[bot]'
+
+        container:
+            image: ghcr.io/project-chip/chip-build:119
+            options: --user root
+
+        steps:
+            - name: Checkout
+              uses: actions/checkout@v4
+            - name: Checkout submodules & Bootstrap
+              uses: ./.github/actions/checkout-submodules-and-bootstrap
+              with:
+                platform: linux
+            - name: CI Examples Linux
+              shell: bash
+              run: |
+                  ./scripts/run_in_build_env.sh "./examples/chef/chef.py --ci_linux"
+
     chef_esp32:
         name: Chef - ESP32 CI Examples
         runs-on: ubuntu-latest

.github/workflows/darwin.yaml

@@ -116,11 +116,10 @@ jobs:
 
                   export TEST_RUNNER_ASAN_OPTIONS=__CURRENT_VALUE__:detect_stack_use_after_return=1
 
-                  # Disable BLE (CHIP_IS_BLE=NO) because the app does not have the permission to use it and that may crash the CI.
                   xcodebuild test -target "Matter" -scheme "Matter Framework Tests" \
                     -resultBundlePath /tmp/darwin/framework-tests/TestResults.xcresult \
                     -sdk macosx ${{ matrix.options.arguments }} \
-                    CHIP_IS_BLE=NO GCC_PREPROCESSOR_DEFINITIONS='${inherited} ${{ matrix.options.defines }}' \
+                    GCC_PREPROCESSOR_DEFINITIONS='${inherited} ${{ matrix.options.defines }}' \
                     > >(tee /tmp/darwin/framework-tests/darwin-tests.log) 2> >(tee /tmp/darwin/framework-tests/darwin-tests-err.log >&2)
             - name: Generate Summary
               if: always()

.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/examples-nxp.yaml

@@ -40,7 +40,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build-nxp:119
+            image: ghcr.io/project-chip/chip-build-nxp:120
             volumes:
                 - "/tmp/bloat_reports:/tmp/bloat_reports"
         steps:

.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

.github/workflows/tests.yaml

@@ -200,6 +200,7 @@ jobs:
                       src/app/zap-templates/zcl/data-model/chip/time-synchronization-cluster.xml \
                       src/app/zap-templates/zcl/data-model/chip/timer-cluster.xml \
                       src/app/zap-templates/zcl/data-model/chip/tls-certificate-management-cluster.xml \
+                      src/app/zap-templates/zcl/data-model/chip/tls-client-management-cluster.xml \
                       src/app/zap-templates/zcl/data-model/chip/user-label-cluster.xml \
                       src/app/zap-templates/zcl/data-model/chip/unit-localization-cluster.xml \
                       src/app/zap-templates/zcl/data-model/chip/wake-on-lan-cluster.xml \

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

config/esp32/components/chip/CMakeLists.txt

@@ -444,6 +444,10 @@ if (CONFIG_SEC_CERT_DAC_PROVIDER)
     list(APPEND matter_requires espressif__esp_secure_cert_mgr)
 endif()
 
+if (CONFIG_ENABLE_ENCRYPTED_OTA)
+    list(APPEND matter_requires espressif__esp_encrypted_img)
+endif()
+
 add_prebuilt_library(matterlib "${CMAKE_CURRENT_BINARY_DIR}/lib/libCHIP.a"
                      REQUIRES ${matter_requires})
 

config/esp32/components/chip/idf_component.yml

@@ -11,7 +11,7 @@ dependencies:
             - if: "idf_version >=4.3"
 
     espressif/esp_encrypted_img:
-        version: "2.1.0"
+        version: "2.3.0"
         require: public
         rules:
             - if: "idf_version >=4.4"
@@ -37,6 +37,6 @@ dependencies:
             - if: "idf_version >=4.3"
 
     espressif/esp_wifi_remote:
-        version: ">=0.1.12"
+        version: "^0.7.0"
         rules:
             - if: "target in [esp32p4]"

docs/ids_and_codes/ERROR_CODES.md

@@ -56,8 +56,10 @@ This file was **AUTOMATICALLY** generated by
 | 38        | 0x26  | `CHIP_ERROR_WRONG_TLV_TYPE`                        |
 | 39        | 0x27  | `CHIP_ERROR_TLV_CONTAINER_OPEN`                    |
 | 40        | 0x28  | `CHIP_ERROR_IN_USE`                                |
+| 41        | 0x29  | `CHIP_ERROR_HAD_FAILURES`                          |
 | 42        | 0x2A  | `CHIP_ERROR_INVALID_MESSAGE_TYPE`                  |
 | 43        | 0x2B  | `CHIP_ERROR_UNEXPECTED_TLV_ELEMENT`                |
+| 44        | 0x2C  | `CHIP_ERROR_ALREADY_INITIALIZED`                   |
 | 45        | 0x2D  | `CHIP_ERROR_NOT_IMPLEMENTED`                       |
 | 46        | 0x2E  | `CHIP_ERROR_INVALID_ADDRESS`                       |
 | 47        | 0x2F  | `CHIP_ERROR_INVALID_ARGUMENT`                      |

docs/ids_and_codes/zap_clusters.md

@@ -140,6 +140,7 @@ Generally regenerate using one of:
 |       1872 |      0x750 | EcosystemInformation                                    |
 |       1873 |      0x751 | CommissionerControl                                     |
 |       2049 |      0x801 | TlsCertificateManagement                                |
+|       2050 |      0x802 | TlsClientManagement                                     |
 | 4294048773 | 0xFFF1FC05 | UnitTesting                                             |
 | 4294048774 | 0xFFF1FC06 | FaultInjection                                          |
 | 4294048800 | 0xFFF1FC20 | SampleMei                                               |

docs/platforms/esp32/ota.md

@@ -92,35 +92,50 @@ image can be encrypted/decrypted using an RSA-3072 key pair.
 
 Please follow the steps below to generate an application image for OTA upgrades:
 
-1. Generate a new RSA-3072 key pair or use an existing one.
+1.  Generate a new RSA-3072 key pair or use an existing one.
 
-    - To generate a key pair, use the following command:
+    -   To generate a key pair, use the following command:
 
         ```
         openssl genrsa -out esp_image_encryption_key.pem 3072
         ```
 
-    - Extract the public key from the key pair:
+    -   Extract the public key from the key pair:
         ```
         openssl rsa -in esp_image_encryption_key.pem -pubout -out esp_image_encryption_public_key.pem
         ```
 
-2. Encrypt the application binary using the
-   [esp_enc_img_gen.py](https://github.com/espressif/idf-extra-components/blob/master/esp_encrypted_img/tools/esp_enc_img_gen.py)
-   script.
+2.  Encrypt the application binary using the
+    [esp_enc_img_gen.py](https://github.com/espressif/idf-extra-components/blob/master/esp_encrypted_img/tools/esp_enc_img_gen.py)
+    script.
 
-    - Use the following command to encrypt the OTA image with the public key:
+    Use the following command to encrypt the OTA image with the public key:
 
-        ```
-        python3 esp_enc_img_gen.py encrypt lighting-app.bin esp_image_encryption_public_key.pem lighting-app-encrypted.bin
-        ```
+    ```
+    python3 esp_enc_img_gen.py encrypt lighting-app.bin esp_image_encryption_public_key.pem lighting-app-encrypted.bin
+    ```
 
-    - Append the Matter OTA header:
-        ```
-        src/app/ota_image_tool.py create --vendor-id 0xFFF1 --product-id 0x8000 --version 2 --version-str "v2.0" -da sha256 lighting-app-encrypted.bin lighting-app-encrypted-ota.bin
-        ```
+    Optionally, you can use the cmake function `create_esp_enc_img()` to encrypt
+    the OTA image during the build process. Please find the usage below. This is
+    also demonstrated in the `examples/lighting-app/esp32/main/CMakeLists.txt`
+    file.
+
+    ```
+    create_esp_enc_img(${CMAKE_BINARY_DIR}/${CMAKE_PROJECT_NAME}.bin
+                       ${project_dir}/esp_image_encryption_public_key.pem
+                       ${CMAKE_BINARY_DIR}/${CMAKE_PROJECT_NAME}-encrypted.bin
+                       app)
+    ```
+
+3.  Append the Matter OTA header
+
+    ```
+    src/app/ota_image_tool.py create --vendor-id 0xFFF1 --product-id 0x8000 \
+                                     --version 2 --version-str "v2.0" -da sha256 \
+                                     lighting-app-encrypted.bin lighting-app-encrypted-ota.bin
+    ```
 
-3. Use the `lighting-app-encrypted-ota.bin` file with the OTA Provider app.
+4.  Use the `lighting-app-encrypted-ota.bin` file with the OTA Provider app.
 
 ## Delta OTA
 

examples/air-purifier-app/air-purifier-common/air-purifier-app.matter

@@ -213,10 +213,10 @@ enum TestGlobalEnum : enum8 {
 }
 
 enum ThreeLevelAutoEnum : enum8 {
-  kLow = 0;
-  kMedium = 1;
-  kHigh = 2;
-  kAutomatic = 3;
+  kAuto = 0;
+  kLow = 1;
+  kMedium = 2;
+  kHigh = 3;
 }
 
 bitmap TestGlobalBitmap : bitmap32 {
@@ -1998,7 +1998,7 @@ cluster FanControl = 514 {
 
 /** Attributes and commands for configuring the measurement of temperature, and reporting temperature measurements. */
 cluster TemperatureMeasurement = 1026 {
-  revision 1; // NOTE: Default/not specifically set
+  revision 4;
 
   readonly attribute nullable temperature measuredValue = 0;
   readonly attribute nullable temperature minMeasuredValue = 1;

examples/air-quality-sensor-app/air-quality-sensor-common/air-quality-sensor-app.matter

@@ -213,10 +213,10 @@ enum TestGlobalEnum : enum8 {
 }
 
 enum ThreeLevelAutoEnum : enum8 {
-  kLow = 0;
-  kMedium = 1;
-  kHigh = 2;
-  kAutomatic = 3;
+  kAuto = 0;
+  kLow = 1;
+  kMedium = 2;
+  kHigh = 3;
 }
 
 bitmap TestGlobalBitmap : bitmap32 {
@@ -1734,7 +1734,7 @@ cluster AirQuality = 91 {
 
 /** Attributes and commands for configuring the measurement of temperature, and reporting temperature measurements. */
 cluster TemperatureMeasurement = 1026 {
-  revision 1; // NOTE: Default/not specifically set
+  revision 4;
 
   readonly attribute nullable temperature measuredValue = 0;
   readonly attribute nullable temperature minMeasuredValue = 1;

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/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,21 +68,14 @@ 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);
 #ifdef DISPLAY_ENABLED
-    GetLCD().Init((uint8_t *) "Air-Quality-Sensor");
     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)
     {