Merge branch 'master' into additional-verification-after-attestation

project-chip · Dec 19, 2022 · 9d915df · 9d915df
2 parents e5972ae + 04c20f6
commit 9d915df
Show file tree

Hide file tree

Showing 643 changed files with 29,059 additions and 15,016 deletions.
diff --git a/.github/.wordlist.txt b/.github/.wordlist.txt
@@ -125,6 +125,7 @@ backtrace
 BallastConfiguration
 BarrierControl
 BasicCHIPRegression
+BasicInformation
 baudrate
 BD
 BDX

diff --git a/.github/workflows/examples-efr32.yaml b/.github/workflows/examples-efr32.yaml
@@ -113,7 +113,7 @@ jobs:
       - name: Build example EFR32+WF200 WiFi Lock app for BRD4161A
         timeout-minutes: 15
         run: |
-          scripts/examples/gn_efr32_example.sh examples/lock-app/silabs/efr32/ out/lock_app_wifi_wf200 BRD4161A is_debug=false --wifi wf200
+          scripts/examples/gn_efr32_example.sh examples/lock-app/silabs/efr32/ out/lock_app_wifi_wf200 BRD4161A is_debug=false chip_logging=false --wifi wf200
           .environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py efr32 BRD4161A+wf200 lock-app \
             out/lock_app_wifi_wf200/BRD4161A/chip-efr32-lock-example.out /tmp/bloat_reports/
       - name: Clean out build output

diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
@@ -287,7 +287,7 @@ jobs:
                       .environment/gn_out/.ninja_log
                       .environment/pigweed-venv/*.log
             - name: Build Apps
-              timeout-minutes: 60
+              timeout-minutes: 75
               run: |
                   ./scripts/run_in_build_env.sh \
                      "./scripts/build/build_examples.py \

diff --git a/.github/workflows/zap_regeneration.yaml b/.github/workflows/zap_regeneration.yaml
@@ -28,7 +28,7 @@ jobs:
 
         runs-on: ubuntu-20.04
         container:
-            image: connectedhomeip/chip-build:0.6.18
+            image: connectedhomeip/chip-build:0.6.23
         defaults:
             run:
                 shell: sh

diff --git a/.github/workflows/zap_templates.yaml b/.github/workflows/zap_templates.yaml
@@ -29,7 +29,7 @@ jobs:
 
         runs-on: ubuntu-20.04
         container:
-            image: connectedhomeip/chip-build:0.6.18
+            image: connectedhomeip/chip-build:0.6.23
         defaults:
             run:
                 shell: sh

diff --git a/docs/guides/access-control-guide.md b/docs/guides/access-control-guide.md
@@ -395,7 +395,7 @@ Some typical clusters:
 -   Clusters.Descriptor.id
 -   Clusters.Binding.id
 -   Clusters.AccessControl.id
--   Clusters.Basic.id
+-   Clusters.BasicInformation.id
 
 ### Examples
 

diff --git a/docs/guides/python_chip_controller_building.md b/docs/guides/python_chip_controller_building.md
@@ -287,24 +287,25 @@ chip-device-ctrl > zcl LevelControl MoveToLevel 1234 1 0 level=50
 
 ### Step 7: Read basic information out of the accessory.
 
-Every Matter accessory device supports a Basic Cluster, which maintains
-collection of attributes that a controller can obtain from a device, such as the
-vendor name, the product name, or software version. Use `zclread` command to
-read those values from the device:
+Every Matter accessory device supports a Basic Information Cluster, which
+maintains collection of attributes that a controller can obtain from a device,
+such as the vendor name, the product name, or software version. Use `zclread`
+command to read those values from the device:
 
 ```
-chip-device-ctrl > zclread Basic VendorName 1234 1 0
-chip-device-ctrl > zclread Basic ProductName 1234 1 0
-chip-device-ctrl > zclread Basic SoftwareVersion 1234 1 0
+chip-device-ctrl > zclread BasicInformation VendorName 1234 1 0
+chip-device-ctrl > zclread BasicInformation ProductName 1234 1 0
+chip-device-ctrl > zclread BasicInformation SoftwareVersion 1234 1 0
 ```
 
 **REPL Command:**
-`await devCtrl.ReadAttribute(1234, [(1, Clusters.Basic.Attributes.VendorName)])`
+`await devCtrl.ReadAttribute(1234, [(1, Clusters.BasicInformation.Attributes.VendorName)])`
 
-> Use the `zcl ? Basic` command to list all available commands for Basic
-> Cluster.
+> Use the `zcl ? BasicInformation` command to list all available commands for
+> Basic Information Cluster.
 >
-> In REPL, you can type `Clusters.Basic.Attributes.` and then use the TAB key.
+> In REPL, you can type `Clusters.BasicInformation.Attributes.` and then use the
+> TAB key.
 
 <hr>
 
@@ -524,7 +525,7 @@ ApplicationBasic
 ApplicationLauncher
 AudioOutput
 BarrierControl
-Basic
+BasicInformation
 Binding
 BridgedDeviceBasic
 ColorControl
@@ -567,10 +568,11 @@ Type `Clusters.` and hit TAB
 
 ### `zcl ? <Cluster>`
 
-List available commands in cluster. For example, for _Basic_ cluster:
+List available commands in cluster. For example, for _Basic Information_
+cluster:
 
 ```
-chip-device-ctrl > zcl ? Basic
+chip-device-ctrl > zcl ? BasicInformation
 DataModelRevision
 VendorName
 VendorID
@@ -600,15 +602,15 @@ Type `Clusters.(cluster name).Commands.` and hit TAB
 Read the value of ZCL attribute. For example:
 
 ```
-chip-device-ctrl > zclread Basic VendorName 1234 1 0
+chip-device-ctrl > zclread BasicInformation VendorName 1234 1 0
 ```
 
 **REPL Commands**
 
 ```python
 # devCtrl.ReadAttribute(<nodeid>, [(<endpoint id>, Clusters.<cluster>.Attributes.<attribute>)])
 # e.g.
-await devCtrl.ReadAttribute(1234, [(1, Clusters.Basic.Attributes.VendorName)])
+await devCtrl.ReadAttribute(1234, [(1, Clusters.BasicInformation.Attributes.VendorName)])
 ```
 
 ### `zclwrite <cluster> <attribute> <nodeid> <endpoint> <groupid> <value>`