Skip to content

Commit 5d1bac6

Browse files
sabollim-silabssabollim-silabs
authoredJul 31, 2024
Merge pull request #6 from SiliconLabs/cherry-pick/cherypick_for_release24q2
DGSW-2.3 fix: PR -project-chip#33252 and color control & doorlock XML changes: project-chip#33612
2 parents 8a7e198 + 5a564ca commit 5d1bac6

File tree

37 files changed

+665
-136
lines changed

37 files changed

+665
-136
lines changed
 

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

+22-3
Original file line numberDiff line numberDiff line change
@@ -5438,6 +5438,21 @@ cluster ColorControl = 768 {
54385438
kColorTemperature = 2;
54395439
}
54405440

5441+
enum DriftCompensationEnum : enum8 {
5442+
kNone = 0;
5443+
kOtherUnknown = 1;
5444+
kTemperaturemonitoring = 2;
5445+
kOpticalLuminanceMonitoringAndFeedback = 3;
5446+
kOpticalColorMonitoringAndFeedback = 4;
5447+
}
5448+
5449+
enum EnhancedColorModeEnum : enum8 {
5450+
kCurrentHueAndCurrentSaturation = 0;
5451+
kCurrentXAndCurrentY = 1;
5452+
kColorTemperature = 2;
5453+
kEnhancedCurrentHueAndCurrentSaturation = 3;
5454+
}
5455+
54415456
enum HueDirection : enum8 {
54425457
kShortestDistance = 0;
54435458
kLongestDistance = 1;
@@ -5490,16 +5505,20 @@ cluster ColorControl = 768 {
54905505
kColorTemperature = 0x10;
54915506
}
54925507

5508+
bitmap OptionsBitmap : bitmap8 {
5509+
kExecuteIfOff = 0x1;
5510+
}
5511+
54935512
readonly attribute optional int8u currentHue = 0;
54945513
readonly attribute optional int8u currentSaturation = 1;
54955514
readonly attribute optional int16u remainingTime = 2;
54965515
readonly attribute optional int16u currentX = 3;
54975516
readonly attribute optional int16u currentY = 4;
5498-
readonly attribute optional enum8 driftCompensation = 5;
5517+
readonly attribute optional DriftCompensationEnum driftCompensation = 5;
54995518
readonly attribute optional char_string<254> compensationText = 6;
55005519
readonly attribute optional int16u colorTemperatureMireds = 7;
55015520
readonly attribute enum8 colorMode = 8;
5502-
attribute bitmap8 options = 15;
5521+
attribute OptionsBitmap options = 15;
55035522
readonly attribute nullable int8u numberOfPrimaries = 16;
55045523
readonly attribute optional int16u primary1X = 17;
55055524
readonly attribute optional int16u primary1Y = 18;
@@ -5531,7 +5550,7 @@ cluster ColorControl = 768 {
55315550
attribute access(write: manage) optional int16u colorPointBY = 59;
55325551
attribute access(write: manage) optional nullable int8u colorPointBIntensity = 60;
55335552
readonly attribute optional int16u enhancedCurrentHue = 16384;
5534-
readonly attribute enum8 enhancedColorMode = 16385;
5553+
readonly attribute EnhancedColorModeEnum enhancedColorMode = 16385;
55355554
readonly attribute optional int8u colorLoopActive = 16386;
55365555
readonly attribute optional int8u colorLoopDirection = 16387;
55375556
readonly attribute optional int16u colorLoopTime = 16388;

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

+23-4
Original file line numberDiff line numberDiff line change
@@ -2972,7 +2972,7 @@ cluster DoorLock = 257 {
29722972
readonly attribute optional int8u numberOfCredentialsSupportedPerUser = 28;
29732973
attribute access(write: manage) optional char_string<3> language = 33;
29742974
attribute access(write: manage) optional int8u LEDSettings = 34;
2975-
attribute access(write: manage) int32u autoRelockTime = 35;
2975+
attribute access(write: manage) optional int32u autoRelockTime = 35;
29762976
attribute access(write: manage) optional int8u soundVolume = 36;
29772977
attribute access(write: manage) OperatingModeEnum operatingMode = 37;
29782978
readonly attribute DlSupportedOperatingModes supportedOperatingModes = 38;
@@ -3997,6 +3997,21 @@ cluster ColorControl = 768 {
39973997
kColorTemperature = 2;
39983998
}
39993999

4000+
enum DriftCompensationEnum : enum8 {
4001+
kNone = 0;
4002+
kOtherUnknown = 1;
4003+
kTemperaturemonitoring = 2;
4004+
kOpticalLuminanceMonitoringAndFeedback = 3;
4005+
kOpticalColorMonitoringAndFeedback = 4;
4006+
}
4007+
4008+
enum EnhancedColorModeEnum : enum8 {
4009+
kCurrentHueAndCurrentSaturation = 0;
4010+
kCurrentXAndCurrentY = 1;
4011+
kColorTemperature = 2;
4012+
kEnhancedCurrentHueAndCurrentSaturation = 3;
4013+
}
4014+
40004015
enum HueDirection : enum8 {
40014016
kShortestDistance = 0;
40024017
kLongestDistance = 1;
@@ -4049,16 +4064,20 @@ cluster ColorControl = 768 {
40494064
kColorTemperature = 0x10;
40504065
}
40514066

4067+
bitmap OptionsBitmap : bitmap8 {
4068+
kExecuteIfOff = 0x1;
4069+
}
4070+
40524071
readonly attribute optional int8u currentHue = 0;
40534072
readonly attribute optional int8u currentSaturation = 1;
40544073
readonly attribute optional int16u remainingTime = 2;
40554074
readonly attribute optional int16u currentX = 3;
40564075
readonly attribute optional int16u currentY = 4;
4057-
readonly attribute optional enum8 driftCompensation = 5;
4076+
readonly attribute optional DriftCompensationEnum driftCompensation = 5;
40584077
readonly attribute optional char_string<254> compensationText = 6;
40594078
readonly attribute optional int16u colorTemperatureMireds = 7;
40604079
readonly attribute enum8 colorMode = 8;
4061-
attribute bitmap8 options = 15;
4080+
attribute OptionsBitmap options = 15;
40624081
readonly attribute nullable int8u numberOfPrimaries = 16;
40634082
readonly attribute optional int16u primary1X = 17;
40644083
readonly attribute optional int16u primary1Y = 18;
@@ -4090,7 +4109,7 @@ cluster ColorControl = 768 {
40904109
attribute access(write: manage) optional int16u colorPointBY = 59;
40914110
attribute access(write: manage) optional nullable int8u colorPointBIntensity = 60;
40924111
readonly attribute optional int16u enhancedCurrentHue = 16384;
4093-
readonly attribute enum8 enhancedColorMode = 16385;
4112+
readonly attribute EnhancedColorModeEnum enhancedColorMode = 16385;
40944113
readonly attribute optional int8u colorLoopActive = 16386;
40954114
readonly attribute optional int8u colorLoopDirection = 16387;
40964115
readonly attribute optional int16u colorLoopTime = 16388;

‎examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.matter

+22-3
Original file line numberDiff line numberDiff line change
@@ -1423,6 +1423,21 @@ cluster ColorControl = 768 {
14231423
kColorTemperature = 2;
14241424
}
14251425

1426+
enum DriftCompensationEnum : enum8 {
1427+
kNone = 0;
1428+
kOtherUnknown = 1;
1429+
kTemperaturemonitoring = 2;
1430+
kOpticalLuminanceMonitoringAndFeedback = 3;
1431+
kOpticalColorMonitoringAndFeedback = 4;
1432+
}
1433+
1434+
enum EnhancedColorModeEnum : enum8 {
1435+
kCurrentHueAndCurrentSaturation = 0;
1436+
kCurrentXAndCurrentY = 1;
1437+
kColorTemperature = 2;
1438+
kEnhancedCurrentHueAndCurrentSaturation = 3;
1439+
}
1440+
14261441
enum HueDirection : enum8 {
14271442
kShortestDistance = 0;
14281443
kLongestDistance = 1;
@@ -1475,16 +1490,20 @@ cluster ColorControl = 768 {
14751490
kColorTemperature = 0x10;
14761491
}
14771492

1493+
bitmap OptionsBitmap : bitmap8 {
1494+
kExecuteIfOff = 0x1;
1495+
}
1496+
14781497
readonly attribute optional int8u currentHue = 0;
14791498
readonly attribute optional int8u currentSaturation = 1;
14801499
readonly attribute optional int16u remainingTime = 2;
14811500
readonly attribute optional int16u currentX = 3;
14821501
readonly attribute optional int16u currentY = 4;
1483-
readonly attribute optional enum8 driftCompensation = 5;
1502+
readonly attribute optional DriftCompensationEnum driftCompensation = 5;
14841503
readonly attribute optional char_string<254> compensationText = 6;
14851504
readonly attribute optional int16u colorTemperatureMireds = 7;
14861505
readonly attribute enum8 colorMode = 8;
1487-
attribute bitmap8 options = 15;
1506+
attribute OptionsBitmap options = 15;
14881507
readonly attribute nullable int8u numberOfPrimaries = 16;
14891508
readonly attribute optional int16u primary1X = 17;
14901509
readonly attribute optional int16u primary1Y = 18;
@@ -1516,7 +1535,7 @@ cluster ColorControl = 768 {
15161535
attribute access(write: manage) optional int16u colorPointBY = 59;
15171536
attribute access(write: manage) optional nullable int8u colorPointBIntensity = 60;
15181537
readonly attribute optional int16u enhancedCurrentHue = 16384;
1519-
readonly attribute enum8 enhancedColorMode = 16385;
1538+
readonly attribute EnhancedColorModeEnum enhancedColorMode = 16385;
15201539
readonly attribute optional int8u colorLoopActive = 16386;
15211540
readonly attribute optional int8u colorLoopDirection = 16387;
15221541
readonly attribute optional int16u colorLoopTime = 16388;

‎examples/chef/devices/rootnode_doorlock_aNKYAreMXE.matter

+1-1
Original file line numberDiff line numberDiff line change
@@ -1878,7 +1878,7 @@ cluster DoorLock = 257 {
18781878
readonly attribute optional int8u numberOfCredentialsSupportedPerUser = 28;
18791879
attribute access(write: manage) optional char_string<3> language = 33;
18801880
attribute access(write: manage) optional int8u LEDSettings = 34;
1881-
attribute access(write: manage) int32u autoRelockTime = 35;
1881+
attribute access(write: manage) optional int32u autoRelockTime = 35;
18821882
attribute access(write: manage) optional int8u soundVolume = 36;
18831883
attribute access(write: manage) OperatingModeEnum operatingMode = 37;
18841884
readonly attribute DlSupportedOperatingModes supportedOperatingModes = 38;

‎examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.matter

+22-3
Original file line numberDiff line numberDiff line change
@@ -1524,6 +1524,21 @@ cluster ColorControl = 768 {
15241524
kColorTemperature = 2;
15251525
}
15261526

1527+
enum DriftCompensationEnum : enum8 {
1528+
kNone = 0;
1529+
kOtherUnknown = 1;
1530+
kTemperaturemonitoring = 2;
1531+
kOpticalLuminanceMonitoringAndFeedback = 3;
1532+
kOpticalColorMonitoringAndFeedback = 4;
1533+
}
1534+
1535+
enum EnhancedColorModeEnum : enum8 {
1536+
kCurrentHueAndCurrentSaturation = 0;
1537+
kCurrentXAndCurrentY = 1;
1538+
kColorTemperature = 2;
1539+
kEnhancedCurrentHueAndCurrentSaturation = 3;
1540+
}
1541+
15271542
enum HueDirection : enum8 {
15281543
kShortestDistance = 0;
15291544
kLongestDistance = 1;
@@ -1576,16 +1591,20 @@ cluster ColorControl = 768 {
15761591
kColorTemperature = 0x10;
15771592
}
15781593

1594+
bitmap OptionsBitmap : bitmap8 {
1595+
kExecuteIfOff = 0x1;
1596+
}
1597+
15791598
readonly attribute optional int8u currentHue = 0;
15801599
readonly attribute optional int8u currentSaturation = 1;
15811600
readonly attribute optional int16u remainingTime = 2;
15821601
readonly attribute optional int16u currentX = 3;
15831602
readonly attribute optional int16u currentY = 4;
1584-
readonly attribute optional enum8 driftCompensation = 5;
1603+
readonly attribute optional DriftCompensationEnum driftCompensation = 5;
15851604
readonly attribute optional char_string<254> compensationText = 6;
15861605
readonly attribute optional int16u colorTemperatureMireds = 7;
15871606
readonly attribute enum8 colorMode = 8;
1588-
attribute bitmap8 options = 15;
1607+
attribute OptionsBitmap options = 15;
15891608
readonly attribute nullable int8u numberOfPrimaries = 16;
15901609
readonly attribute optional int16u primary1X = 17;
15911610
readonly attribute optional int16u primary1Y = 18;
@@ -1617,7 +1636,7 @@ cluster ColorControl = 768 {
16171636
attribute access(write: manage) optional int16u colorPointBY = 59;
16181637
attribute access(write: manage) optional nullable int8u colorPointBIntensity = 60;
16191638
readonly attribute optional int16u enhancedCurrentHue = 16384;
1620-
readonly attribute enum8 enhancedColorMode = 16385;
1639+
readonly attribute EnhancedColorModeEnum enhancedColorMode = 16385;
16211640
readonly attribute optional int8u colorLoopActive = 16386;
16221641
readonly attribute optional int8u colorLoopDirection = 16387;
16231642
readonly attribute optional int16u colorLoopTime = 16388;

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

+22-3
Original file line numberDiff line numberDiff line change
@@ -2193,6 +2193,21 @@ cluster ColorControl = 768 {
21932193
kColorTemperature = 2;
21942194
}
21952195

2196+
enum DriftCompensationEnum : enum8 {
2197+
kNone = 0;
2198+
kOtherUnknown = 1;
2199+
kTemperaturemonitoring = 2;
2200+
kOpticalLuminanceMonitoringAndFeedback = 3;
2201+
kOpticalColorMonitoringAndFeedback = 4;
2202+
}
2203+
2204+
enum EnhancedColorModeEnum : enum8 {
2205+
kCurrentHueAndCurrentSaturation = 0;
2206+
kCurrentXAndCurrentY = 1;
2207+
kColorTemperature = 2;
2208+
kEnhancedCurrentHueAndCurrentSaturation = 3;
2209+
}
2210+
21962211
enum HueDirection : enum8 {
21972212
kShortestDistance = 0;
21982213
kLongestDistance = 1;
@@ -2245,16 +2260,20 @@ cluster ColorControl = 768 {
22452260
kColorTemperature = 0x10;
22462261
}
22472262

2263+
bitmap OptionsBitmap : bitmap8 {
2264+
kExecuteIfOff = 0x1;
2265+
}
2266+
22482267
readonly attribute optional int8u currentHue = 0;
22492268
readonly attribute optional int8u currentSaturation = 1;
22502269
readonly attribute optional int16u remainingTime = 2;
22512270
readonly attribute optional int16u currentX = 3;
22522271
readonly attribute optional int16u currentY = 4;
2253-
readonly attribute optional enum8 driftCompensation = 5;
2272+
readonly attribute optional DriftCompensationEnum driftCompensation = 5;
22542273
readonly attribute optional char_string<254> compensationText = 6;
22552274
readonly attribute optional int16u colorTemperatureMireds = 7;
22562275
readonly attribute enum8 colorMode = 8;
2257-
attribute bitmap8 options = 15;
2276+
attribute OptionsBitmap options = 15;
22582277
readonly attribute nullable int8u numberOfPrimaries = 16;
22592278
readonly attribute optional int16u primary1X = 17;
22602279
readonly attribute optional int16u primary1Y = 18;
@@ -2286,7 +2305,7 @@ cluster ColorControl = 768 {
22862305
attribute access(write: manage) optional int16u colorPointBY = 59;
22872306
attribute access(write: manage) optional nullable int8u colorPointBIntensity = 60;
22882307
readonly attribute optional int16u enhancedCurrentHue = 16384;
2289-
readonly attribute enum8 enhancedColorMode = 16385;
2308+
readonly attribute EnhancedColorModeEnum enhancedColorMode = 16385;
22902309
readonly attribute optional int8u colorLoopActive = 16386;
22912310
readonly attribute optional int8u colorLoopDirection = 16387;
22922311
readonly attribute optional int16u colorLoopTime = 16388;

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

+22-3
Original file line numberDiff line numberDiff line change
@@ -1990,6 +1990,21 @@ cluster ColorControl = 768 {
19901990
kColorTemperature = 2;
19911991
}
19921992

1993+
enum DriftCompensationEnum : enum8 {
1994+
kNone = 0;
1995+
kOtherUnknown = 1;
1996+
kTemperaturemonitoring = 2;
1997+
kOpticalLuminanceMonitoringAndFeedback = 3;
1998+
kOpticalColorMonitoringAndFeedback = 4;
1999+
}
2000+
2001+
enum EnhancedColorModeEnum : enum8 {
2002+
kCurrentHueAndCurrentSaturation = 0;
2003+
kCurrentXAndCurrentY = 1;
2004+
kColorTemperature = 2;
2005+
kEnhancedCurrentHueAndCurrentSaturation = 3;
2006+
}
2007+
19932008
enum HueDirection : enum8 {
19942009
kShortestDistance = 0;
19952010
kLongestDistance = 1;
@@ -2042,16 +2057,20 @@ cluster ColorControl = 768 {
20422057
kColorTemperature = 0x10;
20432058
}
20442059

2060+
bitmap OptionsBitmap : bitmap8 {
2061+
kExecuteIfOff = 0x1;
2062+
}
2063+
20452064
readonly attribute optional int8u currentHue = 0;
20462065
readonly attribute optional int8u currentSaturation = 1;
20472066
readonly attribute optional int16u remainingTime = 2;
20482067
readonly attribute optional int16u currentX = 3;
20492068
readonly attribute optional int16u currentY = 4;
2050-
readonly attribute optional enum8 driftCompensation = 5;
2069+
readonly attribute optional DriftCompensationEnum driftCompensation = 5;
20512070
readonly attribute optional char_string<254> compensationText = 6;
20522071
readonly attribute optional int16u colorTemperatureMireds = 7;
20532072
readonly attribute enum8 colorMode = 8;
2054-
attribute bitmap8 options = 15;
2073+
attribute OptionsBitmap options = 15;
20552074
readonly attribute nullable int8u numberOfPrimaries = 16;
20562075
readonly attribute optional int16u primary1X = 17;
20572076
readonly attribute optional int16u primary1Y = 18;
@@ -2083,7 +2102,7 @@ cluster ColorControl = 768 {
20832102
attribute access(write: manage) optional int16u colorPointBY = 59;
20842103
attribute access(write: manage) optional nullable int8u colorPointBIntensity = 60;
20852104
readonly attribute optional int16u enhancedCurrentHue = 16384;
2086-
readonly attribute enum8 enhancedColorMode = 16385;
2105+
readonly attribute EnhancedColorModeEnum enhancedColorMode = 16385;
20872106
readonly attribute optional int8u colorLoopActive = 16386;
20882107
readonly attribute optional int8u colorLoopDirection = 16387;
20892108
readonly attribute optional int16u colorLoopTime = 16388;

‎examples/lighting-app/bouffalolab/data_model/lighting-app-ethernet.matter

+22-3
Original file line numberDiff line numberDiff line change
@@ -1563,6 +1563,21 @@ cluster ColorControl = 768 {
15631563
kColorTemperature = 2;
15641564
}
15651565

1566+
enum DriftCompensationEnum : enum8 {
1567+
kNone = 0;
1568+
kOtherUnknown = 1;
1569+
kTemperaturemonitoring = 2;
1570+
kOpticalLuminanceMonitoringAndFeedback = 3;
1571+
kOpticalColorMonitoringAndFeedback = 4;
1572+
}
1573+
1574+
enum EnhancedColorModeEnum : enum8 {
1575+
kCurrentHueAndCurrentSaturation = 0;
1576+
kCurrentXAndCurrentY = 1;
1577+
kColorTemperature = 2;
1578+
kEnhancedCurrentHueAndCurrentSaturation = 3;
1579+
}
1580+
15661581
enum HueDirection : enum8 {
15671582
kShortestDistance = 0;
15681583
kLongestDistance = 1;
@@ -1615,16 +1630,20 @@ cluster ColorControl = 768 {
16151630
kColorTemperature = 0x10;
16161631
}
16171632

1633+
bitmap OptionsBitmap : bitmap8 {
1634+
kExecuteIfOff = 0x1;
1635+
}
1636+
16181637
readonly attribute optional int8u currentHue = 0;
16191638
readonly attribute optional int8u currentSaturation = 1;
16201639
readonly attribute optional int16u remainingTime = 2;
16211640
readonly attribute optional int16u currentX = 3;
16221641
readonly attribute optional int16u currentY = 4;
1623-
readonly attribute optional enum8 driftCompensation = 5;
1642+
readonly attribute optional DriftCompensationEnum driftCompensation = 5;
16241643
readonly attribute optional char_string<254> compensationText = 6;
16251644
readonly attribute optional int16u colorTemperatureMireds = 7;
16261645
readonly attribute enum8 colorMode = 8;
1627-
attribute bitmap8 options = 15;
1646+
attribute OptionsBitmap options = 15;
16281647
readonly attribute nullable int8u numberOfPrimaries = 16;
16291648
readonly attribute optional int16u primary1X = 17;
16301649
readonly attribute optional int16u primary1Y = 18;
@@ -1656,7 +1675,7 @@ cluster ColorControl = 768 {
16561675
attribute access(write: manage) optional int16u colorPointBY = 59;
16571676
attribute access(write: manage) optional nullable int8u colorPointBIntensity = 60;
16581677
readonly attribute optional int16u enhancedCurrentHue = 16384;
1659-
readonly attribute enum8 enhancedColorMode = 16385;
1678+
readonly attribute EnhancedColorModeEnum enhancedColorMode = 16385;
16601679
readonly attribute optional int8u colorLoopActive = 16386;
16611680
readonly attribute optional int8u colorLoopDirection = 16387;
16621681
readonly attribute optional int16u colorLoopTime = 16388;

0 commit comments

Comments
 (0)