Skip to content

Commit f2ea34f

Browse files
lazarkovlazarkov
authored
Merge branch 'master' into feature/add-validation-logic
2 parents 3d8f2e7 + cc7672e commit f2ea34f

File tree

45 files changed

+486
-41
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+486
-41
lines changed

‎examples/contact-sensor-app/nxp/zap-lit/contact-sensor-app.matter

+4-2
Original file line numberDiff line numberDiff line change
@@ -1313,7 +1313,7 @@ cluster BooleanState = 69 {
13131313

13141314
/** Allows servers to ensure that listed clients are notified when a server is available for communication. */
13151315
cluster IcdManagement = 70 {
1316-
revision 2;
1316+
revision 3;
13171317

13181318
enum ClientTypeEnum : enum8 {
13191319
kPermanent = 0;
@@ -1329,6 +1329,7 @@ cluster IcdManagement = 70 {
13291329
kCheckInProtocolSupport = 0x1;
13301330
kUserActiveModeTrigger = 0x2;
13311331
kLongIdleTimeSupport = 0x4;
1332+
kDynamicSitLitSupport = 0x8;
13321333
}
13331334

13341335
bitmap UserActiveModeTriggerBitmap : bitmap32 {
@@ -1367,6 +1368,7 @@ cluster IcdManagement = 70 {
13671368
provisional readonly attribute optional UserActiveModeTriggerBitmap userActiveModeTriggerHint = 6;
13681369
provisional readonly attribute optional char_string<128> userActiveModeTriggerInstruction = 7;
13691370
provisional readonly attribute optional OperatingModeEnum operatingMode = 8;
1371+
provisional readonly attribute optional int32u maximumCheckInBackOff = 9;
13701372
readonly attribute command_id generatedCommandList[] = 65528;
13711373
readonly attribute command_id acceptedCommandList[] = 65529;
13721374
readonly attribute event_id eventList[] = 65530;
@@ -1706,7 +1708,7 @@ endpoint 0 {
17061708
callback attribute eventList;
17071709
callback attribute attributeList;
17081710
ram attribute featureMap default = 0x0007;
1709-
ram attribute clusterRevision default = 2;
1711+
ram attribute clusterRevision default = 3;
17101712

17111713
handle command RegisterClient;
17121714
handle command RegisterClientResponse;

‎examples/contact-sensor-app/nxp/zap-lit/contact-sensor-app.zap

+1-1
Original file line numberDiff line numberDiff line change
@@ -3834,7 +3834,7 @@
38343834
"storageOption": "RAM",
38353835
"singleton": 0,
38363836
"bounded": 0,
3837-
"defaultValue": "2",
3837+
"defaultValue": "3",
38383838
"reportable": 1,
38393839
"minInterval": 1,
38403840
"maxInterval": 65534,

‎examples/contact-sensor-app/nxp/zap-sit/contact-sensor-app.matter

+4-2
Original file line numberDiff line numberDiff line change
@@ -1313,7 +1313,7 @@ cluster BooleanState = 69 {
13131313

13141314
/** Allows servers to ensure that listed clients are notified when a server is available for communication. */
13151315
cluster IcdManagement = 70 {
1316-
revision 2;
1316+
revision 3;
13171317

13181318
enum ClientTypeEnum : enum8 {
13191319
kPermanent = 0;
@@ -1329,6 +1329,7 @@ cluster IcdManagement = 70 {
13291329
kCheckInProtocolSupport = 0x1;
13301330
kUserActiveModeTrigger = 0x2;
13311331
kLongIdleTimeSupport = 0x4;
1332+
kDynamicSitLitSupport = 0x8;
13321333
}
13331334

13341335
bitmap UserActiveModeTriggerBitmap : bitmap32 {
@@ -1367,6 +1368,7 @@ cluster IcdManagement = 70 {
13671368
provisional readonly attribute optional UserActiveModeTriggerBitmap userActiveModeTriggerHint = 6;
13681369
provisional readonly attribute optional char_string<128> userActiveModeTriggerInstruction = 7;
13691370
provisional readonly attribute optional OperatingModeEnum operatingMode = 8;
1371+
provisional readonly attribute optional int32u maximumCheckInBackOff = 9;
13701372
readonly attribute command_id generatedCommandList[] = 65528;
13711373
readonly attribute command_id acceptedCommandList[] = 65529;
13721374
readonly attribute event_id eventList[] = 65530;
@@ -1700,7 +1702,7 @@ endpoint 0 {
17001702
callback attribute eventList;
17011703
callback attribute attributeList;
17021704
ram attribute featureMap default = 0x0000;
1703-
ram attribute clusterRevision default = 2;
1705+
ram attribute clusterRevision default = 3;
17041706
}
17051707
}
17061708
endpoint 1 {

‎examples/contact-sensor-app/nxp/zap-sit/contact-sensor-app.zap

+1-1
Original file line numberDiff line numberDiff line change
@@ -3696,7 +3696,7 @@
36963696
"storageOption": "RAM",
36973697
"singleton": 0,
36983698
"bounded": 0,
3699-
"defaultValue": "2",
3699+
"defaultValue": "3",
37003700
"reportable": 1,
37013701
"minInterval": 1,
37023702
"maxInterval": 65534,

‎examples/light-switch-app/light-switch-common/light-switch-app.matter

+4-2
Original file line numberDiff line numberDiff line change
@@ -1937,7 +1937,7 @@ cluster UserLabel = 65 {
19371937

19381938
/** Allows servers to ensure that listed clients are notified when a server is available for communication. */
19391939
cluster IcdManagement = 70 {
1940-
revision 2;
1940+
revision 3;
19411941

19421942
enum ClientTypeEnum : enum8 {
19431943
kPermanent = 0;
@@ -1953,6 +1953,7 @@ cluster IcdManagement = 70 {
19531953
kCheckInProtocolSupport = 0x1;
19541954
kUserActiveModeTrigger = 0x2;
19551955
kLongIdleTimeSupport = 0x4;
1956+
kDynamicSitLitSupport = 0x8;
19561957
}
19571958

19581959
bitmap UserActiveModeTriggerBitmap : bitmap32 {
@@ -1991,6 +1992,7 @@ cluster IcdManagement = 70 {
19911992
provisional readonly attribute optional UserActiveModeTriggerBitmap userActiveModeTriggerHint = 6;
19921993
provisional readonly attribute optional char_string<128> userActiveModeTriggerInstruction = 7;
19931994
provisional readonly attribute optional OperatingModeEnum operatingMode = 8;
1995+
provisional readonly attribute optional int32u maximumCheckInBackOff = 9;
19941996
readonly attribute command_id generatedCommandList[] = 65528;
19951997
readonly attribute command_id acceptedCommandList[] = 65529;
19961998
readonly attribute event_id eventList[] = 65530;
@@ -2885,7 +2887,7 @@ endpoint 0 {
28852887
callback attribute activeModeDuration;
28862888
callback attribute activeModeThreshold;
28872889
ram attribute featureMap default = 0x0000;
2888-
ram attribute clusterRevision default = 2;
2890+
ram attribute clusterRevision default = 3;
28892891
}
28902892
}
28912893
endpoint 1 {

‎examples/light-switch-app/light-switch-common/light-switch-app.zap

+1-1
Original file line numberDiff line numberDiff line change
@@ -4570,7 +4570,7 @@
45704570
"storageOption": "RAM",
45714571
"singleton": 0,
45724572
"bounded": 0,
4573-
"defaultValue": "2",
4573+
"defaultValue": "3",
45744574
"reportable": 1,
45754575
"minInterval": 1,
45764576
"maxInterval": 65534,

‎examples/light-switch-app/qpg/zap/switch.matter

+4-2
Original file line numberDiff line numberDiff line change
@@ -1734,7 +1734,7 @@ cluster UserLabel = 65 {
17341734

17351735
/** Allows servers to ensure that listed clients are notified when a server is available for communication. */
17361736
cluster IcdManagement = 70 {
1737-
revision 2;
1737+
revision 3;
17381738

17391739
enum ClientTypeEnum : enum8 {
17401740
kPermanent = 0;
@@ -1750,6 +1750,7 @@ cluster IcdManagement = 70 {
17501750
kCheckInProtocolSupport = 0x1;
17511751
kUserActiveModeTrigger = 0x2;
17521752
kLongIdleTimeSupport = 0x4;
1753+
kDynamicSitLitSupport = 0x8;
17531754
}
17541755

17551756
bitmap UserActiveModeTriggerBitmap : bitmap32 {
@@ -1788,6 +1789,7 @@ cluster IcdManagement = 70 {
17881789
provisional readonly attribute optional UserActiveModeTriggerBitmap userActiveModeTriggerHint = 6;
17891790
provisional readonly attribute optional char_string<128> userActiveModeTriggerInstruction = 7;
17901791
provisional readonly attribute optional OperatingModeEnum operatingMode = 8;
1792+
provisional readonly attribute optional int32u maximumCheckInBackOff = 9;
17911793
readonly attribute command_id generatedCommandList[] = 65528;
17921794
readonly attribute command_id acceptedCommandList[] = 65529;
17931795
readonly attribute event_id eventList[] = 65530;
@@ -2660,7 +2662,7 @@ endpoint 0 {
26602662
callback attribute eventList;
26612663
callback attribute attributeList;
26622664
ram attribute featureMap default = 0x0007;
2663-
ram attribute clusterRevision default = 2;
2665+
ram attribute clusterRevision default = 3;
26642666

26652667
handle command RegisterClient;
26662668
handle command RegisterClientResponse;

‎examples/light-switch-app/qpg/zap/switch.zap

+1-1
Original file line numberDiff line numberDiff line change
@@ -4651,7 +4651,7 @@
46514651
"storageOption": "RAM",
46524652
"singleton": 0,
46534653
"bounded": 0,
4654-
"defaultValue": "2",
4654+
"defaultValue": "3",
46554655
"reportable": 1,
46564656
"minInterval": 1,
46574657
"maxInterval": 65534,

‎examples/lit-icd-app/lit-icd-common/lit-icd-server-app.matter

+4-2
Original file line numberDiff line numberDiff line change
@@ -1411,7 +1411,7 @@ cluster BooleanState = 69 {
14111411

14121412
/** Allows servers to ensure that listed clients are notified when a server is available for communication. */
14131413
cluster IcdManagement = 70 {
1414-
revision 2;
1414+
revision 3;
14151415

14161416
enum ClientTypeEnum : enum8 {
14171417
kPermanent = 0;
@@ -1427,6 +1427,7 @@ cluster IcdManagement = 70 {
14271427
kCheckInProtocolSupport = 0x1;
14281428
kUserActiveModeTrigger = 0x2;
14291429
kLongIdleTimeSupport = 0x4;
1430+
kDynamicSitLitSupport = 0x8;
14301431
}
14311432

14321433
bitmap UserActiveModeTriggerBitmap : bitmap32 {
@@ -1465,6 +1466,7 @@ cluster IcdManagement = 70 {
14651466
provisional readonly attribute optional UserActiveModeTriggerBitmap userActiveModeTriggerHint = 6;
14661467
provisional readonly attribute optional char_string<128> userActiveModeTriggerInstruction = 7;
14671468
provisional readonly attribute optional OperatingModeEnum operatingMode = 8;
1469+
provisional readonly attribute optional int32u maximumCheckInBackOff = 9;
14681470
readonly attribute command_id generatedCommandList[] = 65528;
14691471
readonly attribute command_id acceptedCommandList[] = 65529;
14701472
readonly attribute event_id eventList[] = 65530;
@@ -1799,7 +1801,7 @@ endpoint 0 {
17991801
callback attribute eventList;
18001802
callback attribute attributeList;
18011803
ram attribute featureMap default = 0x0007;
1802-
ram attribute clusterRevision default = 2;
1804+
ram attribute clusterRevision default = 3;
18031805

18041806
handle command RegisterClient;
18051807
handle command RegisterClientResponse;

‎examples/lit-icd-app/lit-icd-common/lit-icd-server-app.zap

+1-1
Original file line numberDiff line numberDiff line change
@@ -3642,7 +3642,7 @@
36423642
"storageOption": "RAM",
36433643
"singleton": 0,
36443644
"bounded": 0,
3645-
"defaultValue": "2",
3645+
"defaultValue": "3",
36463646
"reportable": 1,
36473647
"minInterval": 1,
36483648
"maxInterval": 65534,

‎examples/lock-app/lock-common/lock-app.matter

+4-2
Original file line numberDiff line numberDiff line change
@@ -1754,7 +1754,7 @@ cluster UserLabel = 65 {
17541754

17551755
/** Allows servers to ensure that listed clients are notified when a server is available for communication. */
17561756
cluster IcdManagement = 70 {
1757-
revision 2;
1757+
revision 3;
17581758

17591759
enum ClientTypeEnum : enum8 {
17601760
kPermanent = 0;
@@ -1770,6 +1770,7 @@ cluster IcdManagement = 70 {
17701770
kCheckInProtocolSupport = 0x1;
17711771
kUserActiveModeTrigger = 0x2;
17721772
kLongIdleTimeSupport = 0x4;
1773+
kDynamicSitLitSupport = 0x8;
17731774
}
17741775

17751776
bitmap UserActiveModeTriggerBitmap : bitmap32 {
@@ -1808,6 +1809,7 @@ cluster IcdManagement = 70 {
18081809
provisional readonly attribute optional UserActiveModeTriggerBitmap userActiveModeTriggerHint = 6;
18091810
provisional readonly attribute optional char_string<128> userActiveModeTriggerInstruction = 7;
18101811
provisional readonly attribute optional OperatingModeEnum operatingMode = 8;
1812+
provisional readonly attribute optional int32u maximumCheckInBackOff = 9;
18111813
readonly attribute command_id generatedCommandList[] = 65528;
18121814
readonly attribute command_id acceptedCommandList[] = 65529;
18131815
readonly attribute event_id eventList[] = 65530;
@@ -2899,7 +2901,7 @@ endpoint 0 {
28992901
callback attribute activeModeDuration;
29002902
callback attribute activeModeThreshold;
29012903
ram attribute featureMap default = 0x0000;
2902-
ram attribute clusterRevision default = 2;
2904+
ram attribute clusterRevision default = 3;
29032905
}
29042906
}
29052907
endpoint 1 {

‎examples/lock-app/lock-common/lock-app.zap

+1-1
Original file line numberDiff line numberDiff line change
@@ -5023,7 +5023,7 @@
50235023
"storageOption": "RAM",
50245024
"singleton": 0,
50255025
"bounded": 0,
5026-
"defaultValue": "2",
5026+
"defaultValue": "3",
50275027
"reportable": 1,
50285028
"minInterval": 1,
50295029
"maxInterval": 65534,

‎examples/lock-app/qpg/zap/lock.matter

+4-2
Original file line numberDiff line numberDiff line change
@@ -1410,7 +1410,7 @@ cluster UserLabel = 65 {
14101410

14111411
/** Allows servers to ensure that listed clients are notified when a server is available for communication. */
14121412
cluster IcdManagement = 70 {
1413-
revision 2;
1413+
revision 3;
14141414

14151415
enum ClientTypeEnum : enum8 {
14161416
kPermanent = 0;
@@ -1426,6 +1426,7 @@ cluster IcdManagement = 70 {
14261426
kCheckInProtocolSupport = 0x1;
14271427
kUserActiveModeTrigger = 0x2;
14281428
kLongIdleTimeSupport = 0x4;
1429+
kDynamicSitLitSupport = 0x8;
14291430
}
14301431

14311432
bitmap UserActiveModeTriggerBitmap : bitmap32 {
@@ -1464,6 +1465,7 @@ cluster IcdManagement = 70 {
14641465
provisional readonly attribute optional UserActiveModeTriggerBitmap userActiveModeTriggerHint = 6;
14651466
provisional readonly attribute optional char_string<128> userActiveModeTriggerInstruction = 7;
14661467
provisional readonly attribute optional OperatingModeEnum operatingMode = 8;
1468+
provisional readonly attribute optional int32u maximumCheckInBackOff = 9;
14671469
readonly attribute command_id generatedCommandList[] = 65528;
14681470
readonly attribute command_id acceptedCommandList[] = 65529;
14691471
readonly attribute event_id eventList[] = 65530;
@@ -2491,7 +2493,7 @@ endpoint 0 {
24912493
callback attribute eventList;
24922494
callback attribute attributeList;
24932495
ram attribute featureMap default = 0x0000;
2494-
ram attribute clusterRevision default = 2;
2496+
ram attribute clusterRevision default = 3;
24952497
}
24962498
}
24972499
endpoint 1 {

‎examples/lock-app/qpg/zap/lock.zap

+1-1
Original file line numberDiff line numberDiff line change
@@ -4289,7 +4289,7 @@
42894289
"storageOption": "RAM",
42904290
"singleton": 0,
42914291
"bounded": 0,
4292-
"defaultValue": "2",
4292+
"defaultValue": "3",
42934293
"reportable": 1,
42944294
"minInterval": 1,
42954295
"maxInterval": 65534,

‎examples/smoke-co-alarm-app/smoke-co-alarm-common/smoke-co-alarm-app.matter

+4-2
Original file line numberDiff line numberDiff line change
@@ -1730,7 +1730,7 @@ cluster UserLabel = 65 {
17301730

17311731
/** Allows servers to ensure that listed clients are notified when a server is available for communication. */
17321732
cluster IcdManagement = 70 {
1733-
revision 2;
1733+
revision 3;
17341734

17351735
enum ClientTypeEnum : enum8 {
17361736
kPermanent = 0;
@@ -1746,6 +1746,7 @@ cluster IcdManagement = 70 {
17461746
kCheckInProtocolSupport = 0x1;
17471747
kUserActiveModeTrigger = 0x2;
17481748
kLongIdleTimeSupport = 0x4;
1749+
kDynamicSitLitSupport = 0x8;
17491750
}
17501751

17511752
bitmap UserActiveModeTriggerBitmap : bitmap32 {
@@ -1784,6 +1785,7 @@ cluster IcdManagement = 70 {
17841785
provisional readonly attribute optional UserActiveModeTriggerBitmap userActiveModeTriggerHint = 6;
17851786
provisional readonly attribute optional char_string<128> userActiveModeTriggerInstruction = 7;
17861787
provisional readonly attribute optional OperatingModeEnum operatingMode = 8;
1788+
provisional readonly attribute optional int32u maximumCheckInBackOff = 9;
17871789
readonly attribute command_id generatedCommandList[] = 65528;
17881790
readonly attribute command_id acceptedCommandList[] = 65529;
17891791
readonly attribute event_id eventList[] = 65530;
@@ -2233,7 +2235,7 @@ endpoint 0 {
22332235
callback attribute acceptedCommandList;
22342236
callback attribute attributeList;
22352237
ram attribute featureMap default = 1;
2236-
ram attribute clusterRevision default = 2;
2238+
ram attribute clusterRevision default = 3;
22372239

22382240
handle command RegisterClient;
22392241
handle command RegisterClientResponse;

‎examples/smoke-co-alarm-app/smoke-co-alarm-common/smoke-co-alarm-app.zap

+1-1
Original file line numberDiff line numberDiff line change
@@ -3715,7 +3715,7 @@
37153715
"storageOption": "RAM",
37163716
"singleton": 0,
37173717
"bounded": 0,
3718-
"defaultValue": "2",
3718+
"defaultValue": "3",
37193719
"reportable": 1,
37203720
"minInterval": 1,
37213721
"maxInterval": 65534,

‎examples/window-app/common/window-app.matter

+4-2
Original file line numberDiff line numberDiff line change
@@ -1828,7 +1828,7 @@ cluster UserLabel = 65 {
18281828

18291829
/** Allows servers to ensure that listed clients are notified when a server is available for communication. */
18301830
cluster IcdManagement = 70 {
1831-
revision 2;
1831+
revision 3;
18321832

18331833
enum ClientTypeEnum : enum8 {
18341834
kPermanent = 0;
@@ -1844,6 +1844,7 @@ cluster IcdManagement = 70 {
18441844
kCheckInProtocolSupport = 0x1;
18451845
kUserActiveModeTrigger = 0x2;
18461846
kLongIdleTimeSupport = 0x4;
1847+
kDynamicSitLitSupport = 0x8;
18471848
}
18481849

18491850
bitmap UserActiveModeTriggerBitmap : bitmap32 {
@@ -1882,6 +1883,7 @@ cluster IcdManagement = 70 {
18821883
provisional readonly attribute optional UserActiveModeTriggerBitmap userActiveModeTriggerHint = 6;
18831884
provisional readonly attribute optional char_string<128> userActiveModeTriggerInstruction = 7;
18841885
provisional readonly attribute optional OperatingModeEnum operatingMode = 8;
1886+
provisional readonly attribute optional int32u maximumCheckInBackOff = 9;
18851887
readonly attribute command_id generatedCommandList[] = 65528;
18861888
readonly attribute command_id acceptedCommandList[] = 65529;
18871889
readonly attribute event_id eventList[] = 65530;
@@ -2481,7 +2483,7 @@ endpoint 0 {
24812483
callback attribute eventList;
24822484
callback attribute attributeList;
24832485
ram attribute featureMap default = 0x0000;
2484-
ram attribute clusterRevision default = 2;
2486+
ram attribute clusterRevision default = 3;
24852487
}
24862488
}
24872489
endpoint 1 {

‎examples/window-app/common/window-app.zap

+1-1
Original file line numberDiff line numberDiff line change
@@ -5205,7 +5205,7 @@
52055205
"storageOption": "RAM",
52065206
"singleton": 0,
52075207
"bounded": 0,
5208-
"defaultValue": "2",
5208+
"defaultValue": "3",
52095209
"reportable": 1,
52105210
"minInterval": 1,
52115211
"maxInterval": 65534,

‎src/app/tests/suites/certification/Test_TC_ICDM_1_1.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ tests:
3535
command: "readAttribute"
3636
attribute: "ClusterRevision"
3737
response:
38-
value: 2
38+
value: 3
3939
constraints:
4040
type: int16u
4141

0 commit comments

Comments
 (0)