Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Re-align colorcontrol cluster definition with the spec #18700

Merged
merged 3 commits into from
May 24, 2022
Merged

Re-align colorcontrol cluster definition with the spec #18700

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b596d97
align color control spec. apply renaming to yaml files and the color …
jmartinez-silabs May 20, 2022
9f8bb8d
regen all
jmartinez-silabs May 20, 2022
745807f
rebase n regen
jmartinez-silabs May 23, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 20 additions & 20 deletions examples/all-clusters-app/all-clusters-common/all-clusters-app.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -458,37 +458,37 @@ server cluster ColorControl = 768 {
readonly attribute char_string<254> compensationText = 6;
readonly attribute int16u colorTemperature = 7;
readonly attribute enum8 colorMode = 8;
attribute bitmap8 colorControlOptions = 15;
readonly attribute int8u numberOfPrimaries = 16;
attribute bitmap8 options = 15;
readonly attribute nullable int8u numberOfPrimaries = 16;
readonly attribute int16u primary1X = 17;
readonly attribute int16u primary1Y = 18;
readonly attribute int8u primary1Intensity = 19;
readonly attribute nullable int8u primary1Intensity = 19;
readonly attribute int16u primary2X = 21;
readonly attribute int16u primary2Y = 22;
readonly attribute int8u primary2Intensity = 23;
readonly attribute nullable int8u primary2Intensity = 23;
readonly attribute int16u primary3X = 25;
readonly attribute int16u primary3Y = 26;
readonly attribute int8u primary3Intensity = 27;
readonly attribute nullable int8u primary3Intensity = 27;
readonly attribute int16u primary4X = 32;
readonly attribute int16u primary4Y = 33;
readonly attribute int8u primary4Intensity = 34;
readonly attribute nullable int8u primary4Intensity = 34;
readonly attribute int16u primary5X = 36;
readonly attribute int16u primary5Y = 37;
readonly attribute int8u primary5Intensity = 38;
readonly attribute nullable int8u primary5Intensity = 38;
readonly attribute int16u primary6X = 40;
readonly attribute int16u primary6Y = 41;
readonly attribute int8u primary6Intensity = 42;
readonly attribute nullable int8u primary6Intensity = 42;
attribute access(write: manage) int16u whitePointX = 48;
attribute access(write: manage) int16u whitePointY = 49;
attribute access(write: manage) int16u colorPointRX = 50;
attribute access(write: manage) int16u colorPointRY = 51;
attribute access(write: manage) int8u colorPointRIntensity = 52;
attribute access(write: manage) nullable int8u colorPointRIntensity = 52;
attribute access(write: manage) int16u colorPointGX = 54;
attribute access(write: manage) int16u colorPointGY = 55;
attribute access(write: manage) int8u colorPointGIntensity = 56;
attribute access(write: manage) nullable int8u colorPointGIntensity = 56;
attribute access(write: manage) int16u colorPointBX = 58;
attribute access(write: manage) int16u colorPointBY = 59;
attribute access(write: manage) int8u colorPointBIntensity = 60;
attribute access(write: manage) nullable int8u colorPointBIntensity = 60;
readonly attribute int16u enhancedCurrentHue = 16384;
readonly attribute enum8 enhancedColorMode = 16385;
readonly attribute int8u colorLoopActive = 16386;
Expand All @@ -497,8 +497,8 @@ server cluster ColorControl = 768 {
readonly attribute int16u colorLoopStartEnhancedHue = 16389;
readonly attribute int16u colorLoopStoredEnhancedHue = 16390;
readonly attribute bitmap16 colorCapabilities = 16394;
readonly attribute int16u colorTempPhysicalMin = 16395;
readonly attribute int16u colorTempPhysicalMax = 16396;
readonly attribute int16u colorTempPhysicalMinMireds = 16395;
readonly attribute int16u colorTempPhysicalMaxMireds = 16396;
readonly attribute int16u coupleColorTempToLevelMinMireds = 16397;
attribute access(write: manage) int16u startUpColorTemperatureMireds = 16400;
readonly attribute bitmap32 featureMap = 65532;
Expand Down Expand Up @@ -636,8 +636,8 @@ server cluster ColorControl = 768 {
request struct MoveColorTemperatureRequest {
HueMoveMode moveMode = 0;
INT16U rate = 1;
INT16U colorTemperatureMinimum = 2;
INT16U colorTemperatureMaximum = 3;
INT16U colorTemperatureMinimumMireds = 2;
INT16U colorTemperatureMaximumMireds = 3;
BITMAP8 optionsMask = 4;
BITMAP8 optionsOverride = 5;
}
Expand All @@ -646,8 +646,8 @@ server cluster ColorControl = 768 {
HueStepMode stepMode = 0;
INT16U stepSize = 1;
INT16U transitionTime = 2;
INT16U colorTemperatureMinimum = 3;
INT16U colorTemperatureMaximum = 4;
INT16U colorTemperatureMinimumMireds = 3;
INT16U colorTemperatureMaximumMireds = 4;
BITMAP8 optionsMask = 5;
BITMAP8 optionsOverride = 6;
}
Expand Down Expand Up @@ -4439,7 +4439,7 @@ endpoint 1 {
ram attribute compensationText;
ram attribute colorTemperature default = 0x00FA;
ram attribute colorMode default = 0x01;
ram attribute colorControlOptions;
ram attribute options;
ram attribute numberOfPrimaries;
ram attribute primary1X;
ram attribute primary1Y;
Expand Down Expand Up @@ -4478,8 +4478,8 @@ endpoint 1 {
ram attribute colorLoopStartEnhancedHue default = 0x2300;
ram attribute colorLoopStoredEnhancedHue;
ram attribute colorCapabilities;
ram attribute colorTempPhysicalMin;
ram attribute colorTempPhysicalMax default = 0xFEFF;
ram attribute colorTempPhysicalMinMireds;
ram attribute colorTempPhysicalMaxMireds default = 0xFEFF;
ram attribute coupleColorTempToLevelMinMireds;
ram attribute startUpColorTemperatureMireds;
ram attribute featureMap default = 0x1F;
Expand Down
Loading