Merge branch 'master' into TC_OCC_1_4_PythonTestScript

project-chip · Aug 1, 2024 · ceb7013 · ceb7013
2 parents f733468 + 4c1f325
commit ceb7013
Show file tree

Hide file tree

Showing 27 changed files with 794 additions and 686 deletions.
diff --git a/examples/all-clusters-app/esp32/sdkconfig_m5stack.defaults b/examples/all-clusters-app/esp32/sdkconfig_m5stack.defaults
@@ -73,3 +73,9 @@ CONFIG_BUILD_CHIP_TESTS=y
 
 # Move functions from IRAM to flash
 CONFIG_FREERTOS_PLACE_FUNCTIONS_INTO_FLASH=y
+
+# Reduce the event loggin buffer to reduce the DRAM usage
+# TODO: remove this once the underlying issue is fixed
+CONFIG_EVENT_LOGGING_CRIT_BUFFER_SIZE=512
+CONFIG_EVENT_LOGGING_INFO_BUFFER_SIZE=512
+CONFIG_EVENT_LOGGING_DEBUG_BUFFER_SIZE=512
diff --git a/examples/all-clusters-app/esp32/sdkconfig_m5stack_rpc.defaults b/examples/all-clusters-app/esp32/sdkconfig_m5stack_rpc.defaults
@@ -78,13 +78,16 @@ CONFIG_BUILD_CHIP_TESTS=y
 # Move functions from IRAM to flash
 CONFIG_FREERTOS_PLACE_FUNCTIONS_INTO_FLASH=y
 
-# to avoid dram overflow, reduce the critical loggin buffer to 1K
-CONFIG_EVENT_LOGGING_CRIT_BUFFER_SIZE=1024
-
 CONFIG_DIAG_USE_EXTERNAL_LOG_WRAP=y
 
 # Memory Optimizations
 CONFIG_NIMBLE_MAX_CONNECTIONS=1
 CONFIG_BTDM_CTRL_BLE_MAX_CONN=1
 CONFIG_BT_NIMBLE_ROLE_CENTRAL=n
 CONFIG_BT_NIMBLE_ROLE_OBSERVER=n
+
+# Reduce the event loggin buffer to reduce the DRAM overflow
+# TODO: remove this once the underlying issue is fixed
+CONFIG_EVENT_LOGGING_CRIT_BUFFER_SIZE=512
+CONFIG_EVENT_LOGGING_INFO_BUFFER_SIZE=512
+CONFIG_EVENT_LOGGING_DEBUG_BUFFER_SIZE=512
diff --git a/examples/lock-app/lock-common/lock-app.matter b/examples/lock-app/lock-common/lock-app.matter
@@ -3079,11 +3079,20 @@ endpoint 1 {
     ram      attribute wrongCodeEntryLimit default = 3;
     ram      attribute userCodeTemporaryDisableTime default = 10;
     ram      attribute requirePINforRemoteOperation default = 0;
+    callback attribute aliroReaderVerificationKey;
+    callback attribute aliroReaderGroupIdentifier;
+    callback attribute aliroReaderGroupSubIdentifier;
+    callback attribute aliroExpeditedTransactionSupportedProtocolVersions;
+    callback attribute aliroGroupResolvingKey;
+    callback attribute aliroSupportedBLEUWBProtocolVersions;
+    callback attribute aliroBLEAdvertisingVersion;
+    callback attribute numberOfAliroCredentialIssuerKeysSupported;
+    callback attribute numberOfAliroEndpointKeysSupported;
     callback attribute generatedCommandList;
     callback attribute acceptedCommandList;
     callback attribute eventList;
     callback attribute attributeList;
-    ram      attribute featureMap default = 0x1DB3;
+    ram      attribute featureMap default = 0x7DB3;
     ram      attribute clusterRevision default = 7;
 
     handle command LockDoor;
@@ -3111,6 +3120,8 @@ endpoint 1 {
     handle command GetCredentialStatusResponse;
     handle command ClearCredential;
     handle command UnboltDoor;
+    handle command SetAliroReaderConfig;
+    handle command ClearAliroReaderConfig;
   }
 }
 

diff --git a/examples/lock-app/lock-common/lock-app.zap b/examples/lock-app/lock-common/lock-app.zap
@@ -5851,6 +5851,22 @@
               "source": "client",
               "isIncoming": 1,
               "isEnabled": 1
+            },
+            {
+              "name": "SetAliroReaderConfig",
+              "code": 40,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            },
+            {
+              "name": "ClearAliroReaderConfig",
+              "code": 41,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
             }
           ],
           "attributes": [
@@ -6270,6 +6286,150 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "AliroReaderVerificationKey",
+              "code": 128,
+              "mfgCode": null,
+              "side": "server",
+              "type": "octet_string",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "AliroReaderGroupIdentifier",
+              "code": 129,
+              "mfgCode": null,
+              "side": "server",
+              "type": "octet_string",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "AliroReaderGroupSubIdentifier",
+              "code": 130,
+              "mfgCode": null,
+              "side": "server",
+              "type": "octet_string",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "AliroExpeditedTransactionSupportedProtocolVersions",
+              "code": 131,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "AliroGroupResolvingKey",
+              "code": 132,
+              "mfgCode": null,
+              "side": "server",
+              "type": "octet_string",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "AliroSupportedBLEUWBProtocolVersions",
+              "code": 133,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "AliroBLEAdvertisingVersion",
+              "code": 134,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int8u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "NumberOfAliroCredentialIssuerKeysSupported",
+              "code": 135,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "NumberOfAliroEndpointKeysSupported",
+              "code": 136,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "GeneratedCommandList",
               "code": 65528,
@@ -6344,7 +6504,7 @@
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "0x1DB3",
+              "defaultValue": "0x7DB3",
               "reportable": 1,
               "minInterval": 1,
               "maxInterval": 65534,

diff --git a/src/app/tests/suites/certification/PICS.yaml b/src/app/tests/suites/certification/PICS.yaml
@@ -2738,6 +2738,46 @@ PICS:
     - label: "Does the DUT(server) support the ExpiringUserTimeOut attribute?"
       id: DRLK.S.A0035
 
+    - label:
+          "Does the DUT(server) support the AliroReaderVerificationKey attribute"
+      id: DRLK.S.A0080
+
+    - label:
+          "Does the DUT(server) support the AliroReaderGroupIdentifier attribute"
+      id: DRLK.S.A0081
+
+    - label:
+          "Does the DUT(server) support the AliroReaderGroupSubIdentifier
+          attribute"
+      id: DRLK.S.A0082
+
+    - label:
+          "Does the DUT(server) support the
+          AliroExpeditedTransactionSupportedProtocolVersions attribute"
+      id: DRLK.S.A0083
+
+    - label: "Does the DUT(server) support the AliroGroupResolvingKey attribute"
+      id: DRLK.S.A0084
+
+    - label:
+          "Does the DUT(server) support the AliroSupportedBLEUWBProtocolVersions
+          attribute"
+      id: DRLK.S.A0085
+
+    - label:
+          "Does the DUT(server) support the AliroBLEAdvertisingVersion attribute"
+      id: DRLK.S.A0086
+
+    - label:
+          "Does the DUT(server) support the
+          NumberOfAliroCredentialIssuerKeysSupported attribute"
+      id: DRLK.S.A0087
+
+    - label:
+          "Does the DUT(server) support the NumberOfAliroEndpointKeysSupported
+          attribute"
+      id: DRLK.S.A0088
+
     #
     #Server ReadOnly attribute
     #
@@ -2869,6 +2909,12 @@ PICS:
     - label: "Does the DUT(server) support the Unbolt Door command?"
       id: DRLK.S.C27.Rsp
 
+    - label: "Does the DUT(server) support the SetAliroReaderConfig command?"
+      id: DRLK.S.C28.Rsp
+
+    - label: "Does the DUT(server) support the ClearAliroReaderConfig command?"
+      id: DRLK.S.C29.Rsp
+
     #
     # server / commandsGenerated
     #
@@ -2970,6 +3016,14 @@ PICS:
     - label: "Does the DUT(server) support the Lock supports unbolting feature?"
       id: DRLK.S.F0c
 
+    - label: "Does the DUT(server) support AliroProvisioning feature?"
+      id: DRLK.S.F0d
+
+    - label:
+          "Does the DUT(server) support Bluetooth LE + UWB Access Control Flow
+          feature?"
+      id: DRLK.S.F0e
+
     #
     # server / manually
     #