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.

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

Colorcontrol xml file sync with specs #33612

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
61 commits
Select commit Hold shift + click to select a range
316d897
doorlock xml file sync with specs and colorcontrol xml type changes
Thirsrin May 27, 2024
808382f
build error resolved
Thirsrin May 28, 2024
d83f14d
Restyled by clang-format
restyled-commits May 28, 2024
d1a9337
build error resolved
Thirsrin May 28, 2024
0e98315
addressed review comments
Thirsrin May 30, 2024
e4fac93
Restyled by clang-format
restyled-commits May 30, 2024
ebfa8d4
Addressed review comments
Thirsrin May 31, 2024
2c45add
Restyled by clang-format
restyled-commits May 31, 2024
1de6eff
build error solved
Thirsrin May 31, 2024
f330c0c
build error solved
Thirsrin May 31, 2024
0ae113b
build error solved
Thirsrin May 31, 2024
1511dcf
build error solved
Thirsrin May 31, 2024
9829249
build issue resolved
Thirsrin Jun 3, 2024
8207987
Restyled by clang-format
restyled-commits Jun 3, 2024
b0d0408
resolved build errors
Thirsrin Jun 3, 2024
2ab526f
removed doorlock xml changes
Thirsrin Jun 3, 2024
de92e06
Restyled by clang-format
restyled-commits Jun 3, 2024
0167f38
resolved build errors
Thirsrin Jun 3, 2024
8f66b44
Restyled by clang-format
restyled-commits Jun 3, 2024
8d98129
resolved build errors
Thirsrin Jun 3, 2024
186c5a8
addressed review comments
Thirsrin Jun 4, 2024
2075b4d
addressed review comments
Thirsrin Jun 4, 2024
ed05dd7
resolved build errors
Thirsrin Jun 4, 2024
011be66
resolved build errors
Thirsrin Jun 4, 2024
85c2e1f
zap generated changes
Thirsrin Jun 4, 2024
ce89cf8
Restyled by clang-format
restyled-commits Jun 4, 2024
900c4ca
Revert colorloopdirection type change
Thirsrin Jun 11, 2024
e09f1d0
build error resolved
Thirsrin Jun 11, 2024
9061c95
Restyled by clang-format
restyled-commits Jun 11, 2024
d5c2c62
rebased and zap generated
Thirsrin Jun 18, 2024
56cc205
color control xml file updated
Thirsrin Jun 21, 2024
4129d48
build error solved
Thirsrin Jun 24, 2024
1cbb974
ameba build error resolved
Thirsrin Jun 24, 2024
9fa2635
Restyled by clang-format
restyled-commits Jun 24, 2024
96efaeb
ameba build error resolved
Thirsrin Jun 24, 2024
482c64a
doorlock changes removed
Thirsrin Jun 24, 2024
84183e8
ameba build error resolved
Thirsrin Jun 25, 2024
f835e35
ameba build error resolved
Thirsrin Jun 25, 2024
8c36602
addressed review comments
Thirsrin Jul 5, 2024
54d2116
addressed review comments
Thirsrin Jul 5, 2024
e7dcc52
Restyled by clang-format
restyled-commits Jul 5, 2024
51c990f
Addressed review comments
Thirsrin Jul 25, 2024
5a13784
Addressed review comments
Thirsrin Jul 25, 2024
c41b60b
Restyled by clang-format
restyled-commits Jul 25, 2024
d1f9c94
build error resolved
Thirsrin Jul 25, 2024
c167613
build error resolved
Thirsrin Jul 26, 2024
7f2cbb8
addressed reviews comments and build error resolved
Thirsrin Aug 5, 2024
eff88f6
Restyled by clang-format
restyled-commits Aug 5, 2024
9e5ab3c
ZAP issue resolved
Thirsrin Aug 5, 2024
f696f58
scripts updated
Thirsrin Aug 20, 2024
126ed2e
scripts updated
Thirsrin Aug 20, 2024
7241cf7
added enum values in compatenum.h file
Thirsrin Aug 21, 2024
eb93c51
Restyled by whitespace
restyled-commits Aug 21, 2024
8dec909
Restyled by clang-format
restyled-commits Aug 21, 2024
4e4448c
added enum values in compatenum.h file
Thirsrin Aug 21, 2024
be9177e
Restyled by whitespace
restyled-commits Aug 21, 2024
3bb50db
Restyled by clang-format
restyled-commits Aug 21, 2024
33e6dcd
added enum values in compatenum.h file
Thirsrin Aug 21, 2024
e186a75
added header file for to_underlying
Thirsrin Aug 21, 2024
934bbf0
build error resolved
Thirsrin Aug 21, 2024
d820f46
build error resolved
Thirsrin Aug 21, 2024
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
182 changes: 95 additions & 87 deletions examples/all-clusters-app/all-clusters-common/all-clusters-app.matter
Original file line number Diff line number Diff line change
Expand Up @@ -5847,65 +5847,62 @@ cluster ThermostatUserInterfaceConfiguration = 516 {
cluster ColorControl = 768 {
revision 7;

enum ColorLoopAction : enum8 {
enum ColorLoopActionEnum : enum8 {
kDeactivate = 0;
kActivateFromColorLoopStartEnhancedHue = 1;
kActivateFromEnhancedCurrentHue = 2;
}

enum ColorLoopDirection : enum8 {
kDecrementHue = 0;
kIncrementHue = 1;
enum ColorLoopDirectionEnum : enum8 {
kDecrement = 0;
kIncrement = 1;
}

enum ColorMode : enum8 {
enum ColorModeEnum : enum8 {
kCurrentHueAndCurrentSaturation = 0;
kCurrentXAndCurrentY = 1;
kColorTemperature = 2;
kColorTemperatureMireds = 2;
}

enum HueDirection : enum8 {
kShortestDistance = 0;
kLongestDistance = 1;
enum DirectionEnum : enum8 {
kShortest = 0;
kLongest = 1;
kUp = 2;
kDown = 3;
}

enum HueMoveMode : enum8 {
kStop = 0;
kUp = 1;
kDown = 3;
enum DriftCompensationEnum : enum8 {
kNone = 0;
kOtherOrUnknown = 1;
kTemperatureMonitoring = 2;
kOpticalLuminanceMonitoringAndFeedback = 3;
kOpticalColorMonitoringAndFeedback = 4;
}

enum HueStepMode : enum8 {
kUp = 1;
kDown = 3;
enum EnhancedColorModeEnum : enum8 {
kCurrentHueAndCurrentSaturation = 0;
kCurrentXAndCurrentY = 1;
kColorTemperatureMireds = 2;
kEnhancedCurrentHueAndCurrentSaturation = 3;
}

enum SaturationMoveMode : enum8 {
enum MoveModeEnum : enum8 {
kStop = 0;
kUp = 1;
kDown = 3;
}

enum SaturationStepMode : enum8 {
enum StepModeEnum : enum8 {
kUp = 1;
kDown = 3;
}

bitmap ColorCapabilities : bitmap16 {
kHueSaturationSupported = 0x1;
kEnhancedHueSupported = 0x2;
kColorLoopSupported = 0x4;
kXYAttributesSupported = 0x8;
kColorTemperatureSupported = 0x10;
}

bitmap ColorLoopUpdateFlags : bitmap8 {
kUpdateAction = 0x1;
kUpdateDirection = 0x2;
kUpdateTime = 0x4;
kUpdateStartHue = 0x8;
bitmap ColorCapabilitiesBitmap : bitmap16 {
kHueSaturation = 0x1;
kEnhancedHue = 0x2;
kColorLoop = 0x4;
kXY = 0x8;
kColorTemperature = 0x10;
}

bitmap Feature : bitmap32 {
Expand All @@ -5916,16 +5913,27 @@ cluster ColorControl = 768 {
kColorTemperature = 0x10;
}

bitmap OptionsBitmap : bitmap8 {
kExecuteIfOff = 0x1;
}

bitmap UpdateFlagsBitmap : bitmap8 {
kUpdateAction = 0x1;
kUpdateDirection = 0x2;
kUpdateTime = 0x4;
kUpdateStartHue = 0x8;
}

readonly attribute optional int8u currentHue = 0;
readonly attribute optional int8u currentSaturation = 1;
readonly attribute optional int16u remainingTime = 2;
readonly attribute optional int16u currentX = 3;
readonly attribute optional int16u currentY = 4;
readonly attribute optional enum8 driftCompensation = 5;
readonly attribute optional DriftCompensationEnum driftCompensation = 5;
readonly attribute optional char_string<254> compensationText = 6;
readonly attribute optional int16u colorTemperatureMireds = 7;
readonly attribute enum8 colorMode = 8;
attribute bitmap8 options = 15;
readonly attribute ColorModeEnum colorMode = 8;
attribute OptionsBitmap options = 15;
readonly attribute nullable int8u numberOfPrimaries = 16;
readonly attribute optional int16u primary1X = 17;
readonly attribute optional int16u primary1Y = 18;
Expand Down Expand Up @@ -5957,13 +5965,13 @@ cluster ColorControl = 768 {
attribute access(write: manage) optional int16u colorPointBY = 59;
attribute access(write: manage) optional nullable int8u colorPointBIntensity = 60;
readonly attribute optional int16u enhancedCurrentHue = 16384;
readonly attribute enum8 enhancedColorMode = 16385;
readonly attribute EnhancedColorModeEnum enhancedColorMode = 16385;
readonly attribute optional int8u colorLoopActive = 16386;
readonly attribute optional int8u colorLoopDirection = 16387;
readonly attribute optional int16u colorLoopTime = 16388;
readonly attribute optional int16u colorLoopStartEnhancedHue = 16389;
readonly attribute optional int16u colorLoopStoredEnhancedHue = 16390;
readonly attribute bitmap16 colorCapabilities = 16394;
readonly attribute ColorCapabilitiesBitmap colorCapabilities = 16394;
readonly attribute optional int16u colorTempPhysicalMinMireds = 16395;
readonly attribute optional int16u colorTempPhysicalMaxMireds = 16396;
readonly attribute optional int16u coupleColorTempToLevelMinMireds = 16397;
Expand All @@ -5977,150 +5985,150 @@ cluster ColorControl = 768 {

request struct MoveToHueRequest {
int8u hue = 0;
HueDirection direction = 1;
DirectionEnum direction = 1;
int16u transitionTime = 2;
bitmap8 optionsMask = 3;
bitmap8 optionsOverride = 4;
OptionsBitmap optionsMask = 3;
OptionsBitmap optionsOverride = 4;
}

request struct MoveHueRequest {
HueMoveMode moveMode = 0;
MoveModeEnum moveMode = 0;
int8u rate = 1;
bitmap8 optionsMask = 2;
bitmap8 optionsOverride = 3;
OptionsBitmap optionsMask = 2;
OptionsBitmap optionsOverride = 3;
}

request struct StepHueRequest {
HueStepMode stepMode = 0;
StepModeEnum stepMode = 0;
int8u stepSize = 1;
int8u transitionTime = 2;
bitmap8 optionsMask = 3;
bitmap8 optionsOverride = 4;
OptionsBitmap optionsMask = 3;
OptionsBitmap optionsOverride = 4;
}

request struct MoveToSaturationRequest {
int8u saturation = 0;
int16u transitionTime = 1;
bitmap8 optionsMask = 2;
bitmap8 optionsOverride = 3;
OptionsBitmap optionsMask = 2;
OptionsBitmap optionsOverride = 3;
}

request struct MoveSaturationRequest {
SaturationMoveMode moveMode = 0;
MoveModeEnum moveMode = 0;
int8u rate = 1;
bitmap8 optionsMask = 2;
bitmap8 optionsOverride = 3;
OptionsBitmap optionsMask = 2;
OptionsBitmap optionsOverride = 3;
}

request struct StepSaturationRequest {
SaturationStepMode stepMode = 0;
StepModeEnum stepMode = 0;
int8u stepSize = 1;
int8u transitionTime = 2;
bitmap8 optionsMask = 3;
bitmap8 optionsOverride = 4;
OptionsBitmap optionsMask = 3;
OptionsBitmap optionsOverride = 4;
}

request struct MoveToHueAndSaturationRequest {
int8u hue = 0;
int8u saturation = 1;
int16u transitionTime = 2;
bitmap8 optionsMask = 3;
bitmap8 optionsOverride = 4;
OptionsBitmap optionsMask = 3;
OptionsBitmap optionsOverride = 4;
}

request struct MoveToColorRequest {
int16u colorX = 0;
int16u colorY = 1;
int16u transitionTime = 2;
bitmap8 optionsMask = 3;
bitmap8 optionsOverride = 4;
OptionsBitmap optionsMask = 3;
OptionsBitmap optionsOverride = 4;
}

request struct MoveColorRequest {
int16s rateX = 0;
int16s rateY = 1;
bitmap8 optionsMask = 2;
bitmap8 optionsOverride = 3;
OptionsBitmap optionsMask = 2;
OptionsBitmap optionsOverride = 3;
}

request struct StepColorRequest {
int16s stepX = 0;
int16s stepY = 1;
int16u transitionTime = 2;
bitmap8 optionsMask = 3;
bitmap8 optionsOverride = 4;
OptionsBitmap optionsMask = 3;
OptionsBitmap optionsOverride = 4;
}

request struct MoveToColorTemperatureRequest {
int16u colorTemperatureMireds = 0;
int16u transitionTime = 1;
bitmap8 optionsMask = 2;
bitmap8 optionsOverride = 3;
OptionsBitmap optionsMask = 2;
OptionsBitmap optionsOverride = 3;
}

request struct EnhancedMoveToHueRequest {
int16u enhancedHue = 0;
HueDirection direction = 1;
DirectionEnum direction = 1;
int16u transitionTime = 2;
bitmap8 optionsMask = 3;
bitmap8 optionsOverride = 4;
OptionsBitmap optionsMask = 3;
OptionsBitmap optionsOverride = 4;
}

request struct EnhancedMoveHueRequest {
HueMoveMode moveMode = 0;
MoveModeEnum moveMode = 0;
int16u rate = 1;
bitmap8 optionsMask = 2;
bitmap8 optionsOverride = 3;
OptionsBitmap optionsMask = 2;
OptionsBitmap optionsOverride = 3;
}

request struct EnhancedStepHueRequest {
HueStepMode stepMode = 0;
StepModeEnum stepMode = 0;
int16u stepSize = 1;
int16u transitionTime = 2;
bitmap8 optionsMask = 3;
bitmap8 optionsOverride = 4;
OptionsBitmap optionsMask = 3;
OptionsBitmap optionsOverride = 4;
}

request struct EnhancedMoveToHueAndSaturationRequest {
int16u enhancedHue = 0;
int8u saturation = 1;
int16u transitionTime = 2;
bitmap8 optionsMask = 3;
bitmap8 optionsOverride = 4;
OptionsBitmap optionsMask = 3;
OptionsBitmap optionsOverride = 4;
}

request struct ColorLoopSetRequest {
ColorLoopUpdateFlags updateFlags = 0;
ColorLoopAction action = 1;
ColorLoopDirection direction = 2;
UpdateFlagsBitmap updateFlags = 0;
ColorLoopActionEnum action = 1;
ColorLoopDirectionEnum direction = 2;
int16u time = 3;
int16u startHue = 4;
bitmap8 optionsMask = 5;
bitmap8 optionsOverride = 6;
OptionsBitmap optionsMask = 5;
OptionsBitmap optionsOverride = 6;
}

request struct StopMoveStepRequest {
bitmap8 optionsMask = 0;
bitmap8 optionsOverride = 1;
OptionsBitmap optionsMask = 0;
OptionsBitmap optionsOverride = 1;
}

request struct MoveColorTemperatureRequest {
HueMoveMode moveMode = 0;
MoveModeEnum moveMode = 0;
int16u rate = 1;
int16u colorTemperatureMinimumMireds = 2;
int16u colorTemperatureMaximumMireds = 3;
bitmap8 optionsMask = 4;
bitmap8 optionsOverride = 5;
OptionsBitmap optionsMask = 4;
OptionsBitmap optionsOverride = 5;
}

request struct StepColorTemperatureRequest {
HueStepMode stepMode = 0;
StepModeEnum stepMode = 0;
int16u stepSize = 1;
int16u transitionTime = 2;
int16u colorTemperatureMinimumMireds = 3;
int16u colorTemperatureMaximumMireds = 4;
bitmap8 optionsMask = 5;
bitmap8 optionsOverride = 6;
OptionsBitmap optionsMask = 5;
OptionsBitmap optionsOverride = 6;
}

/** Move to specified hue. */
Expand Down
Loading
Loading