Merge branch 'master' into improve_nrf

project-chip · Nov 4, 2021 · fede2d9 · fede2d9
2 parents 3cf4fbf + 2ea9fbc
commit fede2d9
Show file tree

Hide file tree

Showing 313 changed files with 47,024 additions and 30,837 deletions.
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
@@ -16,7 +16,7 @@
     "build": {
         "dockerfile": "Dockerfile",
         "args": {
-            "BUILD_VERSION": "0.5.23"
+            "BUILD_VERSION": "0.5.25"
         }
     },
     "remoteUser": "vscode",

diff --git a/.github/workflows/android.yaml b/.github/workflows/android.yaml
@@ -34,7 +34,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: connectedhomeip/chip-build-android:0.5.23
+            image: connectedhomeip/chip-build-android:0.5.25
             volumes:
                 - "/tmp/log_output:/tmp/test_logs"
 

diff --git a/.github/workflows/bloat_check.yaml b/.github/workflows/bloat_check.yaml
@@ -30,7 +30,7 @@ jobs:
         runs-on: ubuntu-latest
 
         container:
-            image: connectedhomeip/chip-build:0.5.23
+            image: connectedhomeip/chip-build:0.5.25
 
         steps:
             - name: Checkout

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -32,7 +32,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: connectedhomeip/chip-build:0.5.23
+            image: connectedhomeip/chip-build:0.5.25
             volumes:
                 - "/tmp/log_output:/tmp/test_logs"
             options:
@@ -98,7 +98,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: connectedhomeip/chip-build:0.5.23
+            image: connectedhomeip/chip-build:0.5.25
             volumes:
                 - "/tmp/log_output:/tmp/test_logs"
             options:
@@ -182,7 +182,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: connectedhomeip/chip-build:0.5.23
+            image: connectedhomeip/chip-build:0.5.25
             volumes:
                 - "/tmp/log_output:/tmp/test_logs"
             options:

diff --git a/.github/workflows/cirque.yaml b/.github/workflows/cirque.yaml
@@ -29,7 +29,7 @@ jobs:
         timeout-minutes: 60
 
         env:
-            DOCKER_RUN_VERSION: 0.5.23
+            DOCKER_RUN_VERSION: 0.5.25
             GITHUB_CACHE_PATH: /tmp/cirque-cache/
 
         runs-on: ubuntu-latest
@@ -38,7 +38,7 @@ jobs:
 # need to run with privilege, which isn't supported by job.XXX.contaner
 #  https://github.com/actions/container-action/issues/2
 #         container:
-#             image: connectedhomeip/chip-build-cirque:0.5.23
+#             image: connectedhomeip/chip-build-cirque:0.5.25
 #             volumes:
 #                 - "/tmp:/tmp"
 #                 - "/dev/pts:/dev/pts"

diff --git a/.github/workflows/docker_img.yaml b/.github/workflows/docker_img.yaml
@@ -43,6 +43,6 @@ jobs:
             - name: Scan for vulnerabilities
               uses: crazy-max/docker-scan-action@master
               with:
-                  image: connectedhomeip/chip-build${{ matrix.img }}:0.5.23
+                  image: connectedhomeip/chip-build${{ matrix.img }}:0.5.25
                   annotations: true
 
diff --git a/.github/workflows/examples-ameba.yaml b/.github/workflows/examples-ameba.yaml
@@ -28,7 +28,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: connectedhomeip/chip-build-ameba:0.5.23
+            image: connectedhomeip/chip-build-ameba:0.5.25
             options: --user root
 
         steps:

diff --git a/.github/workflows/examples-efr32.yaml b/.github/workflows/examples-efr32.yaml
@@ -38,7 +38,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: connectedhomeip/chip-build-efr32:0.5.23
+            image: connectedhomeip/chip-build-efr32:0.5.25
             volumes:
                 - "/tmp/bloat_reports:/tmp/bloat_reports"
         steps:

diff --git a/.github/workflows/examples-esp32.yaml b/.github/workflows/examples-esp32.yaml
@@ -38,7 +38,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: connectedhomeip/chip-build-esp32:0.5.23
+            image: connectedhomeip/chip-build-esp32:0.5.25
             volumes:
                 - "/tmp/bloat_reports:/tmp/bloat_reports"
 

diff --git a/.github/workflows/examples-infineon.yaml b/.github/workflows/examples-infineon.yaml
@@ -37,7 +37,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: connectedhomeip/chip-build-infineon:0.5.23
+            image: connectedhomeip/chip-build-infineon:0.5.25
 
         steps:
             - name: Checkout
@@ -59,15 +59,23 @@ jobs:
               timeout-minutes: 10
               run: |
                 scripts/run_in_build_env.sh \
-                  "scripts/build/build_examples.py --no-log-timestamps --target-glob 'infineon-*' build"
+                  "scripts/build/build_examples.py --no-log-timestamps --target 'infineon-p6-lock' build"
                 .environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \
                     p6 default lock-app \
                     out/infineon-p6-lock/chip-p6-lock-example.out
-
+            - name: Build all-clusters-app example
+              timeout-minutes: 10
+              run: |
+                scripts/run_in_build_env.sh \
+                  "scripts/build/build_examples.py --no-log-timestamps --target 'infineon-p6-all-clusters' build"
+                .environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \
+                    p6 default all-clusters-app \
+                    out/infineon-p6-all-clusters/chip-p6-clusters-example.out
             - name: Uploading Size Reports
               uses: actions/upload-artifact@v2
               if: ${{ !env.ACT }}
               with:
                   name: Size,P6-Examples,${{ env.GH_EVENT_PR }},${{ env.GH_EVENT_HASH }},${{ env.GH_EVENT_PARENT }}
                   path: |
                     out/infineon-p6-lock/p6-default-lock-app-sizes.json
+                    out/infineon-p6-all-clusters/p6-default-all-clusters-app-sizes.json
diff --git a/.github/workflows/examples-k32w.yaml b/.github/workflows/examples-k32w.yaml
@@ -37,7 +37,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: connectedhomeip/chip-build-k32w:0.5.23
+            image: connectedhomeip/chip-build-k32w:0.5.25
             volumes:
                 - "/tmp/bloat_reports:/tmp/bloat_reports"
         steps:
@@ -69,7 +69,7 @@ jobs:
               timeout-minutes: 5
               run: |
                   scripts/examples/k32w_example.sh \
-                  examples/shell/nxp/k32w/k32w0 out/shell_app_debug
+                  examples/shell/nxp/k32w/k32w0 out/shell_app_debug no_low_power
                   .environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \
                     k32w k32w061+debug shell \
                     out/shell_app_debug/chip-k32w061-shell-example \

diff --git a/.github/workflows/examples-linux-standalone.yaml b/.github/workflows/examples-linux-standalone.yaml
@@ -37,7 +37,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: connectedhomeip/chip-build:0.5.23
+            image: connectedhomeip/chip-build:0.5.25
             volumes:
                 - "/tmp/bloat_reports:/tmp/bloat_reports"
 

diff --git a/.github/workflows/examples-mbed.yaml b/.github/workflows/examples-mbed.yaml
@@ -40,7 +40,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: connectedhomeip/chip-build-mbed-os:0.5.23
+            image: connectedhomeip/chip-build-mbed-os:0.5.25
             volumes:
                 - "/tmp/bloat_reports:/tmp/bloat_reports"
 

diff --git a/.github/workflows/examples-nrfconnect.yaml b/.github/workflows/examples-nrfconnect.yaml
@@ -37,7 +37,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: connectedhomeip/chip-build-nrf-platform:0.5.23
+            image: connectedhomeip/chip-build-nrf-platform:0.5.25
             volumes:
                 - "/tmp/bloat_reports:/tmp/bloat_reports"
 

diff --git a/.github/workflows/examples-qpg.yaml b/.github/workflows/examples-qpg.yaml
@@ -37,7 +37,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: connectedhomeip/chip-build:0.5.23
+            image: connectedhomeip/chip-build:0.5.25
             volumes:
                 - "/tmp/bloat_reports:/tmp/bloat_reports"
         steps:

diff --git a/.github/workflows/examples-telink.yaml b/.github/workflows/examples-telink.yaml
@@ -35,7 +35,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: connectedhomeip/chip-build-telink:0.5.23
+            image: connectedhomeip/chip-build-telink:0.5.25
             volumes:
                 - "/tmp/bloat_reports:/tmp/bloat_reports"
 

diff --git a/.github/workflows/examples-tizen.yaml b/.github/workflows/examples-tizen.yaml
@@ -28,7 +28,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: connectedhomeip/chip-build-tizen:0.5.23
+            image: connectedhomeip/chip-build-tizen:0.5.25
             options: --user root
             volumes:
                 - "/tmp/bloat_reports:/tmp/bloat_reports"

diff --git a/.github/workflows/qemu.yaml b/.github/workflows/qemu.yaml
@@ -34,7 +34,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: connectedhomeip/chip-build-esp32-qemu:0.5.23
+            image: connectedhomeip/chip-build-esp32-qemu:0.5.25
             volumes:
                 - "/tmp/log_output:/tmp/test_logs"
 

diff --git a/.github/workflows/release_artifacts.yaml b/.github/workflows/release_artifacts.yaml
@@ -29,7 +29,7 @@ jobs:
         runs-on: ubuntu-latest
 
         container:
-            image: connectedhomeip/chip-build-esp32:0.5.23
+            image: connectedhomeip/chip-build-esp32:0.5.25
 
         steps:
             - name: Checkout
@@ -70,7 +70,7 @@ jobs:
         runs-on: ubuntu-latest
 
         container:
-            image: connectedhomeip/chip-build-efr32:0.5.23
+            image: connectedhomeip/chip-build-efr32:0.5.25
         steps:
             - name: Checkout
               uses: actions/checkout@v2

diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
@@ -40,7 +40,7 @@ jobs:
         runs-on: ubuntu-latest
 
         container:
-            image: connectedhomeip/chip-build:0.5.23
+            image: connectedhomeip/chip-build:0.5.25
             options:
                 --privileged --sysctl "net.ipv6.conf.all.disable_ipv6=0
                 net.ipv4.conf.all.forwarding=1 net.ipv6.conf.all.forwarding=1"

diff --git a/.github/workflows/unit_integration_test.yaml b/.github/workflows/unit_integration_test.yaml
@@ -37,7 +37,7 @@ jobs:
         runs-on: ubuntu-latest
 
         container:
-            image: connectedhomeip/chip-build:0.5.23
+            image: connectedhomeip/chip-build:0.5.25
             volumes:
                 - "/tmp/log_output:/tmp/test_logs"
                 - "/tmp/happy_test_logs:/tmp/happy_test_logs"

diff --git a/.gitmodules b/.gitmodules
@@ -163,3 +163,6 @@
 	path = third_party/pybind11/repo
 	url = https://github.com/pybind/pybind11
 	branch  = stable
+[submodule "p6/lwip"]
+	path = third_party/p6/p6_sdk/libs/lwip
+	url = https://git.savannah.nongnu.org/git/lwip
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
@@ -235,6 +235,7 @@
                 "esp32-devkitc-temperature-measurement",
                 "esp32-m5stack-all-clusters",
                 "esp32-m5stack-all-clusters-rpc",
+                "infineon-p6-all-clusters",
                 "infineon-p6-lock",
                 "linux-arm64-all-clusters",
                 "linux-arm64-all-clusters-ipv6only",

diff --git a/config/esp32/components/chip/Kconfig b/config/esp32/components/chip/Kconfig
@@ -431,9 +431,16 @@ menu "CHIP Device Layer"
 
     menu "WiFi Station Options"
 
+        config ENABLE_WIFI_STATION
+            bool "Enable CHIP WIFI STATION"
+            default y
+            help
+                Enables WiFi station for CHIP.
+
         config DEFAULT_WIFI_SSID
             string "Default WiFi SSID"
             default ""
+            depends on ENABLE_WIFI_STATION
             help
                 The SSID of network to connect to if no WiFi station configuration exists in NV storage
                 at the time the device boots.
@@ -443,6 +450,7 @@ menu "CHIP Device Layer"
         config DEFAULT_WIFI_PASSWORD
             string "Default WiFi Password"
             default ""
+            depends on ENABLE_WIFI_STATION
             help
                 The password for the default WiFi network.
 
@@ -452,20 +460,23 @@ menu "CHIP Device Layer"
             int "WiFi Station Interface Reconnect Interval (ms)"
             range 0 65535
             default 5000
+            depends on ENABLE_WIFI_STATION
             help
                 The interval at which the CHIP platform will attempt to reconnect to the configured WiFi network (in milliseconds).
 
         config MAX_SCAN_NETWORKS_RESULTS
             int "Max ScanNetworks Results"
             range 0 65535
             default 10
+            depends on ENABLE_WIFI_STATION
             help
                 The maximum number of networks to return as a result of a CHIP NetworkProvisioning:ScanNetworks request.
 
         config WIFI_SCAN_COMPLETION_TIMEOUT
             int "WiFi Scan Completion Timeout (ms)"
             range 0 65535
             default 10000
+            depends on ENABLE_WIFI_STATION
             help
                 The amount of time (in milliseconds) after which the CHIP platform will timeout a WiFi scan
                 operation that hasn't completed.  A value of 0 will disable the timeout logic.
@@ -474,6 +485,7 @@ menu "CHIP Device Layer"
             int "WiFi Connectivity Timeout (ms)"
             range 0 65535
             default 30000
+            depends on ENABLE_WIFI_STATION
             help
                 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.
@@ -482,9 +494,16 @@ menu "CHIP Device Layer"
 
     menu "WiFi AP Options"
 
+        config ENABLE_WIFI_AP
+            bool "Enable CHIP WIFI AP"
+            default y
+            help
+                Enables WiFi AP for CHIP.
+
         config WIFI_AP_SSID_PREFIX
             string "WiFi AP SSID Prefix"
             default "MATTER-"
+            depends on ENABLE_WIFI_AP
             help
                 A prefix string used in forming the WiFi soft-AP SSID.  The remainder of the SSID
                 consists of the final two bytes of the device's primary WiFi MAC address in hex.
@@ -493,27 +512,31 @@ menu "CHIP Device Layer"
             int "WiFi AP Channel"
             range 1 14
             default 1
+            depends on ENABLE_WIFI_AP
             help
                 The WiFi channel number to be used by the soft-AP.
 
         config WIFI_AP_MAX_STATIONS
             int "WiFi AP Max Allowed Stations"
             range 1 10
             default 4
+            depends on ENABLE_WIFI_AP
             help
                 The maximum number of stations allowed to connect to the soft-AP.
 
         config WIFI_AP_BEACON_INTERVAL
             int "WiFi AP Beacon Interval (ms)"
             range 100 60000
             default 100
+            depends on ENABLE_WIFI_AP
             help
                 The beacon interval (in milliseconds) for the WiFi soft-AP.
 
         config WIFI_AP_IDLE_TIMEOUT
             int "WiFi AP Idle Timeout (ms)"
             range 0 600000
             default 120000
+            depends on ENABLE_WIFI_AP
             help
                 The amount of time (in milliseconds) after which the CHIP platform will deactivate the soft-AP
                 if it has been idle.

diff --git a/config/zephyr/Kconfig b/config/zephyr/Kconfig
@@ -93,6 +93,14 @@ config CHIP_ENABLE_DNS_CLIENT
 	help
 	  Enables DNS client support used for resolving and browsing services.
 
+config CHIP_ENABLE_SLEEPY_END_DEVICE_SUPPORT
+	bool "Enable sleepy end device support"
+	default n
+	depends on OPENTHREAD_MTD
+	imply OPENTHREAD_MTD_SED
+	help
+	  Enables Thread Sleepy End Device support in Matter.
+
 config APP_LINK_WITH_CHIP
 	bool "Link 'app' with Connected Home over IP"
 	default y