Skip to content

Commit dea6c23

Browse files
committed
Merge correct colortemperaturelight from PR project-chip#35443
1 parent 224ac49 commit dea6c23

File tree

2 files changed

+68
-456
lines changed

2 files changed

+68
-456
lines changed

examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.matter

+16-44
Original file line numberDiff line numberDiff line change
@@ -1959,15 +1959,15 @@ endpoint 1 {
19591959
}
19601960

19611961
server cluster OnOff {
1962-
ram attribute onOff default = 0;
1962+
persist attribute onOff default = 0;
19631963
ram attribute globalSceneControl default = 1;
19641964
ram attribute onTime default = 0;
19651965
ram attribute offWaitTime default = 0;
1966-
ram attribute startUpOnOff;
1966+
persist attribute startUpOnOff;
19671967
callback attribute generatedCommandList;
19681968
callback attribute acceptedCommandList;
19691969
callback attribute attributeList;
1970-
ram attribute featureMap default = 0;
1970+
ram attribute featureMap default = 1;
19711971
ram attribute clusterRevision default = 5;
19721972

19731973
handle command Off;
@@ -1979,15 +1979,17 @@ endpoint 1 {
19791979
}
19801980

19811981
server cluster LevelControl {
1982-
ram attribute currentLevel default = 0x00;
1982+
persist attribute currentLevel default = 0x00;
19831983
ram attribute remainingTime default = 0x0000;
1984-
ram attribute options default = 0x00;
1984+
ram attribute minLevel default = 0x1;
1985+
ram attribute maxLevel default = 0xFE;
1986+
ram attribute options default = 0x01;
19851987
ram attribute onLevel;
1986-
ram attribute startUpCurrentLevel;
1988+
persist attribute startUpCurrentLevel;
19871989
callback attribute generatedCommandList;
19881990
callback attribute acceptedCommandList;
19891991
callback attribute attributeList;
1990-
ram attribute featureMap default = 0;
1992+
ram attribute featureMap default = 0x3;
19911993
ram attribute clusterRevision default = 6;
19921994

19931995
handle command MoveToLevel;
@@ -2014,53 +2016,23 @@ endpoint 1 {
20142016

20152017
server cluster ColorControl {
20162018
ram attribute remainingTime default = 0x0000;
2017-
ram attribute colorTemperatureMireds default = 0x00FA;
2018-
ram attribute colorMode default = 0x02;
2019+
persist attribute colorTemperatureMireds default = 0x00FA;
2020+
persist attribute colorMode default = 0x02;
20192021
ram attribute options default = 0x00;
20202022
ram attribute numberOfPrimaries;
2021-
ram attribute primary1X;
2022-
ram attribute primary1Y;
2023-
ram attribute primary1Intensity;
2024-
ram attribute primary2X;
2025-
ram attribute primary2Y;
2026-
ram attribute primary2Intensity;
2027-
ram attribute primary3X;
2028-
ram attribute primary3Y;
2029-
ram attribute primary3Intensity;
2030-
ram attribute primary4X;
2031-
ram attribute primary4Y;
2032-
ram attribute primary4Intensity;
2033-
ram attribute primary5X;
2034-
ram attribute primary5Y;
2035-
ram attribute primary5Intensity;
2036-
ram attribute primary6X;
2037-
ram attribute primary6Y;
2038-
ram attribute primary6Intensity;
2039-
ram attribute enhancedCurrentHue default = 0x0000;
2040-
ram attribute enhancedColorMode default = 0x02;
2041-
ram attribute colorCapabilities default = 0x0000;
2042-
ram attribute colorTempPhysicalMinMireds default = 0x009A;
2043-
ram attribute colorTempPhysicalMaxMireds default = 0x01C6;
2023+
persist attribute enhancedColorMode default = 0x02;
2024+
ram attribute colorCapabilities default = 0x0010;
2025+
ram attribute colorTempPhysicalMinMireds default = 0x0001;
2026+
ram attribute colorTempPhysicalMaxMireds default = 0xFEFF;
20442027
ram attribute coupleColorTempToLevelMinMireds;
2045-
ram attribute startUpColorTemperatureMireds default = 0x00FA;
2028+
persist attribute startUpColorTemperatureMireds default = 0xFEFF;
20462029
callback attribute generatedCommandList;
20472030
callback attribute acceptedCommandList;
20482031
callback attribute attributeList;
20492032
ram attribute featureMap default = 0x0010;
20502033
ram attribute clusterRevision default = 7;
20512034

2052-
handle command MoveToHue;
2053-
handle command MoveHue;
2054-
handle command StepHue;
2055-
handle command MoveToSaturation;
2056-
handle command MoveSaturation;
2057-
handle command StepSaturation;
2058-
handle command MoveToHueAndSaturation;
2059-
handle command MoveToColor;
2060-
handle command MoveColor;
2061-
handle command StepColor;
20622035
handle command MoveToColorTemperature;
2063-
handle command EnhancedMoveToHue;
20642036
handle command EnhancedMoveHue;
20652037
handle command EnhancedStepHue;
20662038
handle command EnhancedMoveToHueAndSaturation;

0 commit comments

Comments
 (0)