Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 4 commits into from
Jul 23, 2024
+486 −41
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
73018fd
Update ICDM xml
mkardous-silabs Jul 22, 2024
24ee0b2
Generated files
mkardous-silabs Jul 22, 2024
1a13979
Update Cert Tests
mkardous-silabs Jul 22, 2024
d59ed0d
Fix zap generation
mkardous-silabs Jul 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions examples/contact-sensor-app/nxp/zap-lit/contact-sensor-app.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -1329,6 +1329,7 @@ cluster IcdManagement = 70 {
kCheckInProtocolSupport = 0x1;
kUserActiveModeTrigger = 0x2;
kLongIdleTimeSupport = 0x4;
kDynamicSitLitSupport = 0x8;
}

bitmap UserActiveModeTriggerBitmap : bitmap32 {
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion examples/contact-sensor-app/nxp/zap-lit/contact-sensor-app.zap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3834,7 +3834,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "2",
"defaultValue": "3",
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
Expand Down
6 changes: 4 additions & 2 deletions examples/contact-sensor-app/nxp/zap-sit/contact-sensor-app.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -1329,6 +1329,7 @@ cluster IcdManagement = 70 {
kCheckInProtocolSupport = 0x1;
kUserActiveModeTrigger = 0x2;
kLongIdleTimeSupport = 0x4;
kDynamicSitLitSupport = 0x8;
}

bitmap UserActiveModeTriggerBitmap : bitmap32 {
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion examples/contact-sensor-app/nxp/zap-sit/contact-sensor-app.zap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3696,7 +3696,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "2",
"defaultValue": "3",
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
Expand Down
6 changes: 4 additions & 2 deletions examples/light-switch-app/light-switch-common/light-switch-app.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -1953,6 +1953,7 @@ cluster IcdManagement = 70 {
kCheckInProtocolSupport = 0x1;
kUserActiveModeTrigger = 0x2;
kLongIdleTimeSupport = 0x4;
kDynamicSitLitSupport = 0x8;
}

bitmap UserActiveModeTriggerBitmap : bitmap32 {
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion examples/light-switch-app/light-switch-common/light-switch-app.zap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4570,7 +4570,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "2",
"defaultValue": "3",
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
Expand Down
6 changes: 4 additions & 2 deletions examples/light-switch-app/qpg/zap/switch.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -1750,6 +1750,7 @@ cluster IcdManagement = 70 {
kCheckInProtocolSupport = 0x1;
kUserActiveModeTrigger = 0x2;
kLongIdleTimeSupport = 0x4;
kDynamicSitLitSupport = 0x8;
}

bitmap UserActiveModeTriggerBitmap : bitmap32 {
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion examples/light-switch-app/qpg/zap/switch.zap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4651,7 +4651,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "2",
"defaultValue": "3",
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
Expand Down
6 changes: 4 additions & 2 deletions examples/lit-icd-app/lit-icd-common/lit-icd-server-app.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -1427,6 +1427,7 @@ cluster IcdManagement = 70 {
kCheckInProtocolSupport = 0x1;
kUserActiveModeTrigger = 0x2;
kLongIdleTimeSupport = 0x4;
kDynamicSitLitSupport = 0x8;
}

bitmap UserActiveModeTriggerBitmap : bitmap32 {
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion examples/lit-icd-app/lit-icd-common/lit-icd-server-app.zap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3642,7 +3642,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "2",
"defaultValue": "3",
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
Expand Down
6 changes: 4 additions & 2 deletions examples/lock-app/lock-common/lock-app.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -1770,6 +1770,7 @@ cluster IcdManagement = 70 {
kCheckInProtocolSupport = 0x1;
kUserActiveModeTrigger = 0x2;
kLongIdleTimeSupport = 0x4;
kDynamicSitLitSupport = 0x8;
}

bitmap UserActiveModeTriggerBitmap : bitmap32 {
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion examples/lock-app/lock-common/lock-app.zap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5023,7 +5023,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "2",
"defaultValue": "3",
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
Expand Down
6 changes: 4 additions & 2 deletions examples/lock-app/qpg/zap/lock.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -1426,6 +1426,7 @@ cluster IcdManagement = 70 {
kCheckInProtocolSupport = 0x1;
kUserActiveModeTrigger = 0x2;
kLongIdleTimeSupport = 0x4;
kDynamicSitLitSupport = 0x8;
}

bitmap UserActiveModeTriggerBitmap : bitmap32 {
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion examples/lock-app/qpg/zap/lock.zap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4289,7 +4289,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "2",
"defaultValue": "3",
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
Expand Down
6 changes: 4 additions & 2 deletions examples/smoke-co-alarm-app/smoke-co-alarm-common/smoke-co-alarm-app.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -1746,6 +1746,7 @@ cluster IcdManagement = 70 {
kCheckInProtocolSupport = 0x1;
kUserActiveModeTrigger = 0x2;
kLongIdleTimeSupport = 0x4;
kDynamicSitLitSupport = 0x8;
}

bitmap UserActiveModeTriggerBitmap : bitmap32 {
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion examples/smoke-co-alarm-app/smoke-co-alarm-common/smoke-co-alarm-app.zap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3715,7 +3715,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "2",
"defaultValue": "3",
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
Expand Down
6 changes: 4 additions & 2 deletions examples/window-app/common/window-app.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -1844,6 +1844,7 @@ cluster IcdManagement = 70 {
kCheckInProtocolSupport = 0x1;
kUserActiveModeTrigger = 0x2;
kLongIdleTimeSupport = 0x4;
kDynamicSitLitSupport = 0x8;
}

bitmap UserActiveModeTriggerBitmap : bitmap32 {
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion examples/window-app/common/window-app.zap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5205,7 +5205,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "2",
"defaultValue": "3",
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
Expand Down
2 changes: 1 addition & 1 deletion src/app/tests/suites/certification/Test_TC_ICDM_1_1.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ tests:
command: "readAttribute"
attribute: "ClusterRevision"
response:
value: 2
value: 3
constraints:
type: int16u

Expand Down
Loading
Loading