[ICD] Update ICDM XML to match latest spec (#34446)

* Update ICDM xml * Generated files * Update Cert Tests * Fix zap generation
project-chip · Jul 23, 2024 · cc7672e · cc7672e
1 parent f6022e4
commit cc7672e
Show file tree

Hide file tree

Showing 45 changed files with 486 additions and 41 deletions.
diff --git a/examples/contact-sensor-app/nxp/zap-lit/contact-sensor-app.matter b/examples/contact-sensor-app/nxp/zap-lit/contact-sensor-app.matter
@@ -1313,7 +1313,7 @@ cluster BooleanState = 69 {
 
 /** Allows servers to ensure that listed clients are notified when a server is available for communication. */
 cluster IcdManagement = 70 {
-  revision 2;
+  revision 3;
 
   enum ClientTypeEnum : enum8 {
     kPermanent = 0;
@@ -1329,6 +1329,7 @@ cluster IcdManagement = 70 {
     kCheckInProtocolSupport = 0x1;
     kUserActiveModeTrigger = 0x2;
     kLongIdleTimeSupport = 0x4;
+    kDynamicSitLitSupport = 0x8;
   }
 
   bitmap UserActiveModeTriggerBitmap : bitmap32 {
@@ -1367,6 +1368,7 @@ cluster IcdManagement = 70 {
   provisional readonly attribute optional UserActiveModeTriggerBitmap userActiveModeTriggerHint = 6;
   provisional readonly attribute optional char_string<128> userActiveModeTriggerInstruction = 7;
   provisional readonly attribute optional OperatingModeEnum operatingMode = 8;
+  provisional readonly attribute optional int32u maximumCheckInBackOff = 9;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -1706,7 +1708,7 @@ endpoint 0 {
     callback attribute eventList;
     callback attribute attributeList;
     ram      attribute featureMap default = 0x0007;
-    ram      attribute clusterRevision default = 2;
+    ram      attribute clusterRevision default = 3;
 
     handle command RegisterClient;
     handle command RegisterClientResponse;

diff --git a/examples/contact-sensor-app/nxp/zap-lit/contact-sensor-app.zap b/examples/contact-sensor-app/nxp/zap-lit/contact-sensor-app.zap
@@ -3834,7 +3834,7 @@
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "2",
+              "defaultValue": "3",
               "reportable": 1,
               "minInterval": 1,
               "maxInterval": 65534,

diff --git a/examples/contact-sensor-app/nxp/zap-sit/contact-sensor-app.matter b/examples/contact-sensor-app/nxp/zap-sit/contact-sensor-app.matter
@@ -1313,7 +1313,7 @@ cluster BooleanState = 69 {
 
 /** Allows servers to ensure that listed clients are notified when a server is available for communication. */
 cluster IcdManagement = 70 {
-  revision 2;
+  revision 3;
 
   enum ClientTypeEnum : enum8 {
     kPermanent = 0;
@@ -1329,6 +1329,7 @@ cluster IcdManagement = 70 {
     kCheckInProtocolSupport = 0x1;
     kUserActiveModeTrigger = 0x2;
     kLongIdleTimeSupport = 0x4;
+    kDynamicSitLitSupport = 0x8;
   }
 
   bitmap UserActiveModeTriggerBitmap : bitmap32 {
@@ -1367,6 +1368,7 @@ cluster IcdManagement = 70 {
   provisional readonly attribute optional UserActiveModeTriggerBitmap userActiveModeTriggerHint = 6;
   provisional readonly attribute optional char_string<128> userActiveModeTriggerInstruction = 7;
   provisional readonly attribute optional OperatingModeEnum operatingMode = 8;
+  provisional readonly attribute optional int32u maximumCheckInBackOff = 9;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -1700,7 +1702,7 @@ endpoint 0 {
     callback attribute eventList;
     callback attribute attributeList;
     ram      attribute featureMap default = 0x0000;
-    ram      attribute clusterRevision default = 2;
+    ram      attribute clusterRevision default = 3;
   }
 }
 endpoint 1 {

diff --git a/examples/contact-sensor-app/nxp/zap-sit/contact-sensor-app.zap b/examples/contact-sensor-app/nxp/zap-sit/contact-sensor-app.zap
@@ -3696,7 +3696,7 @@
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "2",
+              "defaultValue": "3",
               "reportable": 1,
               "minInterval": 1,
               "maxInterval": 65534,

diff --git a/examples/light-switch-app/light-switch-common/light-switch-app.matter b/examples/light-switch-app/light-switch-common/light-switch-app.matter
@@ -1937,7 +1937,7 @@ cluster UserLabel = 65 {
 
 /** Allows servers to ensure that listed clients are notified when a server is available for communication. */
 cluster IcdManagement = 70 {
-  revision 2;
+  revision 3;
 
   enum ClientTypeEnum : enum8 {
     kPermanent = 0;
@@ -1953,6 +1953,7 @@ cluster IcdManagement = 70 {
     kCheckInProtocolSupport = 0x1;
     kUserActiveModeTrigger = 0x2;
     kLongIdleTimeSupport = 0x4;
+    kDynamicSitLitSupport = 0x8;
   }
 
   bitmap UserActiveModeTriggerBitmap : bitmap32 {
@@ -1991,6 +1992,7 @@ cluster IcdManagement = 70 {
   provisional readonly attribute optional UserActiveModeTriggerBitmap userActiveModeTriggerHint = 6;
   provisional readonly attribute optional char_string<128> userActiveModeTriggerInstruction = 7;
   provisional readonly attribute optional OperatingModeEnum operatingMode = 8;
+  provisional readonly attribute optional int32u maximumCheckInBackOff = 9;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -2885,7 +2887,7 @@ endpoint 0 {
     callback attribute activeModeDuration;
     callback attribute activeModeThreshold;
     ram      attribute featureMap default = 0x0000;
-    ram      attribute clusterRevision default = 2;
+    ram      attribute clusterRevision default = 3;
   }
 }
 endpoint 1 {

diff --git a/examples/light-switch-app/light-switch-common/light-switch-app.zap b/examples/light-switch-app/light-switch-common/light-switch-app.zap
@@ -4570,7 +4570,7 @@
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "2",
+              "defaultValue": "3",
               "reportable": 1,
               "minInterval": 1,
               "maxInterval": 65534,

diff --git a/examples/light-switch-app/qpg/zap/switch.matter b/examples/light-switch-app/qpg/zap/switch.matter
@@ -1734,7 +1734,7 @@ cluster UserLabel = 65 {
 
 /** Allows servers to ensure that listed clients are notified when a server is available for communication. */
 cluster IcdManagement = 70 {
-  revision 2;
+  revision 3;
 
   enum ClientTypeEnum : enum8 {
     kPermanent = 0;
@@ -1750,6 +1750,7 @@ cluster IcdManagement = 70 {
     kCheckInProtocolSupport = 0x1;
     kUserActiveModeTrigger = 0x2;
     kLongIdleTimeSupport = 0x4;
+    kDynamicSitLitSupport = 0x8;
   }
 
   bitmap UserActiveModeTriggerBitmap : bitmap32 {
@@ -1788,6 +1789,7 @@ cluster IcdManagement = 70 {
   provisional readonly attribute optional UserActiveModeTriggerBitmap userActiveModeTriggerHint = 6;
   provisional readonly attribute optional char_string<128> userActiveModeTriggerInstruction = 7;
   provisional readonly attribute optional OperatingModeEnum operatingMode = 8;
+  provisional readonly attribute optional int32u maximumCheckInBackOff = 9;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -2660,7 +2662,7 @@ endpoint 0 {
     callback attribute eventList;
     callback attribute attributeList;
     ram      attribute featureMap default = 0x0007;
-    ram      attribute clusterRevision default = 2;
+    ram      attribute clusterRevision default = 3;
 
     handle command RegisterClient;
     handle command RegisterClientResponse;

diff --git a/examples/light-switch-app/qpg/zap/switch.zap b/examples/light-switch-app/qpg/zap/switch.zap
@@ -4651,7 +4651,7 @@
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "2",
+              "defaultValue": "3",
               "reportable": 1,
               "minInterval": 1,
               "maxInterval": 65534,

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
@@ -1411,7 +1411,7 @@ cluster BooleanState = 69 {
 
 /** Allows servers to ensure that listed clients are notified when a server is available for communication. */
 cluster IcdManagement = 70 {
-  revision 2;
+  revision 3;
 
   enum ClientTypeEnum : enum8 {
     kPermanent = 0;
@@ -1427,6 +1427,7 @@ cluster IcdManagement = 70 {
     kCheckInProtocolSupport = 0x1;
     kUserActiveModeTrigger = 0x2;
     kLongIdleTimeSupport = 0x4;
+    kDynamicSitLitSupport = 0x8;
   }
 
   bitmap UserActiveModeTriggerBitmap : bitmap32 {
@@ -1465,6 +1466,7 @@ cluster IcdManagement = 70 {
   provisional readonly attribute optional UserActiveModeTriggerBitmap userActiveModeTriggerHint = 6;
   provisional readonly attribute optional char_string<128> userActiveModeTriggerInstruction = 7;
   provisional readonly attribute optional OperatingModeEnum operatingMode = 8;
+  provisional readonly attribute optional int32u maximumCheckInBackOff = 9;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -1799,7 +1801,7 @@ endpoint 0 {
     callback attribute eventList;
     callback attribute attributeList;
     ram      attribute featureMap default = 0x0007;
-    ram      attribute clusterRevision default = 2;
+    ram      attribute clusterRevision default = 3;
 
     handle command RegisterClient;
     handle command RegisterClientResponse;

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
@@ -3642,7 +3642,7 @@
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "2",
+              "defaultValue": "3",
               "reportable": 1,
               "minInterval": 1,
               "maxInterval": 65534,

diff --git a/examples/lock-app/lock-common/lock-app.matter b/examples/lock-app/lock-common/lock-app.matter
@@ -1754,7 +1754,7 @@ cluster UserLabel = 65 {
 
 /** Allows servers to ensure that listed clients are notified when a server is available for communication. */
 cluster IcdManagement = 70 {
-  revision 2;
+  revision 3;
 
   enum ClientTypeEnum : enum8 {
     kPermanent = 0;
@@ -1770,6 +1770,7 @@ cluster IcdManagement = 70 {
     kCheckInProtocolSupport = 0x1;
     kUserActiveModeTrigger = 0x2;
     kLongIdleTimeSupport = 0x4;
+    kDynamicSitLitSupport = 0x8;
   }
 
   bitmap UserActiveModeTriggerBitmap : bitmap32 {
@@ -1808,6 +1809,7 @@ cluster IcdManagement = 70 {
   provisional readonly attribute optional UserActiveModeTriggerBitmap userActiveModeTriggerHint = 6;
   provisional readonly attribute optional char_string<128> userActiveModeTriggerInstruction = 7;
   provisional readonly attribute optional OperatingModeEnum operatingMode = 8;
+  provisional readonly attribute optional int32u maximumCheckInBackOff = 9;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -2899,7 +2901,7 @@ endpoint 0 {
     callback attribute activeModeDuration;
     callback attribute activeModeThreshold;
     ram      attribute featureMap default = 0x0000;
-    ram      attribute clusterRevision default = 2;
+    ram      attribute clusterRevision default = 3;
   }
 }
 endpoint 1 {

diff --git a/examples/lock-app/lock-common/lock-app.zap b/examples/lock-app/lock-common/lock-app.zap
@@ -5023,7 +5023,7 @@
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "2",
+              "defaultValue": "3",
               "reportable": 1,
               "minInterval": 1,
               "maxInterval": 65534,

diff --git a/examples/lock-app/qpg/zap/lock.matter b/examples/lock-app/qpg/zap/lock.matter
@@ -1410,7 +1410,7 @@ cluster UserLabel = 65 {
 
 /** Allows servers to ensure that listed clients are notified when a server is available for communication. */
 cluster IcdManagement = 70 {
-  revision 2;
+  revision 3;
 
   enum ClientTypeEnum : enum8 {
     kPermanent = 0;
@@ -1426,6 +1426,7 @@ cluster IcdManagement = 70 {
     kCheckInProtocolSupport = 0x1;
     kUserActiveModeTrigger = 0x2;
     kLongIdleTimeSupport = 0x4;
+    kDynamicSitLitSupport = 0x8;
   }
 
   bitmap UserActiveModeTriggerBitmap : bitmap32 {
@@ -1464,6 +1465,7 @@ cluster IcdManagement = 70 {
   provisional readonly attribute optional UserActiveModeTriggerBitmap userActiveModeTriggerHint = 6;
   provisional readonly attribute optional char_string<128> userActiveModeTriggerInstruction = 7;
   provisional readonly attribute optional OperatingModeEnum operatingMode = 8;
+  provisional readonly attribute optional int32u maximumCheckInBackOff = 9;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -2491,7 +2493,7 @@ endpoint 0 {
     callback attribute eventList;
     callback attribute attributeList;
     ram      attribute featureMap default = 0x0000;
-    ram      attribute clusterRevision default = 2;
+    ram      attribute clusterRevision default = 3;
   }
 }
 endpoint 1 {

diff --git a/examples/lock-app/qpg/zap/lock.zap b/examples/lock-app/qpg/zap/lock.zap
@@ -4289,7 +4289,7 @@
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "2",
+              "defaultValue": "3",
               "reportable": 1,
               "minInterval": 1,
               "maxInterval": 65534,

diff --git a/examples/smoke-co-alarm-app/smoke-co-alarm-common/smoke-co-alarm-app.matter b/examples/smoke-co-alarm-app/smoke-co-alarm-common/smoke-co-alarm-app.matter
@@ -1730,7 +1730,7 @@ cluster UserLabel = 65 {
 
 /** Allows servers to ensure that listed clients are notified when a server is available for communication. */
 cluster IcdManagement = 70 {
-  revision 2;
+  revision 3;
 
   enum ClientTypeEnum : enum8 {
     kPermanent = 0;
@@ -1746,6 +1746,7 @@ cluster IcdManagement = 70 {
     kCheckInProtocolSupport = 0x1;
     kUserActiveModeTrigger = 0x2;
     kLongIdleTimeSupport = 0x4;
+    kDynamicSitLitSupport = 0x8;
   }
 
   bitmap UserActiveModeTriggerBitmap : bitmap32 {
@@ -1784,6 +1785,7 @@ cluster IcdManagement = 70 {
   provisional readonly attribute optional UserActiveModeTriggerBitmap userActiveModeTriggerHint = 6;
   provisional readonly attribute optional char_string<128> userActiveModeTriggerInstruction = 7;
   provisional readonly attribute optional OperatingModeEnum operatingMode = 8;
+  provisional readonly attribute optional int32u maximumCheckInBackOff = 9;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -2233,7 +2235,7 @@ endpoint 0 {
     callback attribute acceptedCommandList;
     callback attribute attributeList;
     ram      attribute featureMap default = 1;
-    ram      attribute clusterRevision default = 2;
+    ram      attribute clusterRevision default = 3;
 
     handle command RegisterClient;
     handle command RegisterClientResponse;

diff --git a/examples/smoke-co-alarm-app/smoke-co-alarm-common/smoke-co-alarm-app.zap b/examples/smoke-co-alarm-app/smoke-co-alarm-common/smoke-co-alarm-app.zap
@@ -3715,7 +3715,7 @@
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "2",
+              "defaultValue": "3",
               "reportable": 1,
               "minInterval": 1,
               "maxInterval": 65534,

diff --git a/examples/window-app/common/window-app.matter b/examples/window-app/common/window-app.matter
@@ -1828,7 +1828,7 @@ cluster UserLabel = 65 {
 
 /** Allows servers to ensure that listed clients are notified when a server is available for communication. */
 cluster IcdManagement = 70 {
-  revision 2;
+  revision 3;
 
   enum ClientTypeEnum : enum8 {
     kPermanent = 0;
@@ -1844,6 +1844,7 @@ cluster IcdManagement = 70 {
     kCheckInProtocolSupport = 0x1;
     kUserActiveModeTrigger = 0x2;
     kLongIdleTimeSupport = 0x4;
+    kDynamicSitLitSupport = 0x8;
   }
 
   bitmap UserActiveModeTriggerBitmap : bitmap32 {
@@ -1882,6 +1883,7 @@ cluster IcdManagement = 70 {
   provisional readonly attribute optional UserActiveModeTriggerBitmap userActiveModeTriggerHint = 6;
   provisional readonly attribute optional char_string<128> userActiveModeTriggerInstruction = 7;
   provisional readonly attribute optional OperatingModeEnum operatingMode = 8;
+  provisional readonly attribute optional int32u maximumCheckInBackOff = 9;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -2481,7 +2483,7 @@ endpoint 0 {
     callback attribute eventList;
     callback attribute attributeList;
     ram      attribute featureMap default = 0x0000;
-    ram      attribute clusterRevision default = 2;
+    ram      attribute clusterRevision default = 3;
   }
 }
 endpoint 1 {

diff --git a/examples/window-app/common/window-app.zap b/examples/window-app/common/window-app.zap
@@ -5205,7 +5205,7 @@
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "2",
+              "defaultValue": "3",
               "reportable": 1,
               "minInterval": 1,
               "maxInterval": 65534,

diff --git a/src/app/tests/suites/certification/Test_TC_ICDM_1_1.yaml b/src/app/tests/suites/certification/Test_TC_ICDM_1_1.yaml
@@ -35,7 +35,7 @@ tests:
       command: "readAttribute"
       attribute: "ClusterRevision"
       response:
-          value: 2
+          value: 3
           constraints:
               type: int16u