Merge branch 'master' into stdbuf_on_darwin

project-chip · Aug 30, 2022 · 7e62540 · 7e62540
2 parents 59dcbe7 + 9bde9e3
commit 7e62540
Show file tree

Hide file tree

Showing 43 changed files with 1,362 additions and 440 deletions.
diff --git a/.github/workflows/examples-esp32.yaml b/.github/workflows/examples-esp32.yaml
@@ -31,7 +31,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: connectedhomeip/chip-build-esp32:0.5.91
+            image: connectedhomeip/chip-build-esp32:0.5.96
             volumes:
                 - "/tmp/bloat_reports:/tmp/bloat_reports"
 
@@ -117,7 +117,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: connectedhomeip/chip-build-esp32:0.5.91
+            image: connectedhomeip/chip-build-esp32:0.5.96
             volumes:
                 - "/tmp/bloat_reports:/tmp/bloat_reports"
 

diff --git a/config/tizen/chip-gn/platform/BUILD.gn b/config/tizen/chip-gn/platform/BUILD.gn
@@ -45,9 +45,6 @@ if (chip_enable_wifi) {
   pkg_config("capi-network-wifi-manager") {
     packages = [ "capi-network-wifi-manager" ]
   }
-  pkg_config("capi-network-softap") {
-    packages = [ "capi-network-softap" ]
-  }
 }
 
 if (chip_enable_ble) {
@@ -74,10 +71,7 @@ source_set("tizen") {
   }
 
   if (chip_enable_wifi) {
-    public_configs += [
-      ":capi-network-wifi-manager",
-      ":capi-network-softap",
-    ]
+    public_configs += [ ":capi-network-wifi-manager" ]
   }
 
   if (chip_enable_ble) {

diff --git a/docs/guides/silabs_efr32_software_update.md b/docs/guides/silabs_efr32_software_update.md
@@ -14,69 +14,54 @@ all of the EFR32 example applications.
 -   On a Linux or Darwin platform build the chip-tool and the ota-provider-app
     as follows:
 
-           ```
            scripts/examples/gn_build_example.sh examples/chip-tool out/
            scripts/examples/gn_build_example.sh examples/ota-provider-app/linux out/debug chip_config_network_layer_ble=false
-           ```
 
 -   Build or download the Gecko Bootloader binary. Follow the instructions in
     "UG266: Silicon Labs Gecko Bootloader User’s Guide". For the bootloader
     using the external flash select the "external SPI" bootloader type
     configured with a single slot of at least 1000 KB. For the bootloader using
     the internal flash see the Internal Storage Bootloader section below.
-    Pre-built binaries for some configurations should be available in
+    Pre-built binaries for some configurations are available at the following
+    location, see README.md for details
 
-           ```
            third_party/silabs/matter_support/matter/efr32/bootloader_binaries
-           ```
 
 -   Using the commander tool upload the bootloader to the device running the
     application.
 
 -   Create a bootable image file (using the Lighting application image as an
     example):
 
-           ```
            commander gbl create chip-efr32-lighting-example.gbl --app chip-efr32-lighting-example.s37
-           ```
 
 -   Create the Matter OTA file from the bootable image file:
 
-           ```
            ./src/app/ota_image_tool.py create -v 0xFFF1 -p 0x8005 -vn 2 -vs "2.0" -da sha256 chip-efr32-lighting-example.gbl chip-efr32-lighting-example.ota
-           ```
 
 -   In a terminal start the Provider app passing to it the path to the Matter
     OTA file created in the previous step:
 
-           ```
            rm -r /tmp/chip_*
            ./out/debug/chip-ota-provider-app -f chip-efr32-lighting-example.ota
-           ```
 
 -   In a separate terminal run the chip-tool commands to provision the Provider:
 
-           ```
            ./out/chip-tool pairing onnetwork 1 20202021
            ./out/chip-tool accesscontrol write acl '[{"fabricIndex": 1, "privilege": 5, "authMode": 2, "subjects": [112233], "targets": null}, {"fabricIndex": 1, "privilege": 3, "authMode": 2, "subjects": null, "targets": null}]' 1 0
-           ```
 
 -   If the application device had been previously commissioned hold Button 0 for
     six seconds to factory-reset the device.
 
 -   In the chip-tool terminal enter:
 
-           ```
            ./out/chip-tool pairing ble-thread 2 hex:<operationalDataset> 20202021 3840
-           ```
 
 where operationalDataset is obtained from the OpenThread Border Router.
 
 -   Once the commissioning process completes enter:
 
-           ```
            ./out/chip-tool otasoftwareupdaterequestor announce-ota-provider 1 0 0 0 2 0
-           ```
 
 -   The application device will connect to the Provider and start the image
     download. Once the image is downloaded the device will reboot into the
@@ -91,9 +76,7 @@ that both images are built with a reduced feature set such as disabled logging
 and Matter shell. The following set of compile flags leaves out all the optional
 features and results in the minimal image size:
 
-           ```
            chip_detail_logging=false chip_automation_logging=false chip_progress_logging=false is_debug=false show_qr_code=false chip_build_libshell=false enable_openthread_cli=false chip_openthread_ftd=true
-           ```
 
 Using LZMA compression when building the .gbl file ( passing `--compress lzma`
 parameter to the `commander gbl create` command) further reduces the downloaded

diff --git a/examples/chip-tool/commands/clusters/SubscriptionsCommands.h b/examples/chip-tool/commands/clusters/SubscriptionsCommands.h
@@ -27,7 +27,8 @@ class ShutdownSubscription : public CHIPCommand
 {
 public:
     ShutdownSubscription(CredentialIssuerCommands * credsIssuerConfig) :
-        CHIPCommand("shutdown-one", credsIssuerConfig, "Shut down a single subscription, identified by its subscription id.")
+        CHIPCommand("shutdown-one", credsIssuerConfig,
+                    "Shut down a single subscription, identified by its subscription id and target node id.")
     {
         AddArgument("subscription-id", 0, UINT64_MAX, &mSubscriptionId);
         AddArgument("node-id", 0, UINT64_MAX, &mNodeId,

diff --git a/examples/light-switch-app/efr32/README.md b/examples/light-switch-app/efr32/README.md
@@ -66,6 +66,9 @@ Silicon Labs platform.
     MG12 boards:
 
     -   BRD4161A / SLWSTK6000B / Wireless Starter Kit / 2.4GHz@19dBm
+    -   BRD4162A / SLWSTK6000B / Wireless Starter Kit / 2.4GHz@10dBm
+    -   BRD4163A / SLWSTK6000B / Wireless Starter Kit / 2.4GHz@10dBm,
+        868MHz@19dBm
     -   BRD4164A / SLWSTK6000B / Wireless Starter Kit / 2.4GHz@19dBm
     -   BRD4166A / SLTB004A / Thunderboard Sense 2 / 2.4GHz@10dBm
     -   BRD4170A / SLWSTK6000B / Multiband Wireless Starter Kit / 2.4GHz@19dBm,
@@ -78,8 +81,12 @@ Silicon Labs platform.
 
     MG24 boards :
 
+    -   BRD2601B / SLWSTK6000B / Wireless Starter Kit / 2.4GHz@10dBm
+    -   BRD2703A / SLWSTK6000B / Wireless Starter Kit / 2.4GHz@10dBm
     -   BRD4186A / SLWSTK6006A / Wireless Starter Kit / 2.4GHz@10dBm
+    -   BRD4186C / SLWSTK6006A / Wireless Starter Kit / 2.4GHz@10dBm
     -   BRD4187A / SLWSTK6006A / Wireless Starter Kit / 2.4GHz@20dBm
+    -   BRD4187C / SLWSTK6006A / Wireless Starter Kit / 2.4GHz@20dBm
 
 *   Build the example application:
 

diff --git a/examples/lighting-app/efr32/README.md b/examples/lighting-app/efr32/README.md
@@ -63,6 +63,9 @@ Silicon Labs platform.
     MG12 boards:
 
     -   BRD4161A / SLWSTK6000B / Wireless Starter Kit / 2.4GHz@19dBm
+    -   BRD4162A / SLWSTK6000B / Wireless Starter Kit / 2.4GHz@10dBm
+    -   BRD4163A / SLWSTK6000B / Wireless Starter Kit / 2.4GHz@10dBm,
+        868MHz@19dBm
     -   BRD4164A / SLWSTK6000B / Wireless Starter Kit / 2.4GHz@19dBm
     -   BRD4166A / SLTB004A / Thunderboard Sense 2 / 2.4GHz@10dBm
     -   BRD4170A / SLWSTK6000B / Multiband Wireless Starter Kit / 2.4GHz@19dBm,
@@ -75,8 +78,12 @@ Silicon Labs platform.
 
     MG24 boards :
 
+    -   BRD2601B / SLWSTK6000B / Wireless Starter Kit / 2.4GHz@10dBm
+    -   BRD2703A / SLWSTK6000B / Wireless Starter Kit / 2.4GHz@10dBm
     -   BRD4186A / SLWSTK6006A / Wireless Starter Kit / 2.4GHz@10dBm
+    -   BRD4186C / SLWSTK6006A / Wireless Starter Kit / 2.4GHz@10dBm
     -   BRD4187A / SLWSTK6006A / Wireless Starter Kit / 2.4GHz@20dBm
+    -   BRD4187C / SLWSTK6006A / Wireless Starter Kit / 2.4GHz@20dBm
 
 *   Build the example application:
 

diff --git a/examples/lock-app/efr32/README.md b/examples/lock-app/efr32/README.md
@@ -61,6 +61,9 @@ Silicon Labs platform.
     MG12 boards:
 
     -   BRD4161A / SLWSTK6000B / Wireless Starter Kit / 2.4GHz@19dBm
+    -   BRD4162A / SLWSTK6000B / Wireless Starter Kit / 2.4GHz@10dBm
+    -   BRD4163A / SLWSTK6000B / Wireless Starter Kit / 2.4GHz@10dBm,
+        868MHz@19dBm
     -   BRD4164A / SLWSTK6000B / Wireless Starter Kit / 2.4GHz@19dBm
     -   BRD4166A / SLTB004A / Thunderboard Sense 2 / 2.4GHz@10dBm
     -   BRD4170A / SLWSTK6000B / Multiband Wireless Starter Kit / 2.4GHz@19dBm,
@@ -73,8 +76,13 @@ Silicon Labs platform.
 
     MG24 boards :
 
+    -   BRD4162A / SLWSTK6000B / Wireless Starter Kit / 2.4GHz@10dBm
+    -   BRD4163A / SLWSTK6000B / Wireless Starter Kit / 2.4GHz@10dBm,
+        868MHz@19dBm
     -   BRD4186A / SLWSTK6006A / Wireless Starter Kit / 2.4GHz@10dBm
+    -   BRD4186C / SLWSTK6006A / Wireless Starter Kit / 2.4GHz@10dBm
     -   BRD4187A / SLWSTK6006A / Wireless Starter Kit / 2.4GHz@20dBm
+    -   BRD4187C / SLWSTK6006A / Wireless Starter Kit / 2.4GHz@20dBm
 
 *   Build the example application:
 

diff --git a/examples/persistent-storage/efr32/README.md b/examples/persistent-storage/efr32/README.md
@@ -54,15 +54,29 @@ The EFR32 platform KVS is fully implemented
     MG12 boards:
 
     -   BRD4161A / SLWSTK6000B / Wireless Starter Kit / 2.4GHz@19dBm
+    -   BRD4162A / SLWSTK6000B / Wireless Starter Kit / 2.4GHz@10dBm
+    -   BRD4163A / SLWSTK6000B / Wireless Starter Kit / 2.4GHz@10dBm,
+        868MHz@19dBm
+    -   BRD4164A / SLWSTK6000B / Wireless Starter Kit / 2.4GHz@19dBm
     -   BRD4166A / SLTB004A / Thunderboard Sense 2 / 2.4GHz@10dBm
     -   BRD4170A / SLWSTK6000B / Multiband Wireless Starter Kit / 2.4GHz@19dBm,
         915MHz@19dBm
     -   BRD4304A / SLWSTK6000B / MGM12P Module / 2.4GHz@19dBm
 
-    MG21 boards:
+    MG21 boards: Currently not supported due to RAM limitation.
 
     -   BRD4180A / SLWSTK6006A / Wireless Starter Kit / 2.4GHz@20dBm
 
+    MG24 boards :
+
+    -   BRD4162A / SLWSTK6000B / Wireless Starter Kit / 2.4GHz@10dBm
+    -   BRD4163A / SLWSTK6000B / Wireless Starter Kit / 2.4GHz@10dBm,
+        868MHz@19dBm
+    -   BRD4186A / SLWSTK6006A / Wireless Starter Kit / 2.4GHz@10dBm
+    -   BRD4186C / SLWSTK6006A / Wireless Starter Kit / 2.4GHz@10dBm
+    -   BRD4187A / SLWSTK6006A / Wireless Starter Kit / 2.4GHz@20dBm
+    -   BRD4187C / SLWSTK6006A / Wireless Starter Kit / 2.4GHz@20dBm
+
 *   Build the example application:
 
           cd ~/connectedhomeip

diff --git a/examples/pigweed-app/efr32/README.md b/examples/pigweed-app/efr32/README.md
@@ -66,6 +66,7 @@ following features are available:
     MG12 boards:
 
     -   BRD4161A / SLWSTK6000B / Wireless Starter Kit / 2.4GHz@19dBm
+    -   BRD4162A / SLWSTK6000B / Wireless Starter Kit / 2.4GHz@10dBm
     -   BRD4163A / SLWSTK6000B / Dual band Wireless Starter Kit / 2.4GHz@19dBm,
         868MHz@19dBm
     -   BRD4164A / SLWSTK6000B / Dual band Wireless Starter Kit / 2.4GHz@19dBm,
@@ -75,10 +76,19 @@ following features are available:
         915MHz@19dBm
     -   BRD4304A / SLWSTK6000B / MGM12P Module / 2.4GHz@19dBm
 
-    MG21 boards:
+    MG21 boards: Currently not supported due to RAM limitation.
 
     -   BRD4180A / SLWSTK6006A / Wireless Starter Kit / 2.4GHz@20dBm
 
+    MG24 boards :
+
+    -   BRD2601B / SLWSTK6000B / Wireless Starter Kit / 2.4GHz@10dBm
+    -   BRD2703A / SLWSTK6000B / Wireless Starter Kit / 2.4GHz@10dBm
+    -   BRD4186A / SLWSTK6006A / Wireless Starter Kit / 2.4GHz@10dBm
+    -   BRD4186C / SLWSTK6006A / Wireless Starter Kit / 2.4GHz@10dBm
+    -   BRD4187A / SLWSTK6006A / Wireless Starter Kit / 2.4GHz@20dBm
+    -   BRD4187C / SLWSTK6006A / Wireless Starter Kit / 2.4GHz@20dBm
+
 *   Build the example application:
 
         cd ~/connectedhomeip/examples/pigweed-app/efr32

diff --git a/examples/thermostat/efr32/README.md b/examples/thermostat/efr32/README.md
@@ -66,6 +66,9 @@ Silicon Labs platform.
     MG12 boards:
 
     -   BRD4161A / SLWSTK6000B / Wireless Starter Kit / 2.4GHz@19dBm
+    -   BRD4162A / SLWSTK6000B / Wireless Starter Kit / 2.4GHz@10dBm
+    -   BRD4163A / SLWSTK6000B / Wireless Starter Kit / 2.4GHz@10dBm,
+        868MHz@19dBm
     -   BRD4164A / SLWSTK6000B / Wireless Starter Kit / 2.4GHz@19dBm
     -   BRD4166A / SLTB004A / Thunderboard Sense 2 / 2.4GHz@10dBm
     -   BRD4170A / SLWSTK6000B / Multiband Wireless Starter Kit / 2.4GHz@19dBm,
@@ -78,8 +81,12 @@ Silicon Labs platform.
 
     MG24 boards :
 
+    -   BRD2601B / SLWSTK6000B / Wireless Starter Kit / 2.4GHz@10dBm
+    -   BRD2703A / SLWSTK6000B / Wireless Starter Kit / 2.4GHz@10dBm
     -   BRD4186A / SLWSTK6006A / Wireless Starter Kit / 2.4GHz@10dBm
+    -   BRD4186C / SLWSTK6006A / Wireless Starter Kit / 2.4GHz@10dBm
     -   BRD4187A / SLWSTK6006A / Wireless Starter Kit / 2.4GHz@20dBm
+    -   BRD4187C / SLWSTK6006A / Wireless Starter Kit / 2.4GHz@20dBm
 
 *   Build the example application:
 

diff --git a/examples/window-app/efr32/BUILD.gn b/examples/window-app/efr32/BUILD.gn
@@ -86,6 +86,11 @@ if (efr32_board == "BRD4166A" || efr32_board == "BRD2601B" ||
 
 # WiFi settings
 if (chip_enable_wifi) {
+  # disabling LCD for MG24 for wifi
+  if (efr32_board == "BRD4186C" || efr32_board == "BRD4187C") {
+    show_qr_code = false
+    disable_lcd = true
+  }
   wifi_sdk_dir = "${chip_root}/third_party/silabs/matter_support/matter/wifi"
   efr32_lwip_defs = [ "LWIP_NETIF_API=1" ]
   efr32_lwip_defs += [

diff --git a/examples/window-app/efr32/README.md b/examples/window-app/efr32/README.md
@@ -66,6 +66,9 @@ Silicon Labs platform.
     MG12 boards:
 
     -   BRD4161A / SLWSTK6000B / Wireless Starter Kit / 2.4GHz@19dBm
+    -   BRD4162A / SLWSTK6000B / Wireless Starter Kit / 2.4GHz@10dBm
+    -   BRD4163A / SLWSTK6000B / Wireless Starter Kit / 2.4GHz@10dBm,
+        868MHz@19dBm
     -   BRD4164A / SLWSTK6000B / Wireless Starter Kit / 2.4GHz@19dBm
     -   BRD4166A / SLTB004A / Thunderboard Sense 2 / 2.4GHz@10dBm
     -   BRD4170A / SLWSTK6000B / Multiband Wireless Starter Kit / 2.4GHz@19dBm,
@@ -78,8 +81,12 @@ Silicon Labs platform.
 
     MG24 boards :
 
+    -   BRD2601B / SLWSTK6000B / Wireless Starter Kit / 2.4GHz@10dBm
+    -   BRD2703A / SLWSTK6000B / Wireless Starter Kit / 2.4GHz@10dBm
     -   BRD4186A / SLWSTK6006A / Wireless Starter Kit / 2.4GHz@10dBm
+    -   BRD4186C / SLWSTK6006A / Wireless Starter Kit / 2.4GHz@10dBm
     -   BRD4187A / SLWSTK6006A / Wireless Starter Kit / 2.4GHz@20dBm
+    -   BRD4187C / SLWSTK6006A / Wireless Starter Kit / 2.4GHz@20dBm
 
 *   Build the example application:
 

diff --git a/integrations/cloudbuild/build-all.yaml b/integrations/cloudbuild/build-all.yaml
@@ -6,7 +6,7 @@ steps:
           - "--init"
           - "--recursive"
       id: Submodules
-    - name: "connectedhomeip/chip-build-vscode:0.5.91"
+    - name: "connectedhomeip/chip-build-vscode:0.5.96"
       env:
           - PW_ENVIRONMENT_ROOT=/pwenv
       args:
@@ -21,14 +21,14 @@ steps:
             path: /pwenv
       timeout: 900s
 
-    - name: "connectedhomeip/chip-build-vscode:0.5.91"
+    - name: "connectedhomeip/chip-build-vscode:0.5.96"
       env:
           - PW_ENVIRONMENT_ROOT=/pwenv
       args:
           - >-
               ./scripts/build/build_examples.py --enable-flashbundle
               --target-glob '*' --skip-target-glob
-              '{mbed-*,tizen-*,*-tests*,*-chip-test}' build --create-archives
+              '{tizen-*,*-tests*,*-chip-test}' build --create-archives
               /workspace/artifacts/
       id: CompileAll
       waitFor:

diff --git a/integrations/cloudbuild/chef.yaml b/integrations/cloudbuild/chef.yaml
@@ -1,5 +1,5 @@
 steps:
-    - name: "connectedhomeip/chip-build-vscode:0.5.91"
+    - name: "connectedhomeip/chip-build-vscode:0.5.96"
       env:
           - PW_ENVIRONMENT_ROOT=/pwenv
       args:
@@ -12,7 +12,7 @@ steps:
             path: /pwenv
       timeout: 900s
 
-    - name: "connectedhomeip/chip-build-vscode:0.5.91"
+    - name: "connectedhomeip/chip-build-vscode:0.5.96"
       env:
           - PW_ENVIRONMENT_ROOT=/pwenv
       args:
@@ -26,7 +26,7 @@ steps:
           - name: pwenv
             path: /pwenv
 
-    - name: "connectedhomeip/chip-build-vscode:0.5.91"
+    - name: "connectedhomeip/chip-build-vscode:0.5.96"
       env:
           - PW_ENVIRONMENT_ROOT=/pwenv
       args: