Merge branch 'master' into ncs202use

project-chip · Jul 29, 2022 · 2fd9ac7 · 2fd9ac7
2 parents 29ba705 + 1e3b289
commit 2fd9ac7
Show file tree

Hide file tree

Showing 275 changed files with 5,250 additions and 3,144 deletions.
diff --git a/.github/.wordlist.txt b/.github/.wordlist.txt
@@ -44,6 +44,7 @@ aef
 AES
 algs
 alloc
+AlarmCode
 Ameba
 amebad
 amebaiot
@@ -182,6 +183,7 @@ CatalogVendorId
 CBB
 cbd
 CBOR
+Ccache
 ccf
 CCMP
 CCS
@@ -423,6 +425,7 @@ Dockerfile
 Dockerfiles
 Don'ts
 DoorLock
+DoorState
 doru
 DOTBR
 DOVERLAY

diff --git a/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter b/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter
@@ -1577,7 +1577,7 @@ server cluster OperationalCredentials = 62 {
   readonly attribute int8u supportedFabrics = 2;
   readonly attribute int8u commissionedFabrics = 3;
   readonly attribute OCTET_STRING trustedRootCertificates[] = 4;
-  readonly attribute fabric_idx currentFabricIndex = 5;
+  readonly attribute int8u currentFabricIndex = 5;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 
@@ -3477,7 +3477,7 @@ server cluster ApplicationBasic = 1293 {
   }
 
   readonly attribute char_string<32> vendorName = 0;
-  readonly attribute int16u vendorID = 1;
+  readonly attribute vendor_id vendorID = 1;
   readonly attribute char_string<32> applicationName = 2;
   readonly attribute int16u productID = 3;
   readonly attribute ApplicationStatusEnum status = 5;

diff --git a/examples/all-clusters-app/esp32/README.md b/examples/all-clusters-app/esp32/README.md
@@ -113,6 +113,14 @@ make sure the IDF_PATH has been exported(See the manual setup steps above).
         $ source ./scripts/activate.sh
         ```
 
+-   Enable Ccache for faster IDF builds
+
+    It is recommended to have Ccache installed for faster builds
+
+    ```
+    $ export IDF_CCACHE_ENABLE=1
+    ```
+
 -   Target Set
 
 To set IDF target, first:
@@ -278,8 +286,8 @@ the ESP32 all-clusters-app to commission it onto a Wi-Fi network:
 
 Parameters:
 
-1. Discriminator: 3840 (configurable through menuconfig)
-2. Setup-pin-code: 20202021 (configurable through menuconfig)
+1. Discriminator: 3840
+2. Setup-pin-code: 20202021
 3. Node-id: 12344321 (you can assign any node id)
 
 ### Cluster control

diff --git a/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter b/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter
@@ -1422,7 +1422,7 @@ server cluster OperationalCredentials = 62 {
   readonly attribute int8u supportedFabrics = 2;
   readonly attribute int8u commissionedFabrics = 3;
   readonly attribute OCTET_STRING trustedRootCertificates[] = 4;
-  readonly attribute fabric_idx currentFabricIndex = 5;
+  readonly attribute int8u currentFabricIndex = 5;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 

diff --git a/examples/all-clusters-minimal-app/esp32/README.md b/examples/all-clusters-minimal-app/esp32/README.md
@@ -113,6 +113,14 @@ make sure the IDF_PATH has been exported(See the manual setup steps above).
         $ source ./scripts/activate.sh
         ```
 
+-   Enable Ccache for faster IDF builds
+
+    It is recommended to have Ccache installed for faster builds
+
+    ```
+    $ export IDF_CCACHE_ENABLE=1
+    ```
+
 -   Target Set
 
 To set IDF target, first:
@@ -278,8 +286,8 @@ the ESP32 all-clusters-minimal-app to commission it onto a Wi-Fi network:
 
 Parameters:
 
-1. Discriminator: 3840 (configurable through menuconfig)
-2. Setup-pin-code: 20202021 (configurable through menuconfig)
+1. Discriminator: 3840
+2. Setup-pin-code: 20202021
 3. Node-id: 12344321 (you can assign any node id)
 
 ### Cluster control

diff --git a/examples/bridge-app/bridge-common/bridge-app.matter b/examples/bridge-app/bridge-common/bridge-app.matter
@@ -1267,7 +1267,7 @@ server cluster OperationalCredentials = 62 {
   readonly attribute int8u supportedFabrics = 2;
   readonly attribute int8u commissionedFabrics = 3;
   readonly attribute OCTET_STRING trustedRootCertificates[] = 4;
-  readonly attribute fabric_idx currentFabricIndex = 5;
+  readonly attribute int8u currentFabricIndex = 5;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute attrib_id attributeList[] = 65531;
@@ -1423,6 +1423,17 @@ server cluster UserLabel = 65 {
   readonly attribute int16u clusterRevision = 65533;
 }
 
+server cluster TemperatureMeasurement = 1026 {
+  readonly attribute nullable int16s measuredValue = 0;
+  readonly attribute nullable int16s minMeasuredValue = 1;
+  readonly attribute nullable int16s maxMeasuredValue = 2;
+  readonly attribute command_id generatedCommandList[] = 65528;
+  readonly attribute command_id acceptedCommandList[] = 65529;
+  readonly attribute attrib_id attributeList[] = 65531;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
+
 endpoint 0 {
   device type bridge = 22;
   binding cluster AccessControl;
@@ -1794,6 +1805,17 @@ endpoint 2 {
     ram      attribute featureMap;
     ram      attribute clusterRevision default = 1;
   }
+
+  server cluster TemperatureMeasurement {
+    callback attribute measuredValue;
+    callback attribute minMeasuredValue default = 0x954D;
+    callback attribute maxMeasuredValue default = 0x7FFF;
+    callback attribute generatedCommandList;
+    callback attribute acceptedCommandList;
+    callback attribute attributeList;
+    callback attribute featureMap;
+    callback attribute clusterRevision default = 1;
+  }
 }