Skip to content

Commit c6cfbf0

Browse files
bzbarsky-applebzbarsky-apple
authored
Fix ColorTemperatureMireds naming to follow the spec. (#22237)
* Fix ColorTemperatureMireds naming to follow the spec. * Add backwards-compat hack for chip-tool.
1 parent f011e5a commit c6cfbf0

File tree

77 files changed

+461
-447
lines changed

Some content is hidden

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

77 files changed

+461
-447
lines changed

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -2807,7 +2807,7 @@ server cluster ColorControl = 768 {
28072807
readonly attribute int16u currentY = 4;
28082808
readonly attribute enum8 driftCompensation = 5;
28092809
readonly attribute char_string<254> compensationText = 6;
2810-
readonly attribute int16u colorTemperature = 7;
2810+
readonly attribute int16u colorTemperatureMireds = 7;
28112811
readonly attribute enum8 colorMode = 8;
28122812
attribute bitmap8 options = 15;
28132813
readonly attribute nullable int8u numberOfPrimaries = 16;
@@ -4489,7 +4489,7 @@ endpoint 1 {
44894489
ram attribute currentY default = 0x607D;
44904490
ram attribute driftCompensation;
44914491
ram attribute compensationText;
4492-
ram attribute colorTemperature default = 0x00FA;
4492+
ram attribute colorTemperatureMireds default = 0x00FA;
44934493
ram attribute colorMode default = 0x01;
44944494
ram attribute options;
44954495
ram attribute numberOfPrimaries;

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

+11-12
Original file line numberDiff line numberDiff line change
@@ -16,19 +16,19 @@
1616
}
1717
],
1818
"package": [
19+
{
20+
"pathRelativity": "relativeToZap",
21+
"path": "../../../src/app/zap-templates/app-templates.json",
22+
"type": "gen-templates-json",
23+
"version": "chip-v1"
24+
},
1925
{
2026
"pathRelativity": "relativeToZap",
2127
"path": "../../../src/app/zap-templates/zcl/zcl-with-test-extensions.json",
2228
"type": "zcl-properties",
2329
"category": "matter",
2430
"version": 1,
2531
"description": "Matter SDK ZCL data with some extensions"
26-
},
27-
{
28-
"pathRelativity": "relativeToZap",
29-
"path": "../../../src/app/zap-templates/app-templates.json",
30-
"type": "gen-templates-json",
31-
"version": "chip-v1"
3232
}
3333
],
3434
"endpointTypes": [
@@ -5459,7 +5459,7 @@
54595459
"code": 0,
54605460
"mfgCode": null,
54615461
"side": "server",
5462-
"type": "int8u",
5462+
"type": "CommissioningWindowStatus",
54635463
"included": 1,
54645464
"storageOption": "External",
54655465
"singleton": 0,
@@ -6869,7 +6869,7 @@
68696869
"reportableChange": 0
68706870
},
68716871
{
6872-
"name": "ColorTemperature",
6872+
"name": "ColorTemperatureMireds",
68736873
"code": 7,
68746874
"mfgCode": null,
68756875
"side": "server",
@@ -15721,7 +15721,7 @@
1572115721
"reportableChange": 0
1572215722
},
1572315723
{
15724-
"name": "ColorTemperature",
15724+
"name": "ColorTemperatureMireds",
1572515725
"code": 7,
1572615726
"mfgCode": null,
1572715727
"side": "server",
@@ -23403,7 +23403,7 @@
2340323403
"reportableChange": 0
2340423404
},
2340523405
{
23406-
"name": "ColorTemperature",
23406+
"name": "ColorTemperatureMireds",
2340723407
"code": 7,
2340823408
"mfgCode": null,
2340923409
"side": "server",
@@ -24724,6 +24724,5 @@
2472424724
"endpointVersion": 1,
2472524725
"deviceIdentifier": 61442
2472624726
}
24727-
],
24728-
"log": []
24727+
]
2472924728
}

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

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"featureLevel": 77,
2+
"featureLevel": 80,
33
"creator": "zap",
44
"keyValuePairs": [
55
{
@@ -4673,7 +4673,7 @@
46734673
"reportableChange": 0
46744674
},
46754675
{
4676-
"name": "delay",
4676+
"name": "Delay",
46774677
"code": 58,
46784678
"mfgCode": null,
46794679
"side": "server",
@@ -4705,7 +4705,7 @@
47054705
"reportableChange": 0
47064706
},
47074707
{
4708-
"name": "ChannelMask",
4708+
"name": "ChannelPage0Mask",
47094709
"code": 60,
47104710
"mfgCode": null,
47114711
"side": "server",
@@ -5459,7 +5459,7 @@
54595459
"code": 0,
54605460
"mfgCode": null,
54615461
"side": "server",
5462-
"type": "int8u",
5462+
"type": "CommissioningWindowStatus",
54635463
"included": 1,
54645464
"storageOption": "External",
54655465
"singleton": 0,
@@ -6869,7 +6869,7 @@
68696869
"reportableChange": 0
68706870
},
68716871
{
6872-
"name": "ColorTemperature",
6872+
"name": "ColorTemperatureMireds",
68736873
"code": 7,
68746874
"mfgCode": null,
68756875
"side": "server",
@@ -15427,7 +15427,7 @@
1542715427
"reportableChange": 0
1542815428
},
1542915429
{
15430-
"name": "ColorTemperature",
15430+
"name": "ColorTemperatureMireds",
1543115431
"code": 7,
1543215432
"mfgCode": null,
1543315433
"side": "server",
@@ -23195,7 +23195,7 @@
2319523195
"reportableChange": 0
2319623196
},
2319723197
{
23198-
"name": "ColorTemperature",
23198+
"name": "ColorTemperatureMireds",
2319923199
"code": 7,
2320023200
"mfgCode": null,
2320123201
"side": "server",

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

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"featureLevel": 77,
2+
"featureLevel": 80,
33
"creator": "zap",
44
"keyValuePairs": [
55
{
@@ -3417,7 +3417,7 @@
34173417
"reportableChange": 0
34183418
},
34193419
{
3420-
"name": "delay",
3420+
"name": "Delay",
34213421
"code": 58,
34223422
"mfgCode": null,
34233423
"side": "server",
@@ -3449,7 +3449,7 @@
34493449
"reportableChange": 0
34503450
},
34513451
{
3452-
"name": "ChannelMask",
3452+
"name": "ChannelPage0Mask",
34533453
"code": 60,
34543454
"mfgCode": null,
34553455
"side": "server",
@@ -4109,7 +4109,7 @@
41094109
"code": 0,
41104110
"mfgCode": null,
41114111
"side": "server",
4112-
"type": "int8u",
4112+
"type": "CommissioningWindowStatus",
41134113
"included": 1,
41144114
"storageOption": "External",
41154115
"singleton": 0,
@@ -4946,7 +4946,7 @@
49464946
},
49474947
{
49484948
"name": "Anonymous Endpoint Type",
4949-
"deviceTypeName": "MA-bridge",
4949+
"deviceTypeName": "MA-aggregator",
49504950
"deviceTypeCode": 14,
49514951
"deviceTypeProfileId": 259,
49524952
"clusters": [

‎examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.zap

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"featureLevel": 77,
2+
"featureLevel": 80,
33
"creator": "zap",
44
"keyValuePairs": [
55
{
@@ -3817,7 +3817,7 @@
38173817
"reportableChange": 0
38183818
},
38193819
{
3820-
"name": "delay",
3820+
"name": "Delay",
38213821
"code": 58,
38223822
"mfgCode": null,
38233823
"side": "server",
@@ -3849,7 +3849,7 @@
38493849
"reportableChange": 0
38503850
},
38513851
{
3852-
"name": "ChannelMask",
3852+
"name": "ChannelPage0Mask",
38533853
"code": 60,
38543854
"mfgCode": null,
38553855
"side": "server",
@@ -4553,7 +4553,7 @@
45534553
"code": 0,
45544554
"mfgCode": null,
45554555
"side": "server",
4556-
"type": "int8u",
4556+
"type": "CommissioningWindowStatus",
45574557
"included": 1,
45584558
"storageOption": "External",
45594559
"singleton": 0,

‎examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.zap

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"featureLevel": 77,
2+
"featureLevel": 80,
33
"creator": "zap",
44
"keyValuePairs": [
55
{
@@ -3817,7 +3817,7 @@
38173817
"reportableChange": 0
38183818
},
38193819
{
3820-
"name": "delay",
3820+
"name": "Delay",
38213821
"code": 58,
38223822
"mfgCode": null,
38233823
"side": "server",
@@ -3849,7 +3849,7 @@
38493849
"reportableChange": 0
38503850
},
38513851
{
3852-
"name": "ChannelMask",
3852+
"name": "ChannelPage0Mask",
38533853
"code": 60,
38543854
"mfgCode": null,
38553855
"side": "server",
@@ -4553,7 +4553,7 @@
45534553
"code": 0,
45544554
"mfgCode": null,
45554555
"side": "server",
4556-
"type": "int8u",
4556+
"type": "CommissioningWindowStatus",
45574557
"included": 1,
45584558
"storageOption": "External",
45594559
"singleton": 0,

‎examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.zap

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"featureLevel": 77,
2+
"featureLevel": 80,
33
"creator": "zap",
44
"keyValuePairs": [
55
{
@@ -3817,7 +3817,7 @@
38173817
"reportableChange": 0
38183818
},
38193819
{
3820-
"name": "delay",
3820+
"name": "Delay",
38213821
"code": 58,
38223822
"mfgCode": null,
38233823
"side": "server",
@@ -3849,7 +3849,7 @@
38493849
"reportableChange": 0
38503850
},
38513851
{
3852-
"name": "ChannelMask",
3852+
"name": "ChannelPage0Mask",
38533853
"code": 60,
38543854
"mfgCode": null,
38553855
"side": "server",
@@ -4553,7 +4553,7 @@
45534553
"code": 0,
45544554
"mfgCode": null,
45554555
"side": "server",
4556-
"type": "int8u",
4556+
"type": "CommissioningWindowStatus",
45574557
"included": 1,
45584558
"storageOption": "External",
45594559
"singleton": 0,

‎examples/chef/devices/rootnode_doorlock_aNKYAreMXE.zap

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"featureLevel": 77,
2+
"featureLevel": 80,
33
"creator": "zap",
44
"keyValuePairs": [
55
{
@@ -3817,7 +3817,7 @@
38173817
"reportableChange": 0
38183818
},
38193819
{
3820-
"name": "delay",
3820+
"name": "Delay",
38213821
"code": 58,
38223822
"mfgCode": null,
38233823
"side": "server",
@@ -3849,7 +3849,7 @@
38493849
"reportableChange": 0
38503850
},
38513851
{
3852-
"name": "ChannelMask",
3852+
"name": "ChannelPage0Mask",
38533853
"code": 60,
38543854
"mfgCode": null,
38553855
"side": "server",
@@ -4553,7 +4553,7 @@
45534553
"code": 0,
45544554
"mfgCode": null,
45554555
"side": "server",
4556-
"type": "int8u",
4556+
"type": "CommissioningWindowStatus",
45574557
"included": 1,
45584558
"storageOption": "External",
45594559
"singleton": 0,
@@ -7845,7 +7845,7 @@
78457845
"reportableChange": 0
78467846
},
78477847
{
7848-
"name": "ColorTemperature",
7848+
"name": "ColorTemperatureMireds",
78497849
"code": 7,
78507850
"mfgCode": null,
78517851
"side": "server",

‎examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.matter

+2-2
Original file line numberDiff line numberDiff line change
@@ -1600,7 +1600,7 @@ server cluster ColorControl = 768 {
16001600
readonly attribute int16u remainingTime = 2;
16011601
readonly attribute int16u currentX = 3;
16021602
readonly attribute int16u currentY = 4;
1603-
readonly attribute int16u colorTemperature = 7;
1603+
readonly attribute int16u colorTemperatureMireds = 7;
16041604
readonly attribute enum8 colorMode = 8;
16051605
attribute bitmap8 options = 15;
16061606
readonly attribute int16u enhancedCurrentHue = 16384;
@@ -2000,7 +2000,7 @@ endpoint 1 {
20002000
ram attribute remainingTime;
20012001
ram attribute currentX default = 0x616B;
20022002
ram attribute currentY default = 0x607D;
2003-
ram attribute colorTemperature default = 0x00FA;
2003+
ram attribute colorTemperatureMireds default = 0x00FA;
20042004
ram attribute colorMode default = 0x01;
20052005
ram attribute options;
20062006
ram attribute enhancedCurrentHue;

‎examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.zap

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"featureLevel": 77,
2+
"featureLevel": 80,
33
"creator": "zap",
44
"keyValuePairs": [
55
{
@@ -3817,7 +3817,7 @@
38173817
"reportableChange": 0
38183818
},
38193819
{
3820-
"name": "delay",
3820+
"name": "Delay",
38213821
"code": 58,
38223822
"mfgCode": null,
38233823
"side": "server",
@@ -3849,7 +3849,7 @@
38493849
"reportableChange": 0
38503850
},
38513851
{
3852-
"name": "ChannelMask",
3852+
"name": "ChannelPage0Mask",
38533853
"code": 60,
38543854
"mfgCode": null,
38553855
"side": "server",
@@ -4553,7 +4553,7 @@
45534553
"code": 0,
45544554
"mfgCode": null,
45554555
"side": "server",
4556-
"type": "int8u",
4556+
"type": "CommissioningWindowStatus",
45574557
"included": 1,
45584558
"storageOption": "External",
45594559
"singleton": 0,
@@ -7135,7 +7135,7 @@
71357135
"reportableChange": 0
71367136
},
71377137
{
7138-
"name": "ColorTemperature",
7138+
"name": "ColorTemperatureMireds",
71397139
"code": 7,
71407140
"mfgCode": null,
71417141
"side": "server",

0 commit comments

Comments
 (0)