Skip to content

Commit ebfa8d4

Browse files
committed
Addressed review comments
1 parent e4fac93 commit ebfa8d4

File tree

33 files changed

+1109
-1394
lines changed

33 files changed

+1109
-1394
lines changed

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

+38-49
Original file line numberDiff line numberDiff line change
@@ -5847,23 +5847,30 @@ 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;
58645864
kColorTemperature = 2;
58655865
}
58665866

5867+
enum DirectionEnum : enum8 {
5868+
kShortest = 0;
5869+
kLongest = 1;
5870+
kUp = 2;
5871+
kDown = 3;
5872+
}
5873+
58675874
enum DriftCompensationEnum : enum8 {
58685875
kNone = 0;
58695876
kOtherOrUnknown = 1;
@@ -5879,50 +5886,25 @@ cluster ColorControl = 768 {
58795886
kEnhancedCurrentHueAndCurrentSaturation = 3;
58805887
}
58815888

5882-
enum HueDirection : enum8 {
5883-
kShortestDistance = 0;
5884-
kLongestDistance = 1;
5885-
kUp = 2;
5886-
kDown = 3;
5887-
}
5888-
5889-
enum HueMoveMode : enum8 {
5890-
kStop = 0;
5891-
kUp = 1;
5892-
kDown = 3;
5893-
}
5894-
5895-
enum HueStepMode : enum8 {
5896-
kUp = 1;
5897-
kDown = 3;
5898-
}
5899-
5900-
enum SaturationMoveMode : enum8 {
5889+
enum MoveModeEnum : enum8 {
59015890
kStop = 0;
59025891
kUp = 1;
59035892
kDown = 3;
59045893
}
59055894

5906-
enum SaturationStepMode : enum8 {
5895+
enum StepModeEnum : enum8 {
59075896
kUp = 1;
59085897
kDown = 3;
59095898
}
59105899

5911-
bitmap ColorCapabilities : bitmap16 {
5900+
bitmap ColorCapabilitiesBitmap : bitmap16 {
59125901
kHueSaturationSupported = 0x1;
59135902
kEnhancedHueSupported = 0x2;
59145903
kColorLoopSupported = 0x4;
59155904
kXYAttributesSupported = 0x8;
59165905
kColorTemperatureSupported = 0x10;
59175906
}
59185907

5919-
bitmap ColorLoopUpdateFlags : bitmap8 {
5920-
kUpdateAction = 0x1;
5921-
kUpdateDirection = 0x2;
5922-
kUpdateTime = 0x4;
5923-
kUpdateStartHue = 0x8;
5924-
}
5925-
59265908
bitmap Feature : bitmap32 {
59275909
kHueAndSaturation = 0x1;
59285910
kEnhancedHue = 0x2;
@@ -5935,6 +5917,13 @@ cluster ColorControl = 768 {
59355917
kExecuteIfOff = 0x1;
59365918
}
59375919

5920+
bitmap UpdateFlagsBitmap : bitmap8 {
5921+
kUpdateAction = 0x1;
5922+
kUpdateDirection = 0x2;
5923+
kUpdateTime = 0x4;
5924+
kUpdateStartHue = 0x8;
5925+
}
5926+
59385927
readonly attribute optional int8u currentHue = 0;
59395928
readonly attribute optional int8u currentSaturation = 1;
59405929
readonly attribute optional int16u remainingTime = 2;
@@ -5943,7 +5932,7 @@ cluster ColorControl = 768 {
59435932
readonly attribute optional DriftCompensationEnum driftCompensation = 5;
59445933
readonly attribute optional char_string<254> compensationText = 6;
59455934
readonly attribute optional int16u colorTemperatureMireds = 7;
5946-
readonly attribute enum8 colorMode = 8;
5935+
readonly attribute ColorModeEnum colorMode = 8;
59475936
attribute OptionsBitmap options = 15;
59485937
readonly attribute nullable int8u numberOfPrimaries = 16;
59495938
readonly attribute optional int16u primary1X = 17;
@@ -5978,11 +5967,11 @@ cluster ColorControl = 768 {
59785967
readonly attribute optional int16u enhancedCurrentHue = 16384;
59795968
readonly attribute EnhancedColorModeEnum enhancedColorMode = 16385;
59805969
readonly attribute optional int8u colorLoopActive = 16386;
5981-
readonly attribute optional int8u colorLoopDirection = 16387;
5970+
readonly attribute optional ColorLoopDirectionEnum colorLoopDirection = 16387;
59825971
readonly attribute optional int16u colorLoopTime = 16388;
59835972
readonly attribute optional int16u colorLoopStartEnhancedHue = 16389;
59845973
readonly attribute optional int16u colorLoopStoredEnhancedHue = 16390;
5985-
readonly attribute bitmap16 colorCapabilities = 16394;
5974+
readonly attribute ColorCapabilitiesBitmap colorCapabilities = 16394;
59865975
readonly attribute optional int16u colorTempPhysicalMinMireds = 16395;
59875976
readonly attribute optional int16u colorTempPhysicalMaxMireds = 16396;
59885977
readonly attribute optional int16u coupleColorTempToLevelMinMireds = 16397;
@@ -5996,21 +5985,21 @@ cluster ColorControl = 768 {
59965985

59975986
request struct MoveToHueRequest {
59985987
int8u hue = 0;
5999-
HueDirection direction = 1;
5988+
DirectionEnum direction = 1;
60005989
int16u transitionTime = 2;
60015990
bitmap8 optionsMask = 3;
60025991
bitmap8 optionsOverride = 4;
60035992
}
60045993

60055994
request struct MoveHueRequest {
6006-
HueMoveMode moveMode = 0;
5995+
MoveModeEnum moveMode = 0;
60075996
int8u rate = 1;
60085997
bitmap8 optionsMask = 2;
60095998
bitmap8 optionsOverride = 3;
60105999
}
60116000

60126001
request struct StepHueRequest {
6013-
HueStepMode stepMode = 0;
6002+
StepModeEnum stepMode = 0;
60146003
int8u stepSize = 1;
60156004
int8u transitionTime = 2;
60166005
bitmap8 optionsMask = 3;
@@ -6025,14 +6014,14 @@ cluster ColorControl = 768 {
60256014
}
60266015

60276016
request struct MoveSaturationRequest {
6028-
SaturationMoveMode moveMode = 0;
6017+
MoveModeEnum moveMode = 0;
60296018
int8u rate = 1;
60306019
bitmap8 optionsMask = 2;
60316020
bitmap8 optionsOverride = 3;
60326021
}
60336022

60346023
request struct StepSaturationRequest {
6035-
SaturationStepMode stepMode = 0;
6024+
StepModeEnum stepMode = 0;
60366025
int8u stepSize = 1;
60376026
int8u transitionTime = 2;
60386027
bitmap8 optionsMask = 3;
@@ -6079,21 +6068,21 @@ cluster ColorControl = 768 {
60796068

60806069
request struct EnhancedMoveToHueRequest {
60816070
int16u enhancedHue = 0;
6082-
HueDirection direction = 1;
6071+
DirectionEnum direction = 1;
60836072
int16u transitionTime = 2;
60846073
bitmap8 optionsMask = 3;
60856074
bitmap8 optionsOverride = 4;
60866075
}
60876076

60886077
request struct EnhancedMoveHueRequest {
6089-
HueMoveMode moveMode = 0;
6078+
MoveModeEnum moveMode = 0;
60906079
int16u rate = 1;
60916080
bitmap8 optionsMask = 2;
60926081
bitmap8 optionsOverride = 3;
60936082
}
60946083

60956084
request struct EnhancedStepHueRequest {
6096-
HueStepMode stepMode = 0;
6085+
StepModeEnum stepMode = 0;
60976086
int16u stepSize = 1;
60986087
int16u transitionTime = 2;
60996088
bitmap8 optionsMask = 3;
@@ -6109,9 +6098,9 @@ cluster ColorControl = 768 {
61096098
}
61106099

61116100
request struct ColorLoopSetRequest {
6112-
ColorLoopUpdateFlags updateFlags = 0;
6113-
ColorLoopAction action = 1;
6114-
ColorLoopDirection direction = 2;
6101+
UpdateFlagsBitmap updateFlags = 0;
6102+
ColorLoopActionEnum action = 1;
6103+
ColorLoopDirectionEnum direction = 2;
61156104
int16u time = 3;
61166105
int16u startHue = 4;
61176106
bitmap8 optionsMask = 5;
@@ -6124,7 +6113,7 @@ cluster ColorControl = 768 {
61246113
}
61256114

61266115
request struct MoveColorTemperatureRequest {
6127-
HueMoveMode moveMode = 0;
6116+
MoveModeEnum moveMode = 0;
61286117
int16u rate = 1;
61296118
int16u colorTemperatureMinimumMireds = 2;
61306119
int16u colorTemperatureMaximumMireds = 3;
@@ -6133,7 +6122,7 @@ cluster ColorControl = 768 {
61336122
}
61346123

61356124
request struct StepColorTemperatureRequest {
6136-
HueStepMode stepMode = 0;
6125+
StepModeEnum stepMode = 0;
61376126
int16u stepSize = 1;
61386127
int16u transitionTime = 2;
61396128
int16u colorTemperatureMinimumMireds = 3;

0 commit comments

Comments
 (0)