[ICD] Remove user active mode trigger attributes for the external list (

#30980) * remove user active trigger attributes for the external list * Add tests to validate attributes * generated files * Fix attribute storage options * generated files * update .matter
project-chip · Apr 20, 2024 · dda1327 · dda1327
1 parent 7d73ceb
commit dda1327
Show file tree

Hide file tree

Showing 7 changed files with 99 additions and 12 deletions.
diff --git a/examples/lit-icd-app/lit-icd-common/lit-icd-server-app.matter b/examples/lit-icd-app/lit-icd-common/lit-icd-server-app.matter
@@ -1740,8 +1740,8 @@ endpoint 0 {
     callback attribute registeredClients;
     callback attribute ICDCounter;
     callback attribute clientsSupportedPerFabric;
-    callback attribute userActiveModeTriggerHint;
-    callback attribute userActiveModeTriggerInstruction;
+    ram      attribute userActiveModeTriggerHint default = 0x110D;
+    ram      attribute userActiveModeTriggerInstruction default = "Restart the application";
     callback attribute generatedCommandList;
     callback attribute acceptedCommandList;
     callback attribute eventList;

diff --git a/examples/lit-icd-app/lit-icd-common/lit-icd-server-app.zap b/examples/lit-icd-app/lit-icd-common/lit-icd-server-app.zap
@@ -3494,10 +3494,10 @@
               "side": "server",
               "type": "UserActiveModeTriggerBitmap",
               "included": 1,
-              "storageOption": "External",
+              "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": null,
+              "defaultValue": "0x110D",
               "reportable": 1,
               "minInterval": 1,
               "maxInterval": 65534,
@@ -3510,10 +3510,10 @@
               "side": "server",
               "type": "char_string",
               "included": 1,
-              "storageOption": "External",
+              "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": null,
+              "defaultValue": "Restart the application",
               "reportable": 1,
               "minInterval": 1,
               "maxInterval": 65534,

diff --git a/src/app/tests/suites/TestIcdManagementCluster.yaml b/src/app/tests/suites/TestIcdManagementCluster.yaml
@@ -69,6 +69,23 @@ tests:
               minValue: 0x0
               maxValue: 0xFFFFFFFF
 
+    - label: "Read UserActiveModeTriggerHint"
+      command: "readAttribute"
+      attribute: "UserActiveModeTriggerHint"
+      response:
+          constraints:
+              type: bitmap32
+          value: 0x110D
+
+    - label: "Read UserActiveModeTriggerInstruction"
+      command: "readAttribute"
+      attribute: "UserActiveModeTriggerInstruction"
+      response:
+          constraints:
+              type: char_string
+              minLength: 1
+              maxLength: 128
+
     - label: "Read ClientsSupportedPerFabric"
       command: "readAttribute"
       attribute: "ClientsSupportedPerFabric"

diff --git a/src/app/zap-templates/zcl/zcl-with-test-extensions.json b/src/app/zap-templates/zcl/zcl-with-test-extensions.json
@@ -217,9 +217,7 @@
             "ActiveModeThreshold",
             "RegisteredClients",
             "ICDCounter",
-            "ClientsSupportedPerFabric",
-            "UserActiveModeTriggerHint",
-            "UserActiveModeTriggerInstruction"
+            "ClientsSupportedPerFabric"
         ],
         "Operational Credentials": [
             "SupportedFabrics",

diff --git a/src/app/zap-templates/zcl/zcl.json b/src/app/zap-templates/zcl/zcl.json
@@ -215,9 +215,7 @@
             "ActiveModeThreshold",
             "RegisteredClients",
             "ICDCounter",
-            "ClientsSupportedPerFabric",
-            "UserActiveModeTriggerHint",
-            "UserActiveModeTriggerInstruction"
+            "ClientsSupportedPerFabric"
         ],
         "Operational Credentials": [
             "SupportedFabrics",

diff --git a/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.cpp b/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.cpp
diff --git a/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.h b/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.h