Skip to content

Commit 4d4fcb3

Browse files
tcarmelveilleuxrestyled-commits
tcarmelveilleux
and
restyled-commits
authored
Update ColorControl bounds based on spec fixes (#35156)
* Update color defaults in samples * Update color control server logic to avoid div-by-zero * Update TC-CC-2.1 with new bounds on ColorControl * Restyled by clang-format * More fixes to CI * Set default startup mireds to null * Fix some comments * Try to fix CI --------- Co-authored-by: Restyled.io <[email protected]>
1 parent d705323 commit 4d4fcb3

32 files changed

+126
-109
lines changed

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -9168,10 +9168,10 @@ endpoint 1 {
91689168
ram attribute colorLoopStartEnhancedHue default = 0x2300;
91699169
ram attribute colorLoopStoredEnhancedHue default = 0x0000;
91709170
ram attribute colorCapabilities default = 0x1F;
9171-
ram attribute colorTempPhysicalMinMireds default = 0x0000;
9172-
ram attribute colorTempPhysicalMaxMireds default = 0xFEFF;
9171+
ram attribute colorTempPhysicalMinMireds default = 0x009A;
9172+
ram attribute colorTempPhysicalMaxMireds default = 0x01C6;
91739173
ram attribute coupleColorTempToLevelMinMireds;
9174-
persist attribute startUpColorTemperatureMireds;
9174+
persist attribute startUpColorTemperatureMireds default = 0x00FA;
91759175
ram attribute featureMap default = 0x1F;
91769176
ram attribute clusterRevision default = 7;
91779177

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -18200,7 +18200,7 @@
1820018200
"storageOption": "RAM",
1820118201
"singleton": 0,
1820218202
"bounded": 0,
18203-
"defaultValue": "0x0000",
18203+
"defaultValue": "0x009A",
1820418204
"reportable": 1,
1820518205
"minInterval": 0,
1820618206
"maxInterval": 65344,
@@ -18216,7 +18216,7 @@
1821618216
"storageOption": "RAM",
1821718217
"singleton": 0,
1821818218
"bounded": 0,
18219-
"defaultValue": "0xFEFF",
18219+
"defaultValue": "0x01C6",
1822018220
"reportable": 1,
1822118221
"minInterval": 0,
1822218222
"maxInterval": 65344,
@@ -18248,7 +18248,7 @@
1824818248
"storageOption": "NVM",
1824918249
"singleton": 0,
1825018250
"bounded": 0,
18251-
"defaultValue": "",
18251+
"defaultValue": "0x00FA",
1825218252
"reportable": 1,
1825318253
"minInterval": 0,
1825418254
"maxInterval": 65344,

‎examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.matter

+3-3
Original file line numberDiff line numberDiff line change
@@ -2356,10 +2356,10 @@ endpoint 1 {
23562356
ram attribute enhancedCurrentHue default = 0x0000;
23572357
ram attribute enhancedColorMode default = 0x02;
23582358
ram attribute colorCapabilities default = 0x0000;
2359-
ram attribute colorTempPhysicalMinMireds default = 0x0000;
2360-
ram attribute colorTempPhysicalMaxMireds default = 0xFEFF;
2359+
ram attribute colorTempPhysicalMinMireds default = 0x009A;
2360+
ram attribute colorTempPhysicalMaxMireds default = 0x01C6;
23612361
ram attribute coupleColorTempToLevelMinMireds;
2362-
ram attribute startUpColorTemperatureMireds;
2362+
ram attribute startUpColorTemperatureMireds default = 0x00FA;
23632363
callback attribute generatedCommandList;
23642364
callback attribute acceptedCommandList;
23652365
callback attribute attributeList;

‎examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.zap

+3-3
Original file line numberDiff line numberDiff line change
@@ -3797,7 +3797,7 @@
37973797
"storageOption": "RAM",
37983798
"singleton": 0,
37993799
"bounded": 0,
3800-
"defaultValue": "0x0000",
3800+
"defaultValue": "0x009A",
38013801
"reportable": 1,
38023802
"minInterval": 1,
38033803
"maxInterval": 65534,
@@ -3813,7 +3813,7 @@
38133813
"storageOption": "RAM",
38143814
"singleton": 0,
38153815
"bounded": 0,
3816-
"defaultValue": "0xFEFF",
3816+
"defaultValue": "0x01C6",
38173817
"reportable": 1,
38183818
"minInterval": 1,
38193819
"maxInterval": 65534,
@@ -3845,7 +3845,7 @@
38453845
"storageOption": "RAM",
38463846
"singleton": 0,
38473847
"bounded": 0,
3848-
"defaultValue": "",
3848+
"defaultValue": "0x00FA",
38493849
"reportable": 1,
38503850
"minInterval": 1,
38513851
"maxInterval": 65534,

‎examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.matter

+3-3
Original file line numberDiff line numberDiff line change
@@ -2468,10 +2468,10 @@ endpoint 1 {
24682468
ram attribute colorLoopStartEnhancedHue default = 0x2300;
24692469
ram attribute colorLoopStoredEnhancedHue default = 0x0000;
24702470
ram attribute colorCapabilities default = 0x0000;
2471-
ram attribute colorTempPhysicalMinMireds default = 0x0000;
2472-
ram attribute colorTempPhysicalMaxMireds default = 0xFEFF;
2471+
ram attribute colorTempPhysicalMinMireds default = 0x009A;
2472+
ram attribute colorTempPhysicalMaxMireds default = 0x01C6;
24732473
ram attribute coupleColorTempToLevelMinMireds default = 0x0000;
2474-
ram attribute startUpColorTemperatureMireds default = 0;
2474+
ram attribute startUpColorTemperatureMireds default = 0x00FA;
24752475
callback attribute generatedCommandList;
24762476
callback attribute acceptedCommandList;
24772477
callback attribute attributeList;

‎examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.zap

+3-3
Original file line numberDiff line numberDiff line change
@@ -3901,7 +3901,7 @@
39013901
"storageOption": "RAM",
39023902
"singleton": 0,
39033903
"bounded": 0,
3904-
"defaultValue": "0x0000",
3904+
"defaultValue": "0x009A",
39053905
"reportable": 1,
39063906
"minInterval": 1,
39073907
"maxInterval": 65534,
@@ -3917,7 +3917,7 @@
39173917
"storageOption": "RAM",
39183918
"singleton": 0,
39193919
"bounded": 0,
3920-
"defaultValue": "0xFEFF",
3920+
"defaultValue": "0x01C6",
39213921
"reportable": 1,
39223922
"minInterval": 1,
39233923
"maxInterval": 65534,
@@ -3949,7 +3949,7 @@
39493949
"storageOption": "RAM",
39503950
"singleton": 0,
39513951
"bounded": 0,
3952-
"defaultValue": "0",
3952+
"defaultValue": "0x00FA",
39533953
"reportable": 1,
39543954
"minInterval": 1,
39553955
"maxInterval": 65534,

‎examples/chef/sample_app_util/test_files/sample_zap_file.zap

+3-3
Original file line numberDiff line numberDiff line change
@@ -5484,7 +5484,7 @@
54845484
"storageOption": "RAM",
54855485
"singleton": 0,
54865486
"bounded": 0,
5487-
"defaultValue": "0x0000",
5487+
"defaultValue": "0x009A",
54885488
"reportable": 1,
54895489
"minInterval": 0,
54905490
"maxInterval": 65344,
@@ -5500,7 +5500,7 @@
55005500
"storageOption": "RAM",
55015501
"singleton": 0,
55025502
"bounded": 0,
5503-
"defaultValue": "0xFEFF",
5503+
"defaultValue": "0x01C6",
55045504
"reportable": 1,
55055505
"minInterval": 0,
55065506
"maxInterval": 65344,
@@ -5532,7 +5532,7 @@
55325532
"storageOption": "RAM",
55335533
"singleton": 0,
55345534
"bounded": 0,
5535-
"defaultValue": "",
5535+
"defaultValue": "0x00FA",
55365536
"reportable": 1,
55375537
"minInterval": 0,
55385538
"maxInterval": 65344,

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -2535,10 +2535,10 @@ endpoint 1 {
25352535
ram attribute colorLoopStartEnhancedHue default = 0x2300;
25362536
ram attribute colorLoopStoredEnhancedHue default = 0x0000;
25372537
ram attribute colorCapabilities default = 0x1F;
2538-
ram attribute colorTempPhysicalMinMireds default = 0x0000;
2539-
ram attribute colorTempPhysicalMaxMireds default = 0xFEFF;
2538+
ram attribute colorTempPhysicalMinMireds default = 0x009A;
2539+
ram attribute colorTempPhysicalMaxMireds default = 0x01C6;
25402540
ram attribute coupleColorTempToLevelMinMireds;
2541-
ram attribute startUpColorTemperatureMireds;
2541+
ram attribute startUpColorTemperatureMireds default = 0x00FA;
25422542
ram attribute featureMap default = 0x1F;
25432543
ram attribute clusterRevision default = 7;
25442544

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -4220,7 +4220,7 @@
42204220
"storageOption": "RAM",
42214221
"singleton": 0,
42224222
"bounded": 0,
4223-
"defaultValue": "0x0000",
4223+
"defaultValue": "0x009A",
42244224
"reportable": 1,
42254225
"minInterval": 0,
42264226
"maxInterval": 65344,
@@ -4236,7 +4236,7 @@
42364236
"storageOption": "RAM",
42374237
"singleton": 0,
42384238
"bounded": 0,
4239-
"defaultValue": "0xFEFF",
4239+
"defaultValue": "0x01C6",
42404240
"reportable": 1,
42414241
"minInterval": 0,
42424242
"maxInterval": 65344,
@@ -4268,7 +4268,7 @@
42684268
"storageOption": "RAM",
42694269
"singleton": 0,
42704270
"bounded": 0,
4271-
"defaultValue": "",
4271+
"defaultValue": "0x00FA",
42724272
"reportable": 1,
42734273
"minInterval": 0,
42744274
"maxInterval": 65344,

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -2721,10 +2721,10 @@ endpoint 1 {
27212721
ram attribute colorLoopStartEnhancedHue default = 0x2300;
27222722
ram attribute colorLoopStoredEnhancedHue default = 0x0000;
27232723
ram attribute colorCapabilities default = 0x1F;
2724-
ram attribute colorTempPhysicalMinMireds default = 0x0000;
2725-
ram attribute colorTempPhysicalMaxMireds default = 0xFEFF;
2724+
ram attribute colorTempPhysicalMinMireds default = 0x009A;
2725+
ram attribute colorTempPhysicalMaxMireds default = 0x01C6;
27262726
ram attribute coupleColorTempToLevelMinMireds;
2727-
ram attribute startUpColorTemperatureMireds;
2727+
ram attribute startUpColorTemperatureMireds default = 0x00FA;
27282728
ram attribute featureMap default = 0x1F;
27292729
ram attribute clusterRevision default = 7;
27302730

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -5196,7 +5196,7 @@
51965196
"storageOption": "RAM",
51975197
"singleton": 0,
51985198
"bounded": 0,
5199-
"defaultValue": "0x0000",
5199+
"defaultValue": "0x009A",
52005200
"reportable": 1,
52015201
"minInterval": 0,
52025202
"maxInterval": 65344,
@@ -5212,7 +5212,7 @@
52125212
"storageOption": "RAM",
52135213
"singleton": 0,
52145214
"bounded": 0,
5215-
"defaultValue": "0xFEFF",
5215+
"defaultValue": "0x01C6",
52165216
"reportable": 1,
52175217
"minInterval": 0,
52185218
"maxInterval": 65344,
@@ -5244,7 +5244,7 @@
52445244
"storageOption": "RAM",
52455245
"singleton": 0,
52465246
"bounded": 0,
5247-
"defaultValue": "",
5247+
"defaultValue": "0x00FA",
52485248
"reportable": 1,
52495249
"minInterval": 0,
52505250
"maxInterval": 65344,

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -2584,10 +2584,10 @@ endpoint 1 {
25842584
ram attribute colorLoopStartEnhancedHue default = 0x2300;
25852585
ram attribute colorLoopStoredEnhancedHue default = 0x0000;
25862586
ram attribute colorCapabilities default = 0x1F;
2587-
ram attribute colorTempPhysicalMinMireds default = 0x0000;
2588-
ram attribute colorTempPhysicalMaxMireds default = 0xFEFF;
2587+
ram attribute colorTempPhysicalMinMireds default = 0x009A;
2588+
ram attribute colorTempPhysicalMaxMireds default = 0x01C6;
25892589
ram attribute coupleColorTempToLevelMinMireds;
2590-
ram attribute startUpColorTemperatureMireds;
2590+
ram attribute startUpColorTemperatureMireds default = 0x00FA;
25912591
ram attribute featureMap default = 0x1F;
25922592
ram attribute clusterRevision default = 7;
25932593

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -4403,7 +4403,7 @@
44034403
"storageOption": "RAM",
44044404
"singleton": 0,
44054405
"bounded": 0,
4406-
"defaultValue": "0x0000",
4406+
"defaultValue": "0x009A",
44074407
"reportable": 1,
44084408
"minInterval": 0,
44094409
"maxInterval": 65344,
@@ -4419,7 +4419,7 @@
44194419
"storageOption": "RAM",
44204420
"singleton": 0,
44214421
"bounded": 0,
4422-
"defaultValue": "0xFEFF",
4422+
"defaultValue": "0x01C6",
44234423
"reportable": 1,
44244424
"minInterval": 0,
44254425
"maxInterval": 65344,
@@ -4451,7 +4451,7 @@
44514451
"storageOption": "RAM",
44524452
"singleton": 0,
44534453
"bounded": 0,
4454-
"defaultValue": "",
4454+
"defaultValue": "0x00FA",
44554455
"reportable": 1,
44564456
"minInterval": 0,
44574457
"maxInterval": 65344,

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -3173,10 +3173,10 @@ endpoint 1 {
31733173
ram attribute colorLoopStartEnhancedHue default = 0x2300;
31743174
ram attribute colorLoopStoredEnhancedHue default = 0x0000;
31753175
ram attribute colorCapabilities default = 0x1F;
3176-
ram attribute colorTempPhysicalMinMireds default = 0x0000;
3177-
ram attribute colorTempPhysicalMaxMireds default = 0xFEFF;
3176+
ram attribute colorTempPhysicalMinMireds default = 0x009A;
3177+
ram attribute colorTempPhysicalMaxMireds default = 0x01C6;
31783178
ram attribute coupleColorTempToLevelMinMireds;
3179-
persist attribute startUpColorTemperatureMireds;
3179+
persist attribute startUpColorTemperatureMireds default = 0x00FA;
31803180
ram attribute featureMap default = 0x1F;
31813181
ram attribute clusterRevision default = 7;
31823182

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -5733,7 +5733,7 @@
57335733
"storageOption": "RAM",
57345734
"singleton": 0,
57355735
"bounded": 0,
5736-
"defaultValue": "0x0000",
5736+
"defaultValue": "0x009A",
57375737
"reportable": 1,
57385738
"minInterval": 0,
57395739
"maxInterval": 65344,
@@ -5749,7 +5749,7 @@
57495749
"storageOption": "RAM",
57505750
"singleton": 0,
57515751
"bounded": 0,
5752-
"defaultValue": "0xFEFF",
5752+
"defaultValue": "0x01C6",
57535753
"reportable": 1,
57545754
"minInterval": 0,
57555755
"maxInterval": 65344,
@@ -5781,7 +5781,7 @@
57815781
"storageOption": "NVM",
57825782
"singleton": 0,
57835783
"bounded": 0,
5784-
"defaultValue": "",
5784+
"defaultValue": "0x00FA",
57855785
"reportable": 1,
57865786
"minInterval": 0,
57875787
"maxInterval": 65344,

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -2698,10 +2698,10 @@ endpoint 1 {
26982698
ram attribute colorLoopStartEnhancedHue default = 0x2300;
26992699
ram attribute colorLoopStoredEnhancedHue default = 0x0000;
27002700
ram attribute colorCapabilities default = 0x1F;
2701-
ram attribute colorTempPhysicalMinMireds default = 0x0000;
2702-
ram attribute colorTempPhysicalMaxMireds default = 0xFEFF;
2701+
ram attribute colorTempPhysicalMinMireds default = 0x009A;
2702+
ram attribute colorTempPhysicalMaxMireds default = 0x01C6;
27032703
ram attribute coupleColorTempToLevelMinMireds;
2704-
ram attribute startUpColorTemperatureMireds;
2704+
ram attribute startUpColorTemperatureMireds default = 0x00FA;
27052705
callback attribute generatedCommandList;
27062706
callback attribute acceptedCommandList;
27072707
callback attribute attributeList;

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -5881,7 +5881,7 @@
58815881
"storageOption": "RAM",
58825882
"singleton": 0,
58835883
"bounded": 0,
5884-
"defaultValue": "0x0000",
5884+
"defaultValue": "0x009A",
58855885
"reportable": 1,
58865886
"minInterval": 0,
58875887
"maxInterval": 65344,
@@ -5897,7 +5897,7 @@
58975897
"storageOption": "RAM",
58985898
"singleton": 0,
58995899
"bounded": 0,
5900-
"defaultValue": "0xFEFF",
5900+
"defaultValue": "0x01C6",
59015901
"reportable": 1,
59025902
"minInterval": 0,
59035903
"maxInterval": 65344,
@@ -5929,7 +5929,7 @@
59295929
"storageOption": "RAM",
59305930
"singleton": 0,
59315931
"bounded": 0,
5932-
"defaultValue": "",
5932+
"defaultValue": "0x00FA",
59335933
"reportable": 1,
59345934
"minInterval": 0,
59355935
"maxInterval": 65344,

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -2748,10 +2748,10 @@ endpoint 1 {
27482748
ram attribute colorLoopStartEnhancedHue default = 0x2300;
27492749
ram attribute colorLoopStoredEnhancedHue default = 0x0000;
27502750
ram attribute colorCapabilities default = 0x1F;
2751-
ram attribute colorTempPhysicalMinMireds default = 0x0000;
2752-
ram attribute colorTempPhysicalMaxMireds default = 0xFEFF;
2751+
ram attribute colorTempPhysicalMinMireds default = 0x009A;
2752+
ram attribute colorTempPhysicalMaxMireds default = 0x01C6;
27532753
ram attribute coupleColorTempToLevelMinMireds;
2754-
persist attribute startUpColorTemperatureMireds;
2754+
persist attribute startUpColorTemperatureMireds default = 0x00FA;
27552755
callback attribute generatedCommandList;
27562756
callback attribute acceptedCommandList;
27572757
callback attribute eventList;

‎examples/lighting-app/silabs/data_model/lighting-thread-app.zap

+3-3
Original file line numberDiff line numberDiff line change
@@ -5172,7 +5172,7 @@
51725172
"storageOption": "RAM",
51735173
"singleton": 0,
51745174
"bounded": 0,
5175-
"defaultValue": "0x0000",
5175+
"defaultValue": "0x009A",
51765176
"reportable": 1,
51775177
"minInterval": 0,
51785178
"maxInterval": 65344,
@@ -5188,7 +5188,7 @@
51885188
"storageOption": "RAM",
51895189
"singleton": 0,
51905190
"bounded": 0,
5191-
"defaultValue": "0xFEFF",
5191+
"defaultValue": "0x01C6",
51925192
"reportable": 1,
51935193
"minInterval": 0,
51945194
"maxInterval": 65344,
@@ -5220,7 +5220,7 @@
52205220
"storageOption": "NVM",
52215221
"singleton": 0,
52225222
"bounded": 0,
5223-
"defaultValue": "",
5223+
"defaultValue": "0x00FA",
52245224
"reportable": 1,
52255225
"minInterval": 0,
52265226
"maxInterval": 65344,

0 commit comments

Comments
 (0)