Skip to content

Commit 3546356

Browse files
ThirsrinThirsrin
committed
addressed review comments
1 parent cfc75ad commit 3546356

File tree

23 files changed

+172
-172
lines changed

23 files changed

+172
-172
lines changed

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

+7-7
Original file line numberDiff line numberDiff line change
@@ -5435,7 +5435,7 @@ cluster ColorControl = 768 {
54355435
enum ColorModeEnum : enum8 {
54365436
kCurrentHueAndCurrentSaturation = 0;
54375437
kCurrentXAndCurrentY = 1;
5438-
kColorTemperature = 2;
5438+
kColorTemperatureMireds = 2;
54395439
}
54405440

54415441
enum DirectionEnum : enum8 {
@@ -5456,7 +5456,7 @@ cluster ColorControl = 768 {
54565456
enum EnhancedColorModeEnum : enum8 {
54575457
kCurrentHueAndCurrentSaturation = 0;
54585458
kCurrentXAndCurrentY = 1;
5459-
kColorTemperature = 2;
5459+
kColorTemperatureMireds = 2;
54605460
kEnhancedCurrentHueAndCurrentSaturation = 3;
54615461
}
54625462

@@ -5472,11 +5472,11 @@ cluster ColorControl = 768 {
54725472
}
54735473

54745474
bitmap ColorCapabilitiesBitmap : bitmap16 {
5475-
kHueSaturationSupported = 0x1;
5476-
kEnhancedHueSupported = 0x2;
5477-
kColorLoopSupported = 0x4;
5478-
kXYAttributesSupported = 0x8;
5479-
kColorTemperatureSupported = 0x10;
5475+
kHueSaturation = 0x1;
5476+
kEnhancedHue = 0x2;
5477+
kColorLoop = 0x4;
5478+
kXYAttributes = 0x8;
5479+
kColorTemperature = 0x10;
54805480
}
54815481

54825482
bitmap Feature : bitmap32 {

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

+7-7
Original file line numberDiff line numberDiff line change
@@ -3994,7 +3994,7 @@ cluster ColorControl = 768 {
39943994
enum ColorModeEnum : enum8 {
39953995
kCurrentHueAndCurrentSaturation = 0;
39963996
kCurrentXAndCurrentY = 1;
3997-
kColorTemperature = 2;
3997+
kColorTemperatureMireds = 2;
39983998
}
39993999

40004000
enum DirectionEnum : enum8 {
@@ -4015,7 +4015,7 @@ cluster ColorControl = 768 {
40154015
enum EnhancedColorModeEnum : enum8 {
40164016
kCurrentHueAndCurrentSaturation = 0;
40174017
kCurrentXAndCurrentY = 1;
4018-
kColorTemperature = 2;
4018+
kColorTemperatureMireds = 2;
40194019
kEnhancedCurrentHueAndCurrentSaturation = 3;
40204020
}
40214021

@@ -4031,11 +4031,11 @@ cluster ColorControl = 768 {
40314031
}
40324032

40334033
bitmap ColorCapabilitiesBitmap : bitmap16 {
4034-
kHueSaturationSupported = 0x1;
4035-
kEnhancedHueSupported = 0x2;
4036-
kColorLoopSupported = 0x4;
4037-
kXYAttributesSupported = 0x8;
4038-
kColorTemperatureSupported = 0x10;
4034+
kHueSaturation = 0x1;
4035+
kEnhancedHue = 0x2;
4036+
kColorLoop = 0x4;
4037+
kXYAttributes = 0x8;
4038+
kColorTemperature = 0x10;
40394039
}
40404040

40414041
bitmap Feature : bitmap32 {

‎examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.matter

+7-7
Original file line numberDiff line numberDiff line change
@@ -1420,7 +1420,7 @@ cluster ColorControl = 768 {
14201420
enum ColorModeEnum : enum8 {
14211421
kCurrentHueAndCurrentSaturation = 0;
14221422
kCurrentXAndCurrentY = 1;
1423-
kColorTemperature = 2;
1423+
kColorTemperatureMireds = 2;
14241424
}
14251425

14261426
enum DirectionEnum : enum8 {
@@ -1441,7 +1441,7 @@ cluster ColorControl = 768 {
14411441
enum EnhancedColorModeEnum : enum8 {
14421442
kCurrentHueAndCurrentSaturation = 0;
14431443
kCurrentXAndCurrentY = 1;
1444-
kColorTemperature = 2;
1444+
kColorTemperatureMireds = 2;
14451445
kEnhancedCurrentHueAndCurrentSaturation = 3;
14461446
}
14471447

@@ -1457,11 +1457,11 @@ cluster ColorControl = 768 {
14571457
}
14581458

14591459
bitmap ColorCapabilitiesBitmap : bitmap16 {
1460-
kHueSaturationSupported = 0x1;
1461-
kEnhancedHueSupported = 0x2;
1462-
kColorLoopSupported = 0x4;
1463-
kXYAttributesSupported = 0x8;
1464-
kColorTemperatureSupported = 0x10;
1460+
kHueSaturation = 0x1;
1461+
kEnhancedHue = 0x2;
1462+
kColorLoop = 0x4;
1463+
kXYAttributes = 0x8;
1464+
kColorTemperature = 0x10;
14651465
}
14661466

14671467
bitmap Feature : bitmap32 {

‎examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.matter

+7-7
Original file line numberDiff line numberDiff line change
@@ -1521,7 +1521,7 @@ cluster ColorControl = 768 {
15211521
enum ColorModeEnum : enum8 {
15221522
kCurrentHueAndCurrentSaturation = 0;
15231523
kCurrentXAndCurrentY = 1;
1524-
kColorTemperature = 2;
1524+
kColorTemperatureMireds = 2;
15251525
}
15261526

15271527
enum DirectionEnum : enum8 {
@@ -1542,7 +1542,7 @@ cluster ColorControl = 768 {
15421542
enum EnhancedColorModeEnum : enum8 {
15431543
kCurrentHueAndCurrentSaturation = 0;
15441544
kCurrentXAndCurrentY = 1;
1545-
kColorTemperature = 2;
1545+
kColorTemperatureMireds = 2;
15461546
kEnhancedCurrentHueAndCurrentSaturation = 3;
15471547
}
15481548

@@ -1558,11 +1558,11 @@ cluster ColorControl = 768 {
15581558
}
15591559

15601560
bitmap ColorCapabilitiesBitmap : bitmap16 {
1561-
kHueSaturationSupported = 0x1;
1562-
kEnhancedHueSupported = 0x2;
1563-
kColorLoopSupported = 0x4;
1564-
kXYAttributesSupported = 0x8;
1565-
kColorTemperatureSupported = 0x10;
1561+
kHueSaturation = 0x1;
1562+
kEnhancedHue = 0x2;
1563+
kColorLoop = 0x4;
1564+
kXYAttributes = 0x8;
1565+
kColorTemperature = 0x10;
15661566
}
15671567

15681568
bitmap Feature : bitmap32 {

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

+7-7
Original file line numberDiff line numberDiff line change
@@ -2190,7 +2190,7 @@ cluster ColorControl = 768 {
21902190
enum ColorModeEnum : enum8 {
21912191
kCurrentHueAndCurrentSaturation = 0;
21922192
kCurrentXAndCurrentY = 1;
2193-
kColorTemperature = 2;
2193+
kColorTemperatureMireds = 2;
21942194
}
21952195

21962196
enum DirectionEnum : enum8 {
@@ -2211,7 +2211,7 @@ cluster ColorControl = 768 {
22112211
enum EnhancedColorModeEnum : enum8 {
22122212
kCurrentHueAndCurrentSaturation = 0;
22132213
kCurrentXAndCurrentY = 1;
2214-
kColorTemperature = 2;
2214+
kColorTemperatureMireds = 2;
22152215
kEnhancedCurrentHueAndCurrentSaturation = 3;
22162216
}
22172217

@@ -2227,11 +2227,11 @@ cluster ColorControl = 768 {
22272227
}
22282228

22292229
bitmap ColorCapabilitiesBitmap : bitmap16 {
2230-
kHueSaturationSupported = 0x1;
2231-
kEnhancedHueSupported = 0x2;
2232-
kColorLoopSupported = 0x4;
2233-
kXYAttributesSupported = 0x8;
2234-
kColorTemperatureSupported = 0x10;
2230+
kHueSaturation = 0x1;
2231+
kEnhancedHue = 0x2;
2232+
kColorLoop = 0x4;
2233+
kXYAttributes = 0x8;
2234+
kColorTemperature = 0x10;
22352235
}
22362236

22372237
bitmap Feature : bitmap32 {

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

+7-7
Original file line numberDiff line numberDiff line change
@@ -1987,7 +1987,7 @@ cluster ColorControl = 768 {
19871987
enum ColorModeEnum : enum8 {
19881988
kCurrentHueAndCurrentSaturation = 0;
19891989
kCurrentXAndCurrentY = 1;
1990-
kColorTemperature = 2;
1990+
kColorTemperatureMireds = 2;
19911991
}
19921992

19931993
enum DirectionEnum : enum8 {
@@ -2008,7 +2008,7 @@ cluster ColorControl = 768 {
20082008
enum EnhancedColorModeEnum : enum8 {
20092009
kCurrentHueAndCurrentSaturation = 0;
20102010
kCurrentXAndCurrentY = 1;
2011-
kColorTemperature = 2;
2011+
kColorTemperatureMireds = 2;
20122012
kEnhancedCurrentHueAndCurrentSaturation = 3;
20132013
}
20142014

@@ -2024,11 +2024,11 @@ cluster ColorControl = 768 {
20242024
}
20252025

20262026
bitmap ColorCapabilitiesBitmap : bitmap16 {
2027-
kHueSaturationSupported = 0x1;
2028-
kEnhancedHueSupported = 0x2;
2029-
kColorLoopSupported = 0x4;
2030-
kXYAttributesSupported = 0x8;
2031-
kColorTemperatureSupported = 0x10;
2027+
kHueSaturation = 0x1;
2028+
kEnhancedHue = 0x2;
2029+
kColorLoop = 0x4;
2030+
kXYAttributes = 0x8;
2031+
kColorTemperature = 0x10;
20322032
}
20332033

20342034
bitmap Feature : bitmap32 {

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

+7-7
Original file line numberDiff line numberDiff line change
@@ -1560,7 +1560,7 @@ cluster ColorControl = 768 {
15601560
enum ColorModeEnum : enum8 {
15611561
kCurrentHueAndCurrentSaturation = 0;
15621562
kCurrentXAndCurrentY = 1;
1563-
kColorTemperature = 2;
1563+
kColorTemperatureMireds = 2;
15641564
}
15651565

15661566
enum DirectionEnum : enum8 {
@@ -1581,7 +1581,7 @@ cluster ColorControl = 768 {
15811581
enum EnhancedColorModeEnum : enum8 {
15821582
kCurrentHueAndCurrentSaturation = 0;
15831583
kCurrentXAndCurrentY = 1;
1584-
kColorTemperature = 2;
1584+
kColorTemperatureMireds = 2;
15851585
kEnhancedCurrentHueAndCurrentSaturation = 3;
15861586
}
15871587

@@ -1597,11 +1597,11 @@ cluster ColorControl = 768 {
15971597
}
15981598

15991599
bitmap ColorCapabilitiesBitmap : bitmap16 {
1600-
kHueSaturationSupported = 0x1;
1601-
kEnhancedHueSupported = 0x2;
1602-
kColorLoopSupported = 0x4;
1603-
kXYAttributesSupported = 0x8;
1604-
kColorTemperatureSupported = 0x10;
1600+
kHueSaturation = 0x1;
1601+
kEnhancedHue = 0x2;
1602+
kColorLoop = 0x4;
1603+
kXYAttributes = 0x8;
1604+
kColorTemperature = 0x10;
16051605
}
16061606

16071607
bitmap Feature : bitmap32 {

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

+7-7
Original file line numberDiff line numberDiff line change
@@ -1684,7 +1684,7 @@ cluster ColorControl = 768 {
16841684
enum ColorModeEnum : enum8 {
16851685
kCurrentHueAndCurrentSaturation = 0;
16861686
kCurrentXAndCurrentY = 1;
1687-
kColorTemperature = 2;
1687+
kColorTemperatureMireds = 2;
16881688
}
16891689

16901690
enum DirectionEnum : enum8 {
@@ -1705,7 +1705,7 @@ cluster ColorControl = 768 {
17051705
enum EnhancedColorModeEnum : enum8 {
17061706
kCurrentHueAndCurrentSaturation = 0;
17071707
kCurrentXAndCurrentY = 1;
1708-
kColorTemperature = 2;
1708+
kColorTemperatureMireds = 2;
17091709
kEnhancedCurrentHueAndCurrentSaturation = 3;
17101710
}
17111711

@@ -1721,11 +1721,11 @@ cluster ColorControl = 768 {
17211721
}
17221722

17231723
bitmap ColorCapabilitiesBitmap : bitmap16 {
1724-
kHueSaturationSupported = 0x1;
1725-
kEnhancedHueSupported = 0x2;
1726-
kColorLoopSupported = 0x4;
1727-
kXYAttributesSupported = 0x8;
1728-
kColorTemperatureSupported = 0x10;
1724+
kHueSaturation = 0x1;
1725+
kEnhancedHue = 0x2;
1726+
kColorLoop = 0x4;
1727+
kXYAttributes = 0x8;
1728+
kColorTemperature = 0x10;
17291729
}
17301730

17311731
bitmap Feature : bitmap32 {

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

+7-7
Original file line numberDiff line numberDiff line change
@@ -1595,7 +1595,7 @@ cluster ColorControl = 768 {
15951595
enum ColorModeEnum : enum8 {
15961596
kCurrentHueAndCurrentSaturation = 0;
15971597
kCurrentXAndCurrentY = 1;
1598-
kColorTemperature = 2;
1598+
kColorTemperatureMireds = 2;
15991599
}
16001600

16011601
enum DirectionEnum : enum8 {
@@ -1616,7 +1616,7 @@ cluster ColorControl = 768 {
16161616
enum EnhancedColorModeEnum : enum8 {
16171617
kCurrentHueAndCurrentSaturation = 0;
16181618
kCurrentXAndCurrentY = 1;
1619-
kColorTemperature = 2;
1619+
kColorTemperatureMireds = 2;
16201620
kEnhancedCurrentHueAndCurrentSaturation = 3;
16211621
}
16221622

@@ -1632,11 +1632,11 @@ cluster ColorControl = 768 {
16321632
}
16331633

16341634
bitmap ColorCapabilitiesBitmap : bitmap16 {
1635-
kHueSaturationSupported = 0x1;
1636-
kEnhancedHueSupported = 0x2;
1637-
kColorLoopSupported = 0x4;
1638-
kXYAttributesSupported = 0x8;
1639-
kColorTemperatureSupported = 0x10;
1635+
kHueSaturation = 0x1;
1636+
kEnhancedHue = 0x2;
1637+
kColorLoop = 0x4;
1638+
kXYAttributes = 0x8;
1639+
kColorTemperature = 0x10;
16401640
}
16411641

16421642
bitmap Feature : bitmap32 {

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

+7-7
Original file line numberDiff line numberDiff line change
@@ -2007,7 +2007,7 @@ cluster ColorControl = 768 {
20072007
enum ColorModeEnum : enum8 {
20082008
kCurrentHueAndCurrentSaturation = 0;
20092009
kCurrentXAndCurrentY = 1;
2010-
kColorTemperature = 2;
2010+
kColorTemperatureMireds = 2;
20112011
}
20122012

20132013
enum DirectionEnum : enum8 {
@@ -2028,7 +2028,7 @@ cluster ColorControl = 768 {
20282028
enum EnhancedColorModeEnum : enum8 {
20292029
kCurrentHueAndCurrentSaturation = 0;
20302030
kCurrentXAndCurrentY = 1;
2031-
kColorTemperature = 2;
2031+
kColorTemperatureMireds = 2;
20322032
kEnhancedCurrentHueAndCurrentSaturation = 3;
20332033
}
20342034

@@ -2044,11 +2044,11 @@ cluster ColorControl = 768 {
20442044
}
20452045

20462046
bitmap ColorCapabilitiesBitmap : bitmap16 {
2047-
kHueSaturationSupported = 0x1;
2048-
kEnhancedHueSupported = 0x2;
2049-
kColorLoopSupported = 0x4;
2050-
kXYAttributesSupported = 0x8;
2051-
kColorTemperatureSupported = 0x10;
2047+
kHueSaturation = 0x1;
2048+
kEnhancedHue = 0x2;
2049+
kColorLoop = 0x4;
2050+
kXYAttributes = 0x8;
2051+
kColorTemperature = 0x10;
20522052
}
20532053

20542054
bitmap Feature : bitmap32 {

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

+7-7
Original file line numberDiff line numberDiff line change
@@ -1623,7 +1623,7 @@ cluster ColorControl = 768 {
16231623
enum ColorModeEnum : enum8 {
16241624
kCurrentHueAndCurrentSaturation = 0;
16251625
kCurrentXAndCurrentY = 1;
1626-
kColorTemperature = 2;
1626+
kColorTemperatureMireds = 2;
16271627
}
16281628

16291629
enum DirectionEnum : enum8 {
@@ -1644,7 +1644,7 @@ cluster ColorControl = 768 {
16441644
enum EnhancedColorModeEnum : enum8 {
16451645
kCurrentHueAndCurrentSaturation = 0;
16461646
kCurrentXAndCurrentY = 1;
1647-
kColorTemperature = 2;
1647+
kColorTemperatureMireds = 2;
16481648
kEnhancedCurrentHueAndCurrentSaturation = 3;
16491649
}
16501650

@@ -1660,11 +1660,11 @@ cluster ColorControl = 768 {
16601660
}
16611661

16621662
bitmap ColorCapabilitiesBitmap : bitmap16 {
1663-
kHueSaturationSupported = 0x1;
1664-
kEnhancedHueSupported = 0x2;
1665-
kColorLoopSupported = 0x4;
1666-
kXYAttributesSupported = 0x8;
1667-
kColorTemperatureSupported = 0x10;
1663+
kHueSaturation = 0x1;
1664+
kEnhancedHue = 0x2;
1665+
kColorLoop = 0x4;
1666+
kXYAttributes = 0x8;
1667+
kColorTemperature = 0x10;
16681668
}
16691669

16701670
bitmap Feature : bitmap32 {

0 commit comments

Comments
 (0)