Skip to content

Commit 147984d

Browse files
tcarmelveilleuxrestyled-commits
authored and
austina-csa
committed
XML changes for OccupancySensing rev 5 (project-chip#34163)
* Updated occupancy sensing cluster XML to Rev 5 (Matter 1.4) * Regen ZAP * Fix codegen * Add missing Kotlin generated files * Restyled by whitespace * Restyled by prettier-json --------- Co-authored-by: Restyled.io <commits@restyled.io>
1 parent 02a2554 commit 147984d

File tree

54 files changed

+1775
-2
lines changed

Some content is hidden

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

54 files changed

+1775
-2
lines changed

‎examples/all-clusters-app/all-clusters-common/all-clusters-app.matter

+19
Original file line numberDiff line numberDiff line change
@@ -5890,6 +5890,17 @@ cluster OccupancySensing = 1030 {
58905890
kPhysicalContact = 3;
58915891
}
58925892

5893+
bitmap Feature : bitmap32 {
5894+
kOther = 0x1;
5895+
kPassiveInfrared = 0x2;
5896+
kUltrasonic = 0x4;
5897+
kPhysicalContact = 0x8;
5898+
kActiveInfrared = 0x10;
5899+
kRadar = 0x20;
5900+
kRFSensing = 0x40;
5901+
kVision = 0x80;
5902+
}
5903+
58935904
bitmap OccupancyBitmap : bitmap8 {
58945905
kOccupied = 0x1;
58955906
}
@@ -5900,9 +5911,17 @@ cluster OccupancySensing = 1030 {
59005911
kPhysicalContact = 0x4;
59015912
}
59025913

5914+
struct HoldTimeLimitsStruct {
5915+
int16u holdTimeMin = 0;
5916+
int16u holdTimeMax = 1;
5917+
int16u holdTimeDefault = 2;
5918+
}
5919+
59035920
readonly attribute OccupancyBitmap occupancy = 0;
59045921
readonly attribute OccupancySensorTypeEnum occupancySensorType = 1;
59055922
readonly attribute OccupancySensorTypeBitmap occupancySensorTypeBitmap = 2;
5923+
attribute access(write: manage) optional int16u holdTime = 3;
5924+
readonly attribute optional HoldTimeLimitsStruct holdTimeLimits = 4;
59065925
attribute access(write: manage) optional int16u PIROccupiedToUnoccupiedDelay = 16;
59075926
attribute access(write: manage) optional int16u PIRUnoccupiedToOccupiedDelay = 17;
59085927
attribute access(write: manage) optional int8u PIRUnoccupiedToOccupiedThreshold = 18;

‎examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter

+19
Original file line numberDiff line numberDiff line change
@@ -4438,6 +4438,17 @@ cluster OccupancySensing = 1030 {
44384438
kPhysicalContact = 3;
44394439
}
44404440

4441+
bitmap Feature : bitmap32 {
4442+
kOther = 0x1;
4443+
kPassiveInfrared = 0x2;
4444+
kUltrasonic = 0x4;
4445+
kPhysicalContact = 0x8;
4446+
kActiveInfrared = 0x10;
4447+
kRadar = 0x20;
4448+
kRFSensing = 0x40;
4449+
kVision = 0x80;
4450+
}
4451+
44414452
bitmap OccupancyBitmap : bitmap8 {
44424453
kOccupied = 0x1;
44434454
}
@@ -4448,9 +4459,17 @@ cluster OccupancySensing = 1030 {
44484459
kPhysicalContact = 0x4;
44494460
}
44504461

4462+
struct HoldTimeLimitsStruct {
4463+
int16u holdTimeMin = 0;
4464+
int16u holdTimeMax = 1;
4465+
int16u holdTimeDefault = 2;
4466+
}
4467+
44514468
readonly attribute OccupancyBitmap occupancy = 0;
44524469
readonly attribute OccupancySensorTypeEnum occupancySensorType = 1;
44534470
readonly attribute OccupancySensorTypeBitmap occupancySensorTypeBitmap = 2;
4471+
attribute access(write: manage) optional int16u holdTime = 3;
4472+
readonly attribute optional HoldTimeLimitsStruct holdTimeLimits = 4;
44544473
attribute access(write: manage) optional int16u PIROccupiedToUnoccupiedDelay = 16;
44554474
attribute access(write: manage) optional int16u PIRUnoccupiedToOccupiedDelay = 17;
44564475
attribute access(write: manage) optional int8u PIRUnoccupiedToOccupiedThreshold = 18;

‎examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter

+19
Original file line numberDiff line numberDiff line change
@@ -1619,6 +1619,17 @@ cluster OccupancySensing = 1030 {
16191619
kPhysicalContact = 3;
16201620
}
16211621

1622+
bitmap Feature : bitmap32 {
1623+
kOther = 0x1;
1624+
kPassiveInfrared = 0x2;
1625+
kUltrasonic = 0x4;
1626+
kPhysicalContact = 0x8;
1627+
kActiveInfrared = 0x10;
1628+
kRadar = 0x20;
1629+
kRFSensing = 0x40;
1630+
kVision = 0x80;
1631+
}
1632+
16221633
bitmap OccupancyBitmap : bitmap8 {
16231634
kOccupied = 0x1;
16241635
}
@@ -1629,9 +1640,17 @@ cluster OccupancySensing = 1030 {
16291640
kPhysicalContact = 0x4;
16301641
}
16311642

1643+
struct HoldTimeLimitsStruct {
1644+
int16u holdTimeMin = 0;
1645+
int16u holdTimeMax = 1;
1646+
int16u holdTimeDefault = 2;
1647+
}
1648+
16321649
readonly attribute OccupancyBitmap occupancy = 0;
16331650
readonly attribute OccupancySensorTypeEnum occupancySensorType = 1;
16341651
readonly attribute OccupancySensorTypeBitmap occupancySensorTypeBitmap = 2;
1652+
attribute access(write: manage) optional int16u holdTime = 3;
1653+
readonly attribute optional HoldTimeLimitsStruct holdTimeLimits = 4;
16351654
attribute access(write: manage) optional int16u PIROccupiedToUnoccupiedDelay = 16;
16361655
attribute access(write: manage) optional int16u PIRUnoccupiedToOccupiedDelay = 17;
16371656
attribute access(write: manage) optional int8u PIRUnoccupiedToOccupiedThreshold = 18;

‎examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.matter

+19
Original file line numberDiff line numberDiff line change
@@ -1514,6 +1514,17 @@ cluster OccupancySensing = 1030 {
15141514
kPhysicalContact = 3;
15151515
}
15161516

1517+
bitmap Feature : bitmap32 {
1518+
kOther = 0x1;
1519+
kPassiveInfrared = 0x2;
1520+
kUltrasonic = 0x4;
1521+
kPhysicalContact = 0x8;
1522+
kActiveInfrared = 0x10;
1523+
kRadar = 0x20;
1524+
kRFSensing = 0x40;
1525+
kVision = 0x80;
1526+
}
1527+
15171528
bitmap OccupancyBitmap : bitmap8 {
15181529
kOccupied = 0x1;
15191530
}
@@ -1524,9 +1535,17 @@ cluster OccupancySensing = 1030 {
15241535
kPhysicalContact = 0x4;
15251536
}
15261537

1538+
struct HoldTimeLimitsStruct {
1539+
int16u holdTimeMin = 0;
1540+
int16u holdTimeMax = 1;
1541+
int16u holdTimeDefault = 2;
1542+
}
1543+
15271544
readonly attribute OccupancyBitmap occupancy = 0;
15281545
readonly attribute OccupancySensorTypeEnum occupancySensorType = 1;
15291546
readonly attribute OccupancySensorTypeBitmap occupancySensorTypeBitmap = 2;
1547+
attribute access(write: manage) optional int16u holdTime = 3;
1548+
readonly attribute optional HoldTimeLimitsStruct holdTimeLimits = 4;
15301549
attribute access(write: manage) optional int16u PIROccupiedToUnoccupiedDelay = 16;
15311550
attribute access(write: manage) optional int16u PIRUnoccupiedToOccupiedDelay = 17;
15321551
attribute access(write: manage) optional int8u PIRUnoccupiedToOccupiedThreshold = 18;

‎examples/chef/devices/rootnode_dimmablepluginunit_f8a9a0b9d4.matter

+19
Original file line numberDiff line numberDiff line change
@@ -1663,6 +1663,17 @@ cluster OccupancySensing = 1030 {
16631663
kPhysicalContact = 3;
16641664
}
16651665

1666+
bitmap Feature : bitmap32 {
1667+
kOther = 0x1;
1668+
kPassiveInfrared = 0x2;
1669+
kUltrasonic = 0x4;
1670+
kPhysicalContact = 0x8;
1671+
kActiveInfrared = 0x10;
1672+
kRadar = 0x20;
1673+
kRFSensing = 0x40;
1674+
kVision = 0x80;
1675+
}
1676+
16661677
bitmap OccupancyBitmap : bitmap8 {
16671678
kOccupied = 0x1;
16681679
}
@@ -1673,9 +1684,17 @@ cluster OccupancySensing = 1030 {
16731684
kPhysicalContact = 0x4;
16741685
}
16751686

1687+
struct HoldTimeLimitsStruct {
1688+
int16u holdTimeMin = 0;
1689+
int16u holdTimeMax = 1;
1690+
int16u holdTimeDefault = 2;
1691+
}
1692+
16761693
readonly attribute OccupancyBitmap occupancy = 0;
16771694
readonly attribute OccupancySensorTypeEnum occupancySensorType = 1;
16781695
readonly attribute OccupancySensorTypeBitmap occupancySensorTypeBitmap = 2;
1696+
attribute access(write: manage) optional int16u holdTime = 3;
1697+
readonly attribute optional HoldTimeLimitsStruct holdTimeLimits = 4;
16791698
attribute access(write: manage) optional int16u PIROccupiedToUnoccupiedDelay = 16;
16801699
attribute access(write: manage) optional int16u PIRUnoccupiedToOccupiedDelay = 17;
16811700
attribute access(write: manage) optional int8u PIRUnoccupiedToOccupiedThreshold = 18;

‎examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.matter

+19
Original file line numberDiff line numberDiff line change
@@ -1317,6 +1317,17 @@ cluster OccupancySensing = 1030 {
13171317
kPhysicalContact = 3;
13181318
}
13191319

1320+
bitmap Feature : bitmap32 {
1321+
kOther = 0x1;
1322+
kPassiveInfrared = 0x2;
1323+
kUltrasonic = 0x4;
1324+
kPhysicalContact = 0x8;
1325+
kActiveInfrared = 0x10;
1326+
kRadar = 0x20;
1327+
kRFSensing = 0x40;
1328+
kVision = 0x80;
1329+
}
1330+
13201331
bitmap OccupancyBitmap : bitmap8 {
13211332
kOccupied = 0x1;
13221333
}
@@ -1327,9 +1338,17 @@ cluster OccupancySensing = 1030 {
13271338
kPhysicalContact = 0x4;
13281339
}
13291340

1341+
struct HoldTimeLimitsStruct {
1342+
int16u holdTimeMin = 0;
1343+
int16u holdTimeMax = 1;
1344+
int16u holdTimeDefault = 2;
1345+
}
1346+
13301347
readonly attribute OccupancyBitmap occupancy = 0;
13311348
readonly attribute OccupancySensorTypeEnum occupancySensorType = 1;
13321349
readonly attribute OccupancySensorTypeBitmap occupancySensorTypeBitmap = 2;
1350+
attribute access(write: manage) optional int16u holdTime = 3;
1351+
readonly attribute optional HoldTimeLimitsStruct holdTimeLimits = 4;
13331352
attribute access(write: manage) optional int16u PIROccupiedToUnoccupiedDelay = 16;
13341353
attribute access(write: manage) optional int16u PIRUnoccupiedToOccupiedDelay = 17;
13351354
attribute access(write: manage) optional int8u PIRUnoccupiedToOccupiedThreshold = 18;

‎examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.matter

+19
Original file line numberDiff line numberDiff line change
@@ -1836,6 +1836,17 @@ cluster OccupancySensing = 1030 {
18361836
kPhysicalContact = 3;
18371837
}
18381838

1839+
bitmap Feature : bitmap32 {
1840+
kOther = 0x1;
1841+
kPassiveInfrared = 0x2;
1842+
kUltrasonic = 0x4;
1843+
kPhysicalContact = 0x8;
1844+
kActiveInfrared = 0x10;
1845+
kRadar = 0x20;
1846+
kRFSensing = 0x40;
1847+
kVision = 0x80;
1848+
}
1849+
18391850
bitmap OccupancyBitmap : bitmap8 {
18401851
kOccupied = 0x1;
18411852
}
@@ -1846,9 +1857,17 @@ cluster OccupancySensing = 1030 {
18461857
kPhysicalContact = 0x4;
18471858
}
18481859

1860+
struct HoldTimeLimitsStruct {
1861+
int16u holdTimeMin = 0;
1862+
int16u holdTimeMax = 1;
1863+
int16u holdTimeDefault = 2;
1864+
}
1865+
18491866
readonly attribute OccupancyBitmap occupancy = 0;
18501867
readonly attribute OccupancySensorTypeEnum occupancySensorType = 1;
18511868
readonly attribute OccupancySensorTypeBitmap occupancySensorTypeBitmap = 2;
1869+
attribute access(write: manage) optional int16u holdTime = 3;
1870+
readonly attribute optional HoldTimeLimitsStruct holdTimeLimits = 4;
18521871
attribute access(write: manage) optional int16u PIROccupiedToUnoccupiedDelay = 16;
18531872
attribute access(write: manage) optional int16u PIRUnoccupiedToOccupiedDelay = 17;
18541873
attribute access(write: manage) optional int8u PIRUnoccupiedToOccupiedThreshold = 18;

‎examples/contact-sensor-app/contact-sensor-common/contact-sensor-app.matter

+19
Original file line numberDiff line numberDiff line change
@@ -1616,6 +1616,17 @@ cluster OccupancySensing = 1030 {
16161616
kPhysicalContact = 3;
16171617
}
16181618

1619+
bitmap Feature : bitmap32 {
1620+
kOther = 0x1;
1621+
kPassiveInfrared = 0x2;
1622+
kUltrasonic = 0x4;
1623+
kPhysicalContact = 0x8;
1624+
kActiveInfrared = 0x10;
1625+
kRadar = 0x20;
1626+
kRFSensing = 0x40;
1627+
kVision = 0x80;
1628+
}
1629+
16191630
bitmap OccupancyBitmap : bitmap8 {
16201631
kOccupied = 0x1;
16211632
}
@@ -1626,9 +1637,17 @@ cluster OccupancySensing = 1030 {
16261637
kPhysicalContact = 0x4;
16271638
}
16281639

1640+
struct HoldTimeLimitsStruct {
1641+
int16u holdTimeMin = 0;
1642+
int16u holdTimeMax = 1;
1643+
int16u holdTimeDefault = 2;
1644+
}
1645+
16291646
readonly attribute OccupancyBitmap occupancy = 0;
16301647
readonly attribute OccupancySensorTypeEnum occupancySensorType = 1;
16311648
readonly attribute OccupancySensorTypeBitmap occupancySensorTypeBitmap = 2;
1649+
attribute access(write: manage) optional int16u holdTime = 3;
1650+
readonly attribute optional HoldTimeLimitsStruct holdTimeLimits = 4;
16321651
attribute access(write: manage) optional int16u PIROccupiedToUnoccupiedDelay = 16;
16331652
attribute access(write: manage) optional int16u PIRUnoccupiedToOccupiedDelay = 17;
16341653
attribute access(write: manage) optional int8u PIRUnoccupiedToOccupiedThreshold = 18;

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

+19
Original file line numberDiff line numberDiff line change
@@ -2321,6 +2321,17 @@ cluster OccupancySensing = 1030 {
23212321
kPhysicalContact = 3;
23222322
}
23232323

2324+
bitmap Feature : bitmap32 {
2325+
kOther = 0x1;
2326+
kPassiveInfrared = 0x2;
2327+
kUltrasonic = 0x4;
2328+
kPhysicalContact = 0x8;
2329+
kActiveInfrared = 0x10;
2330+
kRadar = 0x20;
2331+
kRFSensing = 0x40;
2332+
kVision = 0x80;
2333+
}
2334+
23242335
bitmap OccupancyBitmap : bitmap8 {
23252336
kOccupied = 0x1;
23262337
}
@@ -2331,9 +2342,17 @@ cluster OccupancySensing = 1030 {
23312342
kPhysicalContact = 0x4;
23322343
}
23332344

2345+
struct HoldTimeLimitsStruct {
2346+
int16u holdTimeMin = 0;
2347+
int16u holdTimeMax = 1;
2348+
int16u holdTimeDefault = 2;
2349+
}
2350+
23342351
readonly attribute OccupancyBitmap occupancy = 0;
23352352
readonly attribute OccupancySensorTypeEnum occupancySensorType = 1;
23362353
readonly attribute OccupancySensorTypeBitmap occupancySensorTypeBitmap = 2;
2354+
attribute access(write: manage) optional int16u holdTime = 3;
2355+
readonly attribute optional HoldTimeLimitsStruct holdTimeLimits = 4;
23372356
attribute access(write: manage) optional int16u PIROccupiedToUnoccupiedDelay = 16;
23382357
attribute access(write: manage) optional int16u PIRUnoccupiedToOccupiedDelay = 17;
23392358
attribute access(write: manage) optional int8u PIRUnoccupiedToOccupiedThreshold = 18;

‎examples/placeholder/linux/apps/app1/config.matter

+19
Original file line numberDiff line numberDiff line change
@@ -6324,6 +6324,17 @@ cluster OccupancySensing = 1030 {
63246324
kPhysicalContact = 3;
63256325
}
63266326

6327+
bitmap Feature : bitmap32 {
6328+
kOther = 0x1;
6329+
kPassiveInfrared = 0x2;
6330+
kUltrasonic = 0x4;
6331+
kPhysicalContact = 0x8;
6332+
kActiveInfrared = 0x10;
6333+
kRadar = 0x20;
6334+
kRFSensing = 0x40;
6335+
kVision = 0x80;
6336+
}
6337+
63276338
bitmap OccupancyBitmap : bitmap8 {
63286339
kOccupied = 0x1;
63296340
}
@@ -6334,9 +6345,17 @@ cluster OccupancySensing = 1030 {
63346345
kPhysicalContact = 0x4;
63356346
}
63366347

6348+
struct HoldTimeLimitsStruct {
6349+
int16u holdTimeMin = 0;
6350+
int16u holdTimeMax = 1;
6351+
int16u holdTimeDefault = 2;
6352+
}
6353+
63376354
readonly attribute OccupancyBitmap occupancy = 0;
63386355
readonly attribute OccupancySensorTypeEnum occupancySensorType = 1;
63396356
readonly attribute OccupancySensorTypeBitmap occupancySensorTypeBitmap = 2;
6357+
attribute access(write: manage) optional int16u holdTime = 3;
6358+
readonly attribute optional HoldTimeLimitsStruct holdTimeLimits = 4;
63406359
attribute access(write: manage) optional int16u PIROccupiedToUnoccupiedDelay = 16;
63416360
attribute access(write: manage) optional int16u PIRUnoccupiedToOccupiedDelay = 17;
63426361
attribute access(write: manage) optional int8u PIRUnoccupiedToOccupiedThreshold = 18;

‎examples/placeholder/linux/apps/app2/config.matter

+19
Original file line numberDiff line numberDiff line change
@@ -6281,6 +6281,17 @@ cluster OccupancySensing = 1030 {
62816281
kPhysicalContact = 3;
62826282
}
62836283

6284+
bitmap Feature : bitmap32 {
6285+
kOther = 0x1;
6286+
kPassiveInfrared = 0x2;
6287+
kUltrasonic = 0x4;
6288+
kPhysicalContact = 0x8;
6289+
kActiveInfrared = 0x10;
6290+
kRadar = 0x20;
6291+
kRFSensing = 0x40;
6292+
kVision = 0x80;
6293+
}
6294+
62846295
bitmap OccupancyBitmap : bitmap8 {
62856296
kOccupied = 0x1;
62866297
}
@@ -6291,9 +6302,17 @@ cluster OccupancySensing = 1030 {
62916302
kPhysicalContact = 0x4;
62926303
}
62936304

6305+
struct HoldTimeLimitsStruct {
6306+
int16u holdTimeMin = 0;
6307+
int16u holdTimeMax = 1;
6308+
int16u holdTimeDefault = 2;
6309+
}
6310+
62946311
readonly attribute OccupancyBitmap occupancy = 0;
62956312
readonly attribute OccupancySensorTypeEnum occupancySensorType = 1;
62966313
readonly attribute OccupancySensorTypeBitmap occupancySensorTypeBitmap = 2;
6314+
attribute access(write: manage) optional int16u holdTime = 3;
6315+
readonly attribute optional HoldTimeLimitsStruct holdTimeLimits = 4;
62976316
attribute access(write: manage) optional int16u PIROccupiedToUnoccupiedDelay = 16;
62986317
attribute access(write: manage) optional int16u PIRUnoccupiedToOccupiedDelay = 17;
62996318
attribute access(write: manage) optional int8u PIRUnoccupiedToOccupiedThreshold = 18;

0 commit comments

Comments
 (0)