Skip to content

Commit 849634b

Browse files
Colorcontrol xml file sync with specs (#33612)
* doorlock xml file sync with specs and colorcontrol xml type changes * build error resolved * Restyled by clang-format * build error resolved * addressed review comments * Restyled by clang-format * Addressed review comments * Restyled by clang-format * build error solved * build error solved * build error solved * build error solved * build issue resolved * Restyled by clang-format * resolved build errors * removed doorlock xml changes * Restyled by clang-format * resolved build errors * Restyled by clang-format * resolved build errors * addressed review comments * addressed review comments * resolved build errors * resolved build errors * zap generated changes * Restyled by clang-format * Revert colorloopdirection type change * build error resolved * Restyled by clang-format * rebased and zap generated * color control xml file updated * build error solved * ameba build error resolved * Restyled by clang-format * ameba build error resolved * doorlock changes removed * ameba build error resolved * ameba build error resolved * addressed review comments * addressed review comments * Restyled by clang-format * Addressed review comments * Addressed review comments * Restyled by clang-format * build error resolved * build error resolved * addressed reviews comments and build error resolved * Restyled by clang-format * ZAP issue resolved * scripts updated * scripts updated * added enum values in compatenum.h file * Restyled by whitespace * Restyled by clang-format * added enum values in compatenum.h file * Restyled by whitespace * Restyled by clang-format * added enum values in compatenum.h file * added header file for to_underlying * build error resolved * build error resolved --------- Co-authored-by: Restyled.io <commits@restyled.io>
1 parent 150aad3 commit 849634b

File tree

41 files changed

+2825
-2580
lines changed

Some content is hidden

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

41 files changed

+2825
-2580
lines changed

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

+95-87
Original file line numberDiff line numberDiff line change
@@ -5847,65 +5847,62 @@ cluster ThermostatUserInterfaceConfiguration = 516 {
58475847
cluster ColorControl = 768 {
58485848
revision 7;
58495849

5850-
enum ColorLoopAction : enum8 {
5850+
enum ColorLoopActionEnum : enum8 {
58515851
kDeactivate = 0;
58525852
kActivateFromColorLoopStartEnhancedHue = 1;
58535853
kActivateFromEnhancedCurrentHue = 2;
58545854
}
58555855

5856-
enum ColorLoopDirection : enum8 {
5857-
kDecrementHue = 0;
5858-
kIncrementHue = 1;
5856+
enum ColorLoopDirectionEnum : enum8 {
5857+
kDecrement = 0;
5858+
kIncrement = 1;
58595859
}
58605860

5861-
enum ColorMode : enum8 {
5861+
enum ColorModeEnum : enum8 {
58625862
kCurrentHueAndCurrentSaturation = 0;
58635863
kCurrentXAndCurrentY = 1;
5864-
kColorTemperature = 2;
5864+
kColorTemperatureMireds = 2;
58655865
}
58665866

5867-
enum HueDirection : enum8 {
5868-
kShortestDistance = 0;
5869-
kLongestDistance = 1;
5867+
enum DirectionEnum : enum8 {
5868+
kShortest = 0;
5869+
kLongest = 1;
58705870
kUp = 2;
58715871
kDown = 3;
58725872
}
58735873

5874-
enum HueMoveMode : enum8 {
5875-
kStop = 0;
5876-
kUp = 1;
5877-
kDown = 3;
5874+
enum DriftCompensationEnum : enum8 {
5875+
kNone = 0;
5876+
kOtherOrUnknown = 1;
5877+
kTemperatureMonitoring = 2;
5878+
kOpticalLuminanceMonitoringAndFeedback = 3;
5879+
kOpticalColorMonitoringAndFeedback = 4;
58785880
}
58795881

5880-
enum HueStepMode : enum8 {
5881-
kUp = 1;
5882-
kDown = 3;
5882+
enum EnhancedColorModeEnum : enum8 {
5883+
kCurrentHueAndCurrentSaturation = 0;
5884+
kCurrentXAndCurrentY = 1;
5885+
kColorTemperatureMireds = 2;
5886+
kEnhancedCurrentHueAndCurrentSaturation = 3;
58835887
}
58845888

5885-
enum SaturationMoveMode : enum8 {
5889+
enum MoveModeEnum : enum8 {
58865890
kStop = 0;
58875891
kUp = 1;
58885892
kDown = 3;
58895893
}
58905894

5891-
enum SaturationStepMode : enum8 {
5895+
enum StepModeEnum : enum8 {
58925896
kUp = 1;
58935897
kDown = 3;
58945898
}
58955899

5896-
bitmap ColorCapabilities : bitmap16 {
5897-
kHueSaturationSupported = 0x1;
5898-
kEnhancedHueSupported = 0x2;
5899-
kColorLoopSupported = 0x4;
5900-
kXYAttributesSupported = 0x8;
5901-
kColorTemperatureSupported = 0x10;
5902-
}
5903-
5904-
bitmap ColorLoopUpdateFlags : bitmap8 {
5905-
kUpdateAction = 0x1;
5906-
kUpdateDirection = 0x2;
5907-
kUpdateTime = 0x4;
5908-
kUpdateStartHue = 0x8;
5900+
bitmap ColorCapabilitiesBitmap : bitmap16 {
5901+
kHueSaturation = 0x1;
5902+
kEnhancedHue = 0x2;
5903+
kColorLoop = 0x4;
5904+
kXY = 0x8;
5905+
kColorTemperature = 0x10;
59095906
}
59105907

59115908
bitmap Feature : bitmap32 {
@@ -5916,16 +5913,27 @@ cluster ColorControl = 768 {
59165913
kColorTemperature = 0x10;
59175914
}
59185915

5916+
bitmap OptionsBitmap : bitmap8 {
5917+
kExecuteIfOff = 0x1;
5918+
}
5919+
5920+
bitmap UpdateFlagsBitmap : bitmap8 {
5921+
kUpdateAction = 0x1;
5922+
kUpdateDirection = 0x2;
5923+
kUpdateTime = 0x4;
5924+
kUpdateStartHue = 0x8;
5925+
}
5926+
59195927
readonly attribute optional int8u currentHue = 0;
59205928
readonly attribute optional int8u currentSaturation = 1;
59215929
readonly attribute optional int16u remainingTime = 2;
59225930
readonly attribute optional int16u currentX = 3;
59235931
readonly attribute optional int16u currentY = 4;
5924-
readonly attribute optional enum8 driftCompensation = 5;
5932+
readonly attribute optional DriftCompensationEnum driftCompensation = 5;
59255933
readonly attribute optional char_string<254> compensationText = 6;
59265934
readonly attribute optional int16u colorTemperatureMireds = 7;
5927-
readonly attribute enum8 colorMode = 8;
5928-
attribute bitmap8 options = 15;
5935+
readonly attribute ColorModeEnum colorMode = 8;
5936+
attribute OptionsBitmap options = 15;
59295937
readonly attribute nullable int8u numberOfPrimaries = 16;
59305938
readonly attribute optional int16u primary1X = 17;
59315939
readonly attribute optional int16u primary1Y = 18;
@@ -5957,13 +5965,13 @@ cluster ColorControl = 768 {
59575965
attribute access(write: manage) optional int16u colorPointBY = 59;
59585966
attribute access(write: manage) optional nullable int8u colorPointBIntensity = 60;
59595967
readonly attribute optional int16u enhancedCurrentHue = 16384;
5960-
readonly attribute enum8 enhancedColorMode = 16385;
5968+
readonly attribute EnhancedColorModeEnum enhancedColorMode = 16385;
59615969
readonly attribute optional int8u colorLoopActive = 16386;
59625970
readonly attribute optional int8u colorLoopDirection = 16387;
59635971
readonly attribute optional int16u colorLoopTime = 16388;
59645972
readonly attribute optional int16u colorLoopStartEnhancedHue = 16389;
59655973
readonly attribute optional int16u colorLoopStoredEnhancedHue = 16390;
5966-
readonly attribute bitmap16 colorCapabilities = 16394;
5974+
readonly attribute ColorCapabilitiesBitmap colorCapabilities = 16394;
59675975
readonly attribute optional int16u colorTempPhysicalMinMireds = 16395;
59685976
readonly attribute optional int16u colorTempPhysicalMaxMireds = 16396;
59695977
readonly attribute optional int16u coupleColorTempToLevelMinMireds = 16397;
@@ -5977,150 +5985,150 @@ cluster ColorControl = 768 {
59775985

59785986
request struct MoveToHueRequest {
59795987
int8u hue = 0;
5980-
HueDirection direction = 1;
5988+
DirectionEnum direction = 1;
59815989
int16u transitionTime = 2;
5982-
bitmap8 optionsMask = 3;
5983-
bitmap8 optionsOverride = 4;
5990+
OptionsBitmap optionsMask = 3;
5991+
OptionsBitmap optionsOverride = 4;
59845992
}
59855993

59865994
request struct MoveHueRequest {
5987-
HueMoveMode moveMode = 0;
5995+
MoveModeEnum moveMode = 0;
59885996
int8u rate = 1;
5989-
bitmap8 optionsMask = 2;
5990-
bitmap8 optionsOverride = 3;
5997+
OptionsBitmap optionsMask = 2;
5998+
OptionsBitmap optionsOverride = 3;
59915999
}
59926000

59936001
request struct StepHueRequest {
5994-
HueStepMode stepMode = 0;
6002+
StepModeEnum stepMode = 0;
59956003
int8u stepSize = 1;
59966004
int8u transitionTime = 2;
5997-
bitmap8 optionsMask = 3;
5998-
bitmap8 optionsOverride = 4;
6005+
OptionsBitmap optionsMask = 3;
6006+
OptionsBitmap optionsOverride = 4;
59996007
}
60006008

60016009
request struct MoveToSaturationRequest {
60026010
int8u saturation = 0;
60036011
int16u transitionTime = 1;
6004-
bitmap8 optionsMask = 2;
6005-
bitmap8 optionsOverride = 3;
6012+
OptionsBitmap optionsMask = 2;
6013+
OptionsBitmap optionsOverride = 3;
60066014
}
60076015

60086016
request struct MoveSaturationRequest {
6009-
SaturationMoveMode moveMode = 0;
6017+
MoveModeEnum moveMode = 0;
60106018
int8u rate = 1;
6011-
bitmap8 optionsMask = 2;
6012-
bitmap8 optionsOverride = 3;
6019+
OptionsBitmap optionsMask = 2;
6020+
OptionsBitmap optionsOverride = 3;
60136021
}
60146022

60156023
request struct StepSaturationRequest {
6016-
SaturationStepMode stepMode = 0;
6024+
StepModeEnum stepMode = 0;
60176025
int8u stepSize = 1;
60186026
int8u transitionTime = 2;
6019-
bitmap8 optionsMask = 3;
6020-
bitmap8 optionsOverride = 4;
6027+
OptionsBitmap optionsMask = 3;
6028+
OptionsBitmap optionsOverride = 4;
60216029
}
60226030

60236031
request struct MoveToHueAndSaturationRequest {
60246032
int8u hue = 0;
60256033
int8u saturation = 1;
60266034
int16u transitionTime = 2;
6027-
bitmap8 optionsMask = 3;
6028-
bitmap8 optionsOverride = 4;
6035+
OptionsBitmap optionsMask = 3;
6036+
OptionsBitmap optionsOverride = 4;
60296037
}
60306038

60316039
request struct MoveToColorRequest {
60326040
int16u colorX = 0;
60336041
int16u colorY = 1;
60346042
int16u transitionTime = 2;
6035-
bitmap8 optionsMask = 3;
6036-
bitmap8 optionsOverride = 4;
6043+
OptionsBitmap optionsMask = 3;
6044+
OptionsBitmap optionsOverride = 4;
60376045
}
60386046

60396047
request struct MoveColorRequest {
60406048
int16s rateX = 0;
60416049
int16s rateY = 1;
6042-
bitmap8 optionsMask = 2;
6043-
bitmap8 optionsOverride = 3;
6050+
OptionsBitmap optionsMask = 2;
6051+
OptionsBitmap optionsOverride = 3;
60446052
}
60456053

60466054
request struct StepColorRequest {
60476055
int16s stepX = 0;
60486056
int16s stepY = 1;
60496057
int16u transitionTime = 2;
6050-
bitmap8 optionsMask = 3;
6051-
bitmap8 optionsOverride = 4;
6058+
OptionsBitmap optionsMask = 3;
6059+
OptionsBitmap optionsOverride = 4;
60526060
}
60536061

60546062
request struct MoveToColorTemperatureRequest {
60556063
int16u colorTemperatureMireds = 0;
60566064
int16u transitionTime = 1;
6057-
bitmap8 optionsMask = 2;
6058-
bitmap8 optionsOverride = 3;
6065+
OptionsBitmap optionsMask = 2;
6066+
OptionsBitmap optionsOverride = 3;
60596067
}
60606068

60616069
request struct EnhancedMoveToHueRequest {
60626070
int16u enhancedHue = 0;
6063-
HueDirection direction = 1;
6071+
DirectionEnum direction = 1;
60646072
int16u transitionTime = 2;
6065-
bitmap8 optionsMask = 3;
6066-
bitmap8 optionsOverride = 4;
6073+
OptionsBitmap optionsMask = 3;
6074+
OptionsBitmap optionsOverride = 4;
60676075
}
60686076

60696077
request struct EnhancedMoveHueRequest {
6070-
HueMoveMode moveMode = 0;
6078+
MoveModeEnum moveMode = 0;
60716079
int16u rate = 1;
6072-
bitmap8 optionsMask = 2;
6073-
bitmap8 optionsOverride = 3;
6080+
OptionsBitmap optionsMask = 2;
6081+
OptionsBitmap optionsOverride = 3;
60746082
}
60756083

60766084
request struct EnhancedStepHueRequest {
6077-
HueStepMode stepMode = 0;
6085+
StepModeEnum stepMode = 0;
60786086
int16u stepSize = 1;
60796087
int16u transitionTime = 2;
6080-
bitmap8 optionsMask = 3;
6081-
bitmap8 optionsOverride = 4;
6088+
OptionsBitmap optionsMask = 3;
6089+
OptionsBitmap optionsOverride = 4;
60826090
}
60836091

60846092
request struct EnhancedMoveToHueAndSaturationRequest {
60856093
int16u enhancedHue = 0;
60866094
int8u saturation = 1;
60876095
int16u transitionTime = 2;
6088-
bitmap8 optionsMask = 3;
6089-
bitmap8 optionsOverride = 4;
6096+
OptionsBitmap optionsMask = 3;
6097+
OptionsBitmap optionsOverride = 4;
60906098
}
60916099

60926100
request struct ColorLoopSetRequest {
6093-
ColorLoopUpdateFlags updateFlags = 0;
6094-
ColorLoopAction action = 1;
6095-
ColorLoopDirection direction = 2;
6101+
UpdateFlagsBitmap updateFlags = 0;
6102+
ColorLoopActionEnum action = 1;
6103+
ColorLoopDirectionEnum direction = 2;
60966104
int16u time = 3;
60976105
int16u startHue = 4;
6098-
bitmap8 optionsMask = 5;
6099-
bitmap8 optionsOverride = 6;
6106+
OptionsBitmap optionsMask = 5;
6107+
OptionsBitmap optionsOverride = 6;
61006108
}
61016109

61026110
request struct StopMoveStepRequest {
6103-
bitmap8 optionsMask = 0;
6104-
bitmap8 optionsOverride = 1;
6111+
OptionsBitmap optionsMask = 0;
6112+
OptionsBitmap optionsOverride = 1;
61056113
}
61066114

61076115
request struct MoveColorTemperatureRequest {
6108-
HueMoveMode moveMode = 0;
6116+
MoveModeEnum moveMode = 0;
61096117
int16u rate = 1;
61106118
int16u colorTemperatureMinimumMireds = 2;
61116119
int16u colorTemperatureMaximumMireds = 3;
6112-
bitmap8 optionsMask = 4;
6113-
bitmap8 optionsOverride = 5;
6120+
OptionsBitmap optionsMask = 4;
6121+
OptionsBitmap optionsOverride = 5;
61146122
}
61156123

61166124
request struct StepColorTemperatureRequest {
6117-
HueStepMode stepMode = 0;
6125+
StepModeEnum stepMode = 0;
61186126
int16u stepSize = 1;
61196127
int16u transitionTime = 2;
61206128
int16u colorTemperatureMinimumMireds = 3;
61216129
int16u colorTemperatureMaximumMireds = 4;
6122-
bitmap8 optionsMask = 5;
6123-
bitmap8 optionsOverride = 6;
6130+
OptionsBitmap optionsMask = 5;
6131+
OptionsBitmap optionsOverride = 6;
61246132
}
61256133

61266134
/** Move to specified hue. */

0 commit comments

Comments
 (0)