Merge branch 'master' into subject-descriptor-in-command-handler

project-chip · Dec 14, 2021 · fae0387 · fae0387
2 parents 69a4704 + c9bc5ae
commit fae0387
Show file tree

Hide file tree

Showing 302 changed files with 22,561 additions and 10,184 deletions.
diff --git a/.github/.wordlist.txt b/.github/.wordlist.txt
@@ -26,8 +26,8 @@ AdapterAddress
 AdapterName
 adb
 addr
-AddThreadNetwork
-AddWiFiNetwork
+AddOrUpdateThreadNetwork
+AddOrUpdateWiFiNetwork
 adk
 adoc
 AdvAutonomous
@@ -352,7 +352,7 @@ elftools
 elock
 emberAfExternalAttributeReadCallback
 emberAfExternalAttributeWriteCallback
-EnableNetwork
+ConnectNetwork
 EnableWiFiNetwork
 EndpointId
 endpointName

diff --git a/.github/workflows/examples-efr32.yaml b/.github/workflows/examples-efr32.yaml
@@ -96,6 +96,6 @@ jobs:
               uses: actions/upload-artifact@v2
               if: ${{ !env.ACT }}
               with:
-                  name: Size,EFR32-Examples,${{ env.GH_EVENT_PR }},${{ env.GH_EVENT_HASH }},${{ env.GH_EVENT_PARENT }}
+                  name: Size,EFR32-Examples,${{ env.GH_EVENT_PR }},${{ env.GH_EVENT_HASH }},${{ env.GH_EVENT_PARENT }},${{ github.event_name }}
                   path: |
                       /tmp/bloat_reports/
diff --git a/.github/workflows/examples-esp32.yaml b/.github/workflows/examples-esp32.yaml
@@ -113,5 +113,5 @@ jobs:
               uses: actions/upload-artifact@v2
               if: ${{ !env.ACT }}
               with:
-                  name: Size,ESP32-Examples,${{ env.GH_EVENT_PR }},${{ env.GH_EVENT_HASH }},${{ env.GH_EVENT_PARENT }}
+                  name: Size,ESP32-Examples,${{ env.GH_EVENT_PR }},${{ env.GH_EVENT_HASH }},${{ env.GH_EVENT_PARENT }},${{ github.event_name }}
                   path: /tmp/bloat_reports/
diff --git a/.github/workflows/examples-infineon.yaml b/.github/workflows/examples-infineon.yaml
@@ -100,7 +100,7 @@ jobs:
               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 }}
+                  name: Size,P6-Examples,${{ env.GH_EVENT_PR }},${{ env.GH_EVENT_HASH }},${{ env.GH_EVENT_PARENT }},${{ github.event_name }}
                   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
@@ -92,6 +92,6 @@ jobs:
               uses: actions/upload-artifact@v2
               if: ${{ !env.ACT }}
               with:
-                  name: Size,K32W-Examples,${{ env.GH_EVENT_PR }},${{ env.GH_EVENT_HASH }},${{ env.GH_EVENT_PARENT }}
+                  name: Size,K32W-Examples,${{ env.GH_EVENT_PR }},${{ env.GH_EVENT_HASH }},${{ env.GH_EVENT_PARENT }},${{ github.event_name }}
                   path: |
                       /tmp/bloat_reports/
diff --git a/.github/workflows/examples-linux-arm.yaml b/.github/workflows/examples-linux-arm.yaml
@@ -87,6 +87,6 @@ jobs:
               uses: actions/upload-artifact@v2
               if: ${{ !env.ACT }}
               with:
-                  name: Size,Linux-Examples,${{ env.GH_EVENT_PR }},${{ env.GH_EVENT_HASH }},${{ env.GH_EVENT_PARENT }}
+                  name: Size,Linux-Examples,${{ env.GH_EVENT_PR }},${{ env.GH_EVENT_HASH }},${{ env.GH_EVENT_PARENT }},${{ github.event_name }}
                   path: |
                       /tmp/bloat_reports/
diff --git a/.github/workflows/examples-linux-standalone.yaml b/.github/workflows/examples-linux-standalone.yaml
@@ -132,6 +132,6 @@ jobs:
               uses: actions/upload-artifact@v2
               if: ${{ !env.ACT }}
               with:
-                  name: Size,Linux-Examples,${{ env.GH_EVENT_PR }},${{ env.GH_EVENT_HASH }},${{ env.GH_EVENT_PARENT }}
+                  name: Size,Linux-Examples,${{ env.GH_EVENT_PR }},${{ env.GH_EVENT_HASH }},${{ env.GH_EVENT_PARENT }},${{ github.event_name }}
                   path: |
                       /tmp/bloat_reports/
diff --git a/.github/workflows/examples-mbed.yaml b/.github/workflows/examples-mbed.yaml
@@ -119,6 +119,6 @@ jobs:
               uses: actions/upload-artifact@v2
               if: ${{ !env.ACT }}
               with:
-                  name: Size,Mbed-Examples,${{ env.GH_EVENT_PR }},${{ env.GH_EVENT_HASH }},${{ env.GH_EVENT_PARENT }}
+                  name: Size,Mbed-Examples,${{ env.GH_EVENT_PR }},${{ env.GH_EVENT_HASH }},${{ env.GH_EVENT_PARENT }},${{ github.event_name }}
                   path: |
                       /tmp/bloat_reports/
diff --git a/.github/workflows/examples-nrfconnect.yaml b/.github/workflows/examples-nrfconnect.yaml
@@ -147,8 +147,7 @@ jobs:
             - name: Run unit tests for Zephyr native_posix_64 platform
               timeout-minutes: 10
               run: |
-                  scripts/run_in_build_env.sh "scripts/tests/nrfconnect_native_posix_tests.sh native_posix_64"
-
+                  scripts/run_in_build_env.sh "./scripts/build/build_examples.py --target nrf-native-posix-64-tests build"
             - name: Uploading Failed Test Logs
               uses: actions/upload-artifact@v2
               if: ${{ failure() }} && ${{ !env.ACT }}
@@ -161,6 +160,6 @@ jobs:
               uses: actions/upload-artifact@v2
               if: ${{ !env.ACT }}
               with:
-                  name: Size,nRFConnect-Examples,${{ env.GH_EVENT_PR }},${{ env.GH_EVENT_HASH }},${{ env.GH_EVENT_PARENT }}
+                  name: Size,nRFConnect-Examples,${{ env.GH_EVENT_PR }},${{ env.GH_EVENT_HASH }},${{ env.GH_EVENT_PARENT }},${{ github.event_name }}
                   path: |
                       /tmp/bloat_reports/
diff --git a/.github/workflows/examples-qpg.yaml b/.github/workflows/examples-qpg.yaml
@@ -60,30 +60,30 @@ jobs:
                   path: |
                    .environment/gn_out/.ninja_log
                    .environment/pigweed-venv/*.log
-            - name: Build example QPG6100 Lock App
+            - name: Build example QPG6105 Lock App
               timeout-minutes: 5
               run: |
-                  scripts/examples/gn_build_example.sh examples/lock-app/qpg out/lock_app_debug qpg_target_ic=\"qpg6100\"
+                  scripts/examples/gn_build_example.sh examples/lock-app/qpg out/lock_app_debug qpg_target_ic=\"qpg6105\"
                   .environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \
-                    qpg qpg6100+debug lock-app \
-                    out/lock_app_debug/chip-qpg6100-lock-example.out \
+                    qpg qpg6105+debug lock-app \
+                    out/lock_app_debug/chip-qpg6105-lock-example.out \
                     /tmp/bloat_reports/
-            - name: Build example QPG6100 Lighting App
+            - name: Build example QPG6105 Lighting App
               timeout-minutes: 5
               run: |
-                  scripts/examples/gn_build_example.sh examples/lighting-app/qpg out/lighting_app_debug qpg_target_ic=\"qpg6100\"
+                  scripts/examples/gn_build_example.sh examples/lighting-app/qpg out/lighting_app_debug qpg_target_ic=\"qpg6105\"
                   .environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \
-                    qpg qpg6100+debug lighting-app \
-                    out/lighting_app_debug/chip-qpg6100-lighting-example.out \
+                    qpg qpg6105+debug lighting-app \
+                    out/lighting_app_debug/chip-qpg6105-lighting-example.out \
                     /tmp/bloat_reports/
-            - name: Build example QPG6100 persistent-storage
+            - name: Build example QPG6105 persistent-storage
               timeout-minutes: 5
               run: |
                   scripts/examples/gn_build_example.sh examples/persistent-storage/qpg out/persistent-storage_app_debug \
-                    qpg_target_ic=\"qpg6100\"
+                    qpg_target_ic=\"qpg6105\"
                   .environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \
-                    qpg qpg6100+debug persistent-storage-app \
-                    out/persistent-storage_app_debug/chip-qpg6100-persistent_storage-example.out \
+                    qpg qpg6105+debug persistent-storage-app \
+                    out/persistent-storage_app_debug/chip-qpg6105-persistent_storage-example.out \
                     /tmp/bloat_reports/
             - name: Build Matter SDK library
               timeout-minutes: 5
@@ -94,6 +94,6 @@ jobs:
               uses: actions/upload-artifact@v2
               if: ${{ !env.ACT }}
               with:
-                  name: Size,QPG-Examples,${{ env.GH_EVENT_PR }},${{ env.GH_EVENT_HASH }},${{ env.GH_EVENT_PARENT }}
+                  name: Size,QPG-Examples,${{ env.GH_EVENT_PR }},${{ env.GH_EVENT_HASH }},${{ env.GH_EVENT_PARENT }},${{ github.event_name }}
                   path: |
                       /tmp/bloat_reports/
diff --git a/.github/workflows/examples-telink.yaml b/.github/workflows/examples-telink.yaml
@@ -61,6 +61,6 @@ jobs:
               uses: actions/upload-artifact@v2
               if: ${{ !env.ACT }}
               with:
-                  name: Size,Telink-Examples,${{ env.GH_EVENT_PR }},${{ env.GH_EVENT_HASH }},${{ env.GH_EVENT_PARENT }}
+                  name: Size,Telink-Examples,${{ env.GH_EVENT_PR }},${{ env.GH_EVENT_HASH }},${{ env.GH_EVENT_PARENT }},${{ github.event_name }}
                   path: |
                       /tmp/bloat_reports/
diff --git a/.github/workflows/zap_regeneration.yaml b/.github/workflows/zap_regeneration.yaml
@@ -69,5 +69,7 @@ jobs:
                 USER_EMAIL: ${{ secrets.MATTER_PAT_EMAIL }}
                 USER_NAME: ${{ secrets.MATTER_PAT_NAME }}
                 GITHUB_REPOSITORY: ${{ github.GITHUB_REPOSITORY }}
+            - name: Commit
+              run: git commit -a -m "Regenerating ZAP"
             - name: Push
               run: git push
diff --git a/build/toolchain/flashable_executable.gni b/build/toolchain/flashable_executable.gni
@@ -96,14 +96,21 @@ template("flashable_executable") {
     # The executable is the final target.
     final_target = executable_target
   }
+
+  if (defined(invoker.flashbundle_name)) {
+    flashbundle_name = invoker.flashbundle_name
+  } else {
+    flashbundle_name = "${target_name}.flashbundle.txt"
+  }
+
   group(target_name) {
     data_deps = [ ":$final_target" ]
 
     if (defined(invoker.data_deps)) {
       data_deps += invoker.data_deps
     }
 
-    write_runtime_deps = "${root_out_dir}/${target_name}.flashbundle.txt"
+    write_runtime_deps = "${root_out_dir}/${flashbundle_name}"
   }
 
   if (defined(invoker.objcopy_image_name)) {

diff --git a/docs/guides/mbedos_commissioning.md b/docs/guides/mbedos_commissioning.md
@@ -226,15 +226,15 @@ To run the commissioning process via BLE:
 
 -   Pass the Wi-Fi credentials to the device:
 
-        chip-device-ctrl > zcl NetworkCommissioning AddWiFiNetwork 1234 0 0 ssid=str:TESTSSID credentials=str:P455W4RD breadcrumb=0 timeoutMs=1000
+        chip-device-ctrl > zcl NetworkCommissioning AddOrUpdateWiFiNetwork 1234 0 0 ssid=str:TESTSSID credentials=str:P455W4RD breadcrumb=0 timeoutMs=1000
 
 -   Enable the Wi-Fi interface:
 
-        chip-device-ctrl > zcl NetworkCommissioning EnableNetwork 1234 0 0 networkID=str:TESTSSID breadcrumb=0 timeoutMs=1000
+        chip-device-ctrl > zcl NetworkCommissioning ConnectNetwork 1234 0 0 networkID=str:TESTSSID breadcrumb=0 timeoutMs=1000
 
 -   Close BLE connection:
 
-        chip-device-ctrl > zcl NetworkCommissioning EnableNetwork 1234 0 0 networkID=str:TESTSSID breadcrumb=0 timeoutMs=1000
+        chip-device-ctrl > zcl NetworkCommissioning ConnectNetwork 1234 0 0 networkID=str:TESTSSID breadcrumb=0 timeoutMs=1000
 
 -   Discover IP address of the device (address is cached in the controller for
     later usage). You should provide the fabric and node ID:

diff --git a/docs/guides/nxp_imx8m_linux_examples.md b/docs/guides/nxp_imx8m_linux_examples.md
@@ -269,15 +269,15 @@ Thermostat-app is used as an example below.
     -   Provision the **i.MX 8M Mini EVK** to a Wi-Fi AP with the following
         commands by `NetworkCommissioning` Cluster.
 
-        Command `AddWiFiNetwork` sends the target Wi-Fi AP's SSID and password.
-        The `${SSID}` and `${PASSWORD}` should be in plaintext format. At this
-        moment, Wi-Fi is still idle on the **i.MX8 Mini EVK**.
+        Command `AddOrUpdateWiFiNetwork` sends the target Wi-Fi AP's SSID and
+        password. The `${SSID}` and `${PASSWORD}` should be in plaintext format.
+        At this moment, Wi-Fi is still idle on the **i.MX8 Mini EVK**.
 
-        Command `EnableNetwork` triggers the Wi-Fi AP connecting operation on
+        Command `ConnectNetwork` triggers the Wi-Fi AP connecting operation on
         **i.MX8 Mini EVK**.
 
-                chip-device-ctrl > zcl NetworkCommissioning AddWiFiNetwork 8889 0 0 ssid=str:${SSID} credentials=str:${PASSWORD} breadcrumb=0 timeoutMs=5000
-                chip-device-ctrl > zcl NetworkCommissioning EnableNetwork 8889 0 0 networkID=str:${SSID} breadcrumb=0 timeoutMs=15000
+                chip-device-ctrl > zcl NetworkCommissioning AddOrUpdateWiFiNetwork 8889 0 0 ssid=str:${SSID} credentials=str:${PASSWORD} breadcrumb=0 timeoutMs=5000
+                chip-device-ctrl > zcl NetworkCommissioning ConnectNetwork 8889 0 0 networkID=str:${SSID} breadcrumb=0 timeoutMs=15000
 
     -   Make sure the controller device is connected to the same network of this
         Wi-Fi AP because the Wi-Fi connection is established between the Wi-Fi

diff --git a/docs/guides/python_chip_controller_building.md b/docs/guides/python_chip_controller_building.md
@@ -235,14 +235,14 @@ with network credentials.
     > `zcl <Cluster> <Command> <Node Id> <Endpoint Id> <Group Id> [arguments]`
 
     ```
-    chip-device-ctrl > zcl NetworkCommissioning AddThreadNetwork 1234 0 0 operationalDataset=hex:0e080000000000010000000300001335060004001fffe002084fe76e9a8b5edaf50708fde46f999f0698e20510d47f5027a414ffeebaefa92285cc84fa030f4f70656e5468726561642d653439630102e49c0410b92f8c7fbb4f9f3e08492ee3915fbd2f0c0402a0fff8 breadcrumb=0 timeoutMs=3000
+    chip-device-ctrl > zcl NetworkCommissioning AddOrUpdateThreadNetwork 1234 0 0 operationalDataset=hex:0e080000000000010000000300001335060004001fffe002084fe76e9a8b5edaf50708fde46f999f0698e20510d47f5027a414ffeebaefa92285cc84fa030f4f70656e5468726561642d653439630102e49c0410b92f8c7fbb4f9f3e08492ee3915fbd2f0c0402a0fff8 breadcrumb=0
     ```
 
 3. Enable Thread interface on the device by executing the following command with
    `networkID` equal to Extended PAN Id of the Thread network:
 
     ```
-    chip-device-ctrl > zcl NetworkCommissioning EnableNetwork 1234 0 0 networkID=hex:4fe76e9a8b5edaf5 breadcrumb=0 timeoutMs=3000
+    chip-device-ctrl > zcl NetworkCommissioning ConnectNetwork 1234 0 0 networkID=hex:4fe76e9a8b5edaf5 breadcrumb=0
     ```
 
 #### Commissioning a Wi-Fi device
@@ -252,13 +252,13 @@ with network credentials.
    command:
 
     ```
-    chip-device-ctrl > zcl NetworkCommissioning AddWiFiNetwork 1234 0 0 ssid=str:TESTSSID credentials=str:P455W4RD breadcrumb=0 timeoutMs=1000
+    chip-device-ctrl > zcl NetworkCommissioning AddOrUpdateWiFiNetwork 1234 0 0 ssid=str:TESTSSID credentials=str:P455W4RD breadcrumb=0
     ```
 
 2. Enable the Wi-Fi interface on the device by executing the following command:
 
     ```
-    chip-device-ctrl > zcl NetworkCommissioning EnableNetwork 1234 0 0 networkID=str:TESTSSID breadcrumb=0 timeoutMs=1000
+    chip-device-ctrl > zcl NetworkCommissioning ConnectNetwork 1234 0 0 networkID=str:TESTSSID breadcrumb=0
     ```
 
 ### Step 6: Close Bluetooth LE connection.