Skip to content

Commit

Permalink
Colorcontrol xml file sync with specs (project-chip#33612)
Browse files Browse the repository at this point in the history 
* 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 <[email protected]>
  • Loading branch information
@Thirsrin @restyled-commits @PeterC1965
2 people authored and PeterC1965 committed Aug 28, 2024
1 parent 87241ce commit 01701ab
Show file tree
Hide file tree
Showing 41 changed files with 2,825 additions and 2,580 deletions.
182 changes: 95 additions & 87 deletions examples/all-clusters-app/all-clusters-common/all-clusters-app.matter
View file
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

0 comments on commit 01701ab

Please sign in to comment.