Merge branch 'master' into UpdateTIExampleApps

.github/actions/bootstrap/action.yaml

@@ -1,8 +1,13 @@
 name: Bootstrap
 description: Bootstrap
+inputs:
+  platform:
+    description: "Platform name"
+    required: false
+    default: none
 runs:
   using: "composite"
   steps:
     - name: Bootstrap
       shell: bash
-      run: bash scripts/bootstrap.sh
+      run: bash scripts/bootstrap.sh -p all,${{ inputs.platform }}

.github/actions/checkout-submodules-and-bootstrap/action.yaml

@@ -24,6 +24,8 @@ runs:
       uses: ./.github/actions/bootstrap-cache
     - name: Bootstrap
       uses: ./.github/actions/bootstrap
+      with:
+        platform: ${{ inputs.platform }}
     - name: Upload Bootstrap Logs
       uses: ./.github/actions/upload-bootstrap-logs
       with:

.github/workflows/examples-k32w.yaml

@@ -37,7 +37,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build-k32w:1
+            image: ghcr.io/project-chip/chip-build-k32w:5
             volumes:
                 - "/tmp/bloat_reports:/tmp/bloat_reports"
         steps:

.github/workflows/tests.yaml

@@ -427,7 +427,7 @@ jobs:
 
             - name: Build Python REPL and example apps
               run: |
-                  scripts/run_in_build_env.sh './scripts/build_python.sh --install_virtual_env out/venv --extra_packages "mobly"'
+                  scripts/run_in_build_env.sh './scripts/build_python.sh --install_virtual_env out/venv'
                   ./scripts/run_in_build_env.sh \
                    "./scripts/build/build_examples.py \
                       --target linux-x64-all-clusters-ipv6only-no-ble-no-wifi-tsan-clang-test \

.github/workflows/zap_templates.yaml

@@ -45,7 +45,12 @@ jobs:
               uses: ./.github/actions/checkout-submodules-and-bootstrap
               with:
                 platform: linux
-
+            # Java formatting requires a newer java to run ktfmt
+            # TODO: this should be eventually inside Docker files
+            - name: Update java
+              run: |
+                apt-get update
+                DEBIAN_FRONTEND=noninteractive apt-get install -fy --fix-missing openjdk-17-jre
             - name: Generate all
               run: ./scripts/run_in_build_env.sh scripts/tools/zap_regen_all.py
             - name: Ensure git works in current working directory

config/esp32/components/chip/CMakeLists.txt

@@ -132,6 +132,10 @@ if(CHIP_CODEGEN_PREGEN_DIR)
     chip_gn_arg_append("chip_code_pre_generated_directory"  "\"${CHIP_CODEGEN_PREGEN_DIR}\"")
 endif()
 
+if(CONFIG_ENABLE_ICD_SERVER)
+    chip_gn_arg_append("chip_enable_icd_server"               "true")
+endif()
+
 if(CONFIG_ENABLE_PW_RPC)
     string(APPEND chip_gn_args "import(\"//build_overrides/pigweed.gni\")\n")
     chip_gn_arg_append("remove_default_configs"             "[\"//third_party/connectedhomeip/third_party/pigweed/repo/pw_build:toolchain_cpp_standard\"]")

config/esp32/components/chip/Kconfig

@@ -292,6 +292,31 @@ menu "CHIP Device Layer"
             help
                 Enables or Disables the support for Commissionable Device Type.
 
+        config ENABLE_ICD_SERVER
+            bool "Enable ICD server"
+            depends on OPENTHREAD_MTD
+            default n
+            help
+                Enables or Disables ICD server
+
+        config ICD_SLOW_POLL_INTERVAL
+            int "ICD Slow Polling Interval"
+            depends on ENABLE_ICD_SERVER
+            default 5000
+            help
+                The value defines the fastest frequency at which the device will typically receive
+                messages in Idle Mode. The Slow Polling interval MAY be the same as the Idle Mode
+                Interval.
+
+        config ICD_FAST_POLL_INTERVAL
+            int "ICD Fast Polling Interval"
+            depends on ENABLE_ICD_SERVER
+            default 200
+            help
+                Fast Polling defines the fastest frequency at which the device can receive messages
+                in Active Mode. The Fast Polling interval SHALL be smaller than the Active Mode
+                Interval.
+
         config ENABLE_BG_EVENT_PROCESSING
             bool "Enable Background event processing"
             default n
@@ -435,39 +460,6 @@ menu "CHIP Device Layer"
                 The amount of time (in milliseconds) to wait for Internet connectivity to be established on
                 the device's WiFi station interface during a Network Provisioning TestConnectivity operation.
 
-        choice WIFI_POWER_SAVE_MODE
-            prompt "WiFi power-saving mode"
-            default WIFI_POWER_SAVE_MIN
-            depends on ENABLE_WIFI_STATION && !ENABLE_WIFI_AP
-            help
-                The Modem-sleep mode which refers to the legacy power-saving mode in the IEEE 802.11 protocol.
-
-            config WIFI_POWER_SAVE_MIN
-                bool "Minimal power-saving mode"
-                help
-                    In minimum power-saving mode, station wakes up every DTIM to receive beacon.
-
-            config WIFI_POWER_SAVE_MAX
-                bool "Maximum power-saving mode"
-                help
-                    In maximum power-saving mode, station wakes up in every listen interval to receive beacon.
-                    Listen interval can be configured by calling API 'esp_wifi_set_config()' before connecting
-                    to AP.
-
-            config WIFI_POWER_SAVE_NONE
-                bool "No power-saving"
-                help
-                    No power save
-
-        endchoice
-
-        config WIFI_PS_LISTEN_INTERVAL
-            int "Listen interval for maximum power-saving mode"
-            depends on WIFI_POWER_SAVE_MAX
-            default 3
-            help
-                Interval for station to listen to beacon from AP. The unit of listen interval is one beacon interval.
-
     endmenu
 
     menu "WiFi AP Options"

docs/examples/index.md

@@ -3,6 +3,15 @@
 The Matter SDK provides examples of Matter devices for different development
 platforms.
 
+## Air Quality Sensor example
+
+```{toctree}
+:glob:
+:maxdepth: 1
+
+air-quality-sensor-app/**/README
+```
+
 ## All clusters example
 
 ```{toctree}

src/app/tests/suites/certification/Test_TC_FLABEL_3_1_Simulated.yaml → examples/air-quality-sensor-app/air-quality-sensor-common/BUILD.gn

@@ -1,4 +1,4 @@
-# Copyright (c) 2021 Project CHIP Authors
+# Copyright (c) 2020 Project CHIP Authors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -12,22 +12,13 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-name: 98.3.1. [TC-FLABEL-1.1] Global Attributes with DUT as Server
+import("//build_overrides/chip.gni")
+import("${chip_root}/src/app/chip_data_model.gni")
 
-PICS:
-    - FLABEL.C
+chip_data_model("air-quality-sensor-common") {
+  zap_file = "air-quality-sensor-app.zap"
 
-config:
-    nodeId: 0x12344321
-    cluster: "Fixed Label"
-    endpoint: 1
-
-tests:
-    #- label: "Wait for the device to be commissioned"
-    #  cluster: "DelayCommands"
-    #  command: "WaitForCommissioning"
-
-    - label: "DUT reads LabelList from the TH"
-      PICS: FLABEL.C.A0000
-      wait: "readAttribute"
-      attribute: "LabelList"
+  zap_pregenerated_dir =
+      "${chip_root}/zzz_generated/air-quality-sensor-app/zap-generated"
+  is_server = true
+}