@@ -5847,65 +5847,62 @@ cluster ThermostatUserInterfaceConfiguration = 516 {
5847
5847
cluster ColorControl = 768 {
5848
5848
revision 7;
5849
5849
5850
- enum ColorLoopAction : enum8 {
5850
+ enum ColorLoopActionEnum : enum8 {
5851
5851
kDeactivate = 0;
5852
5852
kActivateFromColorLoopStartEnhancedHue = 1;
5853
5853
kActivateFromEnhancedCurrentHue = 2;
5854
5854
}
5855
5855
5856
- enum ColorLoopDirection : enum8 {
5857
- kDecrementHue = 0;
5858
- kIncrementHue = 1;
5856
+ enum ColorLoopDirectionEnum : enum8 {
5857
+ kDecrement = 0;
5858
+ kIncrement = 1;
5859
5859
}
5860
5860
5861
- enum ColorMode : enum8 {
5861
+ enum ColorModeEnum : enum8 {
5862
5862
kCurrentHueAndCurrentSaturation = 0;
5863
5863
kCurrentXAndCurrentY = 1;
5864
- kColorTemperature = 2;
5864
+ kColorTemperatureMireds = 2;
5865
5865
}
5866
5866
5867
- enum HueDirection : enum8 {
5868
- kShortestDistance = 0;
5869
- kLongestDistance = 1;
5867
+ enum DirectionEnum : enum8 {
5868
+ kShortest = 0;
5869
+ kLongest = 1;
5870
5870
kUp = 2;
5871
5871
kDown = 3;
5872
5872
}
5873
5873
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;
5878
5880
}
5879
5881
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;
5883
5887
}
5884
5888
5885
- enum SaturationMoveMode : enum8 {
5889
+ enum MoveModeEnum : enum8 {
5886
5890
kStop = 0;
5887
5891
kUp = 1;
5888
5892
kDown = 3;
5889
5893
}
5890
5894
5891
- enum SaturationStepMode : enum8 {
5895
+ enum StepModeEnum : enum8 {
5892
5896
kUp = 1;
5893
5897
kDown = 3;
5894
5898
}
5895
5899
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;
5909
5906
}
5910
5907
5911
5908
bitmap Feature : bitmap32 {
@@ -5916,16 +5913,27 @@ cluster ColorControl = 768 {
5916
5913
kColorTemperature = 0x10;
5917
5914
}
5918
5915
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
+
5919
5927
readonly attribute optional int8u currentHue = 0;
5920
5928
readonly attribute optional int8u currentSaturation = 1;
5921
5929
readonly attribute optional int16u remainingTime = 2;
5922
5930
readonly attribute optional int16u currentX = 3;
5923
5931
readonly attribute optional int16u currentY = 4;
5924
- readonly attribute optional enum8 driftCompensation = 5;
5932
+ readonly attribute optional DriftCompensationEnum driftCompensation = 5;
5925
5933
readonly attribute optional char_string<254> compensationText = 6;
5926
5934
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;
5929
5937
readonly attribute nullable int8u numberOfPrimaries = 16;
5930
5938
readonly attribute optional int16u primary1X = 17;
5931
5939
readonly attribute optional int16u primary1Y = 18;
@@ -5957,13 +5965,13 @@ cluster ColorControl = 768 {
5957
5965
attribute access(write: manage) optional int16u colorPointBY = 59;
5958
5966
attribute access(write: manage) optional nullable int8u colorPointBIntensity = 60;
5959
5967
readonly attribute optional int16u enhancedCurrentHue = 16384;
5960
- readonly attribute enum8 enhancedColorMode = 16385;
5968
+ readonly attribute EnhancedColorModeEnum enhancedColorMode = 16385;
5961
5969
readonly attribute optional int8u colorLoopActive = 16386;
5962
5970
readonly attribute optional int8u colorLoopDirection = 16387;
5963
5971
readonly attribute optional int16u colorLoopTime = 16388;
5964
5972
readonly attribute optional int16u colorLoopStartEnhancedHue = 16389;
5965
5973
readonly attribute optional int16u colorLoopStoredEnhancedHue = 16390;
5966
- readonly attribute bitmap16 colorCapabilities = 16394;
5974
+ readonly attribute ColorCapabilitiesBitmap colorCapabilities = 16394;
5967
5975
readonly attribute optional int16u colorTempPhysicalMinMireds = 16395;
5968
5976
readonly attribute optional int16u colorTempPhysicalMaxMireds = 16396;
5969
5977
readonly attribute optional int16u coupleColorTempToLevelMinMireds = 16397;
@@ -5977,150 +5985,150 @@ cluster ColorControl = 768 {
5977
5985
5978
5986
request struct MoveToHueRequest {
5979
5987
int8u hue = 0;
5980
- HueDirection direction = 1;
5988
+ DirectionEnum direction = 1;
5981
5989
int16u transitionTime = 2;
5982
- bitmap8 optionsMask = 3;
5983
- bitmap8 optionsOverride = 4;
5990
+ OptionsBitmap optionsMask = 3;
5991
+ OptionsBitmap optionsOverride = 4;
5984
5992
}
5985
5993
5986
5994
request struct MoveHueRequest {
5987
- HueMoveMode moveMode = 0;
5995
+ MoveModeEnum moveMode = 0;
5988
5996
int8u rate = 1;
5989
- bitmap8 optionsMask = 2;
5990
- bitmap8 optionsOverride = 3;
5997
+ OptionsBitmap optionsMask = 2;
5998
+ OptionsBitmap optionsOverride = 3;
5991
5999
}
5992
6000
5993
6001
request struct StepHueRequest {
5994
- HueStepMode stepMode = 0;
6002
+ StepModeEnum stepMode = 0;
5995
6003
int8u stepSize = 1;
5996
6004
int8u transitionTime = 2;
5997
- bitmap8 optionsMask = 3;
5998
- bitmap8 optionsOverride = 4;
6005
+ OptionsBitmap optionsMask = 3;
6006
+ OptionsBitmap optionsOverride = 4;
5999
6007
}
6000
6008
6001
6009
request struct MoveToSaturationRequest {
6002
6010
int8u saturation = 0;
6003
6011
int16u transitionTime = 1;
6004
- bitmap8 optionsMask = 2;
6005
- bitmap8 optionsOverride = 3;
6012
+ OptionsBitmap optionsMask = 2;
6013
+ OptionsBitmap optionsOverride = 3;
6006
6014
}
6007
6015
6008
6016
request struct MoveSaturationRequest {
6009
- SaturationMoveMode moveMode = 0;
6017
+ MoveModeEnum moveMode = 0;
6010
6018
int8u rate = 1;
6011
- bitmap8 optionsMask = 2;
6012
- bitmap8 optionsOverride = 3;
6019
+ OptionsBitmap optionsMask = 2;
6020
+ OptionsBitmap optionsOverride = 3;
6013
6021
}
6014
6022
6015
6023
request struct StepSaturationRequest {
6016
- SaturationStepMode stepMode = 0;
6024
+ StepModeEnum stepMode = 0;
6017
6025
int8u stepSize = 1;
6018
6026
int8u transitionTime = 2;
6019
- bitmap8 optionsMask = 3;
6020
- bitmap8 optionsOverride = 4;
6027
+ OptionsBitmap optionsMask = 3;
6028
+ OptionsBitmap optionsOverride = 4;
6021
6029
}
6022
6030
6023
6031
request struct MoveToHueAndSaturationRequest {
6024
6032
int8u hue = 0;
6025
6033
int8u saturation = 1;
6026
6034
int16u transitionTime = 2;
6027
- bitmap8 optionsMask = 3;
6028
- bitmap8 optionsOverride = 4;
6035
+ OptionsBitmap optionsMask = 3;
6036
+ OptionsBitmap optionsOverride = 4;
6029
6037
}
6030
6038
6031
6039
request struct MoveToColorRequest {
6032
6040
int16u colorX = 0;
6033
6041
int16u colorY = 1;
6034
6042
int16u transitionTime = 2;
6035
- bitmap8 optionsMask = 3;
6036
- bitmap8 optionsOverride = 4;
6043
+ OptionsBitmap optionsMask = 3;
6044
+ OptionsBitmap optionsOverride = 4;
6037
6045
}
6038
6046
6039
6047
request struct MoveColorRequest {
6040
6048
int16s rateX = 0;
6041
6049
int16s rateY = 1;
6042
- bitmap8 optionsMask = 2;
6043
- bitmap8 optionsOverride = 3;
6050
+ OptionsBitmap optionsMask = 2;
6051
+ OptionsBitmap optionsOverride = 3;
6044
6052
}
6045
6053
6046
6054
request struct StepColorRequest {
6047
6055
int16s stepX = 0;
6048
6056
int16s stepY = 1;
6049
6057
int16u transitionTime = 2;
6050
- bitmap8 optionsMask = 3;
6051
- bitmap8 optionsOverride = 4;
6058
+ OptionsBitmap optionsMask = 3;
6059
+ OptionsBitmap optionsOverride = 4;
6052
6060
}
6053
6061
6054
6062
request struct MoveToColorTemperatureRequest {
6055
6063
int16u colorTemperatureMireds = 0;
6056
6064
int16u transitionTime = 1;
6057
- bitmap8 optionsMask = 2;
6058
- bitmap8 optionsOverride = 3;
6065
+ OptionsBitmap optionsMask = 2;
6066
+ OptionsBitmap optionsOverride = 3;
6059
6067
}
6060
6068
6061
6069
request struct EnhancedMoveToHueRequest {
6062
6070
int16u enhancedHue = 0;
6063
- HueDirection direction = 1;
6071
+ DirectionEnum direction = 1;
6064
6072
int16u transitionTime = 2;
6065
- bitmap8 optionsMask = 3;
6066
- bitmap8 optionsOverride = 4;
6073
+ OptionsBitmap optionsMask = 3;
6074
+ OptionsBitmap optionsOverride = 4;
6067
6075
}
6068
6076
6069
6077
request struct EnhancedMoveHueRequest {
6070
- HueMoveMode moveMode = 0;
6078
+ MoveModeEnum moveMode = 0;
6071
6079
int16u rate = 1;
6072
- bitmap8 optionsMask = 2;
6073
- bitmap8 optionsOverride = 3;
6080
+ OptionsBitmap optionsMask = 2;
6081
+ OptionsBitmap optionsOverride = 3;
6074
6082
}
6075
6083
6076
6084
request struct EnhancedStepHueRequest {
6077
- HueStepMode stepMode = 0;
6085
+ StepModeEnum stepMode = 0;
6078
6086
int16u stepSize = 1;
6079
6087
int16u transitionTime = 2;
6080
- bitmap8 optionsMask = 3;
6081
- bitmap8 optionsOverride = 4;
6088
+ OptionsBitmap optionsMask = 3;
6089
+ OptionsBitmap optionsOverride = 4;
6082
6090
}
6083
6091
6084
6092
request struct EnhancedMoveToHueAndSaturationRequest {
6085
6093
int16u enhancedHue = 0;
6086
6094
int8u saturation = 1;
6087
6095
int16u transitionTime = 2;
6088
- bitmap8 optionsMask = 3;
6089
- bitmap8 optionsOverride = 4;
6096
+ OptionsBitmap optionsMask = 3;
6097
+ OptionsBitmap optionsOverride = 4;
6090
6098
}
6091
6099
6092
6100
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;
6096
6104
int16u time = 3;
6097
6105
int16u startHue = 4;
6098
- bitmap8 optionsMask = 5;
6099
- bitmap8 optionsOverride = 6;
6106
+ OptionsBitmap optionsMask = 5;
6107
+ OptionsBitmap optionsOverride = 6;
6100
6108
}
6101
6109
6102
6110
request struct StopMoveStepRequest {
6103
- bitmap8 optionsMask = 0;
6104
- bitmap8 optionsOverride = 1;
6111
+ OptionsBitmap optionsMask = 0;
6112
+ OptionsBitmap optionsOverride = 1;
6105
6113
}
6106
6114
6107
6115
request struct MoveColorTemperatureRequest {
6108
- HueMoveMode moveMode = 0;
6116
+ MoveModeEnum moveMode = 0;
6109
6117
int16u rate = 1;
6110
6118
int16u colorTemperatureMinimumMireds = 2;
6111
6119
int16u colorTemperatureMaximumMireds = 3;
6112
- bitmap8 optionsMask = 4;
6113
- bitmap8 optionsOverride = 5;
6120
+ OptionsBitmap optionsMask = 4;
6121
+ OptionsBitmap optionsOverride = 5;
6114
6122
}
6115
6123
6116
6124
request struct StepColorTemperatureRequest {
6117
- HueStepMode stepMode = 0;
6125
+ StepModeEnum stepMode = 0;
6118
6126
int16u stepSize = 1;
6119
6127
int16u transitionTime = 2;
6120
6128
int16u colorTemperatureMinimumMireds = 3;
6121
6129
int16u colorTemperatureMaximumMireds = 4;
6122
- bitmap8 optionsMask = 5;
6123
- bitmap8 optionsOverride = 6;
6130
+ OptionsBitmap optionsMask = 5;
6131
+ OptionsBitmap optionsOverride = 6;
6124
6132
}
6125
6133
6126
6134
/** Move to specified hue. */
0 commit comments