Skip to content

Commit

Permalink
Revert colorloopdirection type change
Browse files Browse the repository at this point in the history
  • Loading branch information
@Thirsrin
Thirsrin committed Jun 11, 2024
1 parent b24414b commit d59e2b6
Show file tree
Hide file tree
Showing 27 changed files with 46 additions and 52 deletions.
2 changes: 1 addition & 1 deletion 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 @@ -5541,7 +5541,7 @@ cluster ColorControl = 768 {
readonly attribute optional int16u enhancedCurrentHue = 16384;
readonly attribute EnhancedColorModeEnum enhancedColorMode = 16385;
readonly attribute optional int8u colorLoopActive = 16386;
readonly attribute optional ColorLoopDirectionEnum colorLoopDirection = 16387;
readonly attribute optional int8u colorLoopDirection = 16387;
readonly attribute optional int16u colorLoopTime = 16388;
readonly attribute optional int16u colorLoopStartEnhancedHue = 16389;
readonly attribute optional int16u colorLoopStoredEnhancedHue = 16390;
Expand Down
2 changes: 1 addition & 1 deletion examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4100,7 +4100,7 @@ cluster ColorControl = 768 {
readonly attribute optional int16u enhancedCurrentHue = 16384;
readonly attribute EnhancedColorModeEnum enhancedColorMode = 16385;
readonly attribute optional int8u colorLoopActive = 16386;
readonly attribute optional ColorLoopDirectionEnum colorLoopDirection = 16387;
readonly attribute optional int8u colorLoopDirection = 16387;
readonly attribute optional int16u colorLoopTime = 16388;
readonly attribute optional int16u colorLoopStartEnhancedHue = 16389;
readonly attribute optional int16u colorLoopStoredEnhancedHue = 16390;
Expand Down
2 changes: 1 addition & 1 deletion examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.matter
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1526,7 +1526,7 @@ cluster ColorControl = 768 {
readonly attribute optional int16u enhancedCurrentHue = 16384;
readonly attribute EnhancedColorModeEnum enhancedColorMode = 16385;
readonly attribute optional int8u colorLoopActive = 16386;
readonly attribute optional ColorLoopDirectionEnum colorLoopDirection = 16387;
readonly attribute optional int8u colorLoopDirection = 16387;
readonly attribute optional int16u colorLoopTime = 16388;
readonly attribute optional int16u colorLoopStartEnhancedHue = 16389;
readonly attribute optional int16u colorLoopStoredEnhancedHue = 16390;
Expand Down
2 changes: 1 addition & 1 deletion examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.matter
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1627,7 +1627,7 @@ cluster ColorControl = 768 {
readonly attribute optional int16u enhancedCurrentHue = 16384;
readonly attribute EnhancedColorModeEnum enhancedColorMode = 16385;
readonly attribute optional int8u colorLoopActive = 16386;
readonly attribute optional ColorLoopDirectionEnum colorLoopDirection = 16387;
readonly attribute optional int8u colorLoopDirection = 16387;
readonly attribute optional int16u colorLoopTime = 16388;
readonly attribute optional int16u colorLoopStartEnhancedHue = 16389;
readonly attribute optional int16u colorLoopStoredEnhancedHue = 16390;
Expand Down
2 changes: 1 addition & 1 deletion examples/light-switch-app/light-switch-common/light-switch-app.matter
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2296,7 +2296,7 @@ cluster ColorControl = 768 {
readonly attribute optional int16u enhancedCurrentHue = 16384;
readonly attribute EnhancedColorModeEnum enhancedColorMode = 16385;
readonly attribute optional int8u colorLoopActive = 16386;
readonly attribute optional ColorLoopDirectionEnum colorLoopDirection = 16387;
readonly attribute optional int8u colorLoopDirection = 16387;
readonly attribute optional int16u colorLoopTime = 16388;
readonly attribute optional int16u colorLoopStartEnhancedHue = 16389;
readonly attribute optional int16u colorLoopStoredEnhancedHue = 16390;
Expand Down
2 changes: 1 addition & 1 deletion examples/light-switch-app/qpg/zap/switch.matter
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2093,7 +2093,7 @@ cluster ColorControl = 768 {
readonly attribute optional int16u enhancedCurrentHue = 16384;
readonly attribute EnhancedColorModeEnum enhancedColorMode = 16385;
readonly attribute optional int8u colorLoopActive = 16386;
readonly attribute optional ColorLoopDirectionEnum colorLoopDirection = 16387;
readonly attribute optional int8u colorLoopDirection = 16387;
readonly attribute optional int16u colorLoopTime = 16388;
readonly attribute optional int16u colorLoopStartEnhancedHue = 16389;
readonly attribute optional int16u colorLoopStoredEnhancedHue = 16390;
Expand Down
2 changes: 1 addition & 1 deletion examples/lighting-app/bouffalolab/data_model/lighting-app-ethernet.matter
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1666,7 +1666,7 @@ cluster ColorControl = 768 {
readonly attribute optional int16u enhancedCurrentHue = 16384;
readonly attribute EnhancedColorModeEnum enhancedColorMode = 16385;
readonly attribute optional int8u colorLoopActive = 16386;
readonly attribute optional ColorLoopDirectionEnum colorLoopDirection = 16387;
readonly attribute optional int8u colorLoopDirection = 16387;
readonly attribute optional int16u colorLoopTime = 16388;
readonly attribute optional int16u colorLoopStartEnhancedHue = 16389;
readonly attribute optional int16u colorLoopStoredEnhancedHue = 16390;
Expand Down
2 changes: 1 addition & 1 deletion examples/lighting-app/bouffalolab/data_model/lighting-app-thread.matter
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1790,7 +1790,7 @@ cluster ColorControl = 768 {
readonly attribute optional int16u enhancedCurrentHue = 16384;
readonly attribute EnhancedColorModeEnum enhancedColorMode = 16385;
readonly attribute optional int8u colorLoopActive = 16386;
readonly attribute optional ColorLoopDirectionEnum colorLoopDirection = 16387;
readonly attribute optional int8u colorLoopDirection = 16387;
readonly attribute optional int16u colorLoopTime = 16388;
readonly attribute optional int16u colorLoopStartEnhancedHue = 16389;
readonly attribute optional int16u colorLoopStoredEnhancedHue = 16390;
Expand Down
2 changes: 1 addition & 1 deletion examples/lighting-app/bouffalolab/data_model/lighting-app-wifi.matter
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1701,7 +1701,7 @@ cluster ColorControl = 768 {
readonly attribute optional int16u enhancedCurrentHue = 16384;
readonly attribute EnhancedColorModeEnum enhancedColorMode = 16385;
readonly attribute optional int8u colorLoopActive = 16386;
readonly attribute optional ColorLoopDirectionEnum colorLoopDirection = 16387;
readonly attribute optional int8u colorLoopDirection = 16387;
readonly attribute optional int16u colorLoopTime = 16388;
readonly attribute optional int16u colorLoopStartEnhancedHue = 16389;
readonly attribute optional int16u colorLoopStoredEnhancedHue = 16390;
Expand Down
2 changes: 1 addition & 1 deletion examples/lighting-app/lighting-common/lighting-app.matter
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2113,7 +2113,7 @@ cluster ColorControl = 768 {
readonly attribute optional int16u enhancedCurrentHue = 16384;
readonly attribute EnhancedColorModeEnum enhancedColorMode = 16385;
readonly attribute optional int8u colorLoopActive = 16386;
readonly attribute optional ColorLoopDirectionEnum colorLoopDirection = 16387;
readonly attribute optional int8u colorLoopDirection = 16387;
readonly attribute optional int16u colorLoopTime = 16388;
readonly attribute optional int16u colorLoopStartEnhancedHue = 16389;
readonly attribute optional int16u colorLoopStoredEnhancedHue = 16390;
Expand Down
2 changes: 1 addition & 1 deletion examples/lighting-app/qpg/zap/light.matter
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1729,7 +1729,7 @@ cluster ColorControl = 768 {
readonly attribute optional int16u enhancedCurrentHue = 16384;
readonly attribute EnhancedColorModeEnum enhancedColorMode = 16385;
readonly attribute optional int8u colorLoopActive = 16386;
readonly attribute optional ColorLoopDirectionEnum colorLoopDirection = 16387;
readonly attribute optional int8u colorLoopDirection = 16387;
readonly attribute optional int16u colorLoopTime = 16388;
readonly attribute optional int16u colorLoopStartEnhancedHue = 16389;
readonly attribute optional int16u colorLoopStoredEnhancedHue = 16390;
Expand Down
2 changes: 1 addition & 1 deletion examples/lighting-app/silabs/data_model/lighting-thread-app.matter
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1818,7 +1818,7 @@ cluster ColorControl = 768 {
readonly attribute optional int16u enhancedCurrentHue = 16384;
readonly attribute EnhancedColorModeEnum enhancedColorMode = 16385;
readonly attribute optional int8u colorLoopActive = 16386;
readonly attribute optional ColorLoopDirectionEnum colorLoopDirection = 16387;
readonly attribute optional int8u colorLoopDirection = 16387;
readonly attribute optional int16u colorLoopTime = 16388;
readonly attribute optional int16u colorLoopStartEnhancedHue = 16389;
readonly attribute optional int16u colorLoopStoredEnhancedHue = 16390;
Expand Down
2 changes: 1 addition & 1 deletion examples/lighting-app/silabs/data_model/lighting-wifi-app.matter
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2109,7 +2109,7 @@ cluster ColorControl = 768 {
readonly attribute optional int16u enhancedCurrentHue = 16384;
readonly attribute EnhancedColorModeEnum enhancedColorMode = 16385;
readonly attribute optional int8u colorLoopActive = 16386;
readonly attribute optional ColorLoopDirectionEnum colorLoopDirection = 16387;
readonly attribute optional int8u colorLoopDirection = 16387;
readonly attribute optional int16u colorLoopTime = 16388;
readonly attribute optional int16u colorLoopStartEnhancedHue = 16389;
readonly attribute optional int16u colorLoopStoredEnhancedHue = 16390;
Expand Down
4 changes: 2 additions & 2 deletions examples/placeholder/linux/apps/app1/config.matter
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5668,7 +5668,7 @@ cluster ColorControl = 768 {
readonly attribute optional int16u enhancedCurrentHue = 16384;
readonly attribute EnhancedColorModeEnum enhancedColorMode = 16385;
readonly attribute optional int8u colorLoopActive = 16386;
readonly attribute optional ColorLoopDirectionEnum colorLoopDirection = 16387;
readonly attribute optional int8u colorLoopDirection = 16387;
readonly attribute optional int16u colorLoopTime = 16388;
readonly attribute optional int16u colorLoopStartEnhancedHue = 16389;
readonly attribute optional int16u colorLoopStoredEnhancedHue = 16390;
Expand Down Expand Up @@ -5996,7 +5996,7 @@ cluster ColorControl = 768 {
readonly attribute optional int16u enhancedCurrentHue = 16384;
readonly attribute EnhancedColorModeEnum enhancedColorMode = 16385;
readonly attribute optional int8u colorLoopActive = 16386;
readonly attribute optional ColorLoopDirectionEnum colorLoopDirection = 16387;
readonly attribute optional int8u colorLoopDirection = 16387;
readonly attribute optional int16u colorLoopTime = 16388;
readonly attribute optional int16u colorLoopStartEnhancedHue = 16389;
readonly attribute optional int16u colorLoopStoredEnhancedHue = 16390;
Expand Down
4 changes: 2 additions & 2 deletions examples/placeholder/linux/apps/app2/config.matter
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5625,7 +5625,7 @@ cluster ColorControl = 768 {
readonly attribute optional int16u enhancedCurrentHue = 16384;
readonly attribute EnhancedColorModeEnum enhancedColorMode = 16385;
readonly attribute optional int8u colorLoopActive = 16386;
readonly attribute optional ColorLoopDirectionEnum colorLoopDirection = 16387;
readonly attribute optional int8u colorLoopDirection = 16387;
readonly attribute optional int16u colorLoopTime = 16388;
readonly attribute optional int16u colorLoopStartEnhancedHue = 16389;
readonly attribute optional int16u colorLoopStoredEnhancedHue = 16390;
Expand Down Expand Up @@ -5953,7 +5953,7 @@ cluster ColorControl = 768 {
readonly attribute optional int16u enhancedCurrentHue = 16384;
readonly attribute EnhancedColorModeEnum enhancedColorMode = 16385;
readonly attribute optional int8u colorLoopActive = 16386;
readonly attribute optional ColorLoopDirectionEnum colorLoopDirection = 16387;
readonly attribute optional int8u colorLoopDirection = 16387;
readonly attribute optional int16u colorLoopTime = 16388;
readonly attribute optional int16u colorLoopStartEnhancedHue = 16389;
readonly attribute optional int16u colorLoopStoredEnhancedHue = 16390;
Expand Down
2 changes: 1 addition & 1 deletion examples/virtual-device-app/virtual-device-common/virtual-device-app.matter
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2965,7 +2965,7 @@ cluster ColorControl = 768 {
readonly attribute optional int16u enhancedCurrentHue = 16384;
readonly attribute EnhancedColorModeEnum enhancedColorMode = 16385;
readonly attribute optional int8u colorLoopActive = 16386;
readonly attribute optional ColorLoopDirectionEnum colorLoopDirection = 16387;
readonly attribute optional int8u colorLoopDirection = 16387;
readonly attribute optional int16u colorLoopTime = 16388;
readonly attribute optional int16u colorLoopStartEnhancedHue = 16389;
readonly attribute optional int16u colorLoopStoredEnhancedHue = 16390;
Expand Down
2 changes: 1 addition & 1 deletion scripts/tools/zap/tests/outputs/all-clusters-app/app-templates/endpoint_config.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1107,7 +1107,7 @@
{ ZAP_SIMPLE_DEFAULT(0x0000), 0x00004000, 2, ZAP_TYPE(INT16U), 0 }, /* EnhancedCurrentHue */ \
{ ZAP_SIMPLE_DEFAULT(0x01), 0x00004001, 1, ZAP_TYPE(ENUM8), 0 }, /* EnhancedColorMode */ \
{ ZAP_SIMPLE_DEFAULT(0x00), 0x00004002, 1, ZAP_TYPE(INT8U), 0 }, /* ColorLoopActive */ \
{ ZAP_SIMPLE_DEFAULT(0x00), 0x00004003, 1, ZAP_TYPE(ENUM8), 0 }, /* ColorLoopDirection */ \
{ ZAP_SIMPLE_DEFAULT(0x00), 0x00004003, 1, ZAP_TYPE(INT8U), 0 }, /* ColorLoopDirection */ \
{ ZAP_SIMPLE_DEFAULT(0x0019), 0x00004004, 2, ZAP_TYPE(INT16U), 0 }, /* ColorLoopTime */ \
{ ZAP_SIMPLE_DEFAULT(0x2300), 0x00004005, 2, ZAP_TYPE(INT16U), 0 }, /* ColorLoopStartEnhancedHue */ \
{ ZAP_SIMPLE_DEFAULT(0x0000), 0x00004006, 2, ZAP_TYPE(INT16U), 0 }, /* ColorLoopStoredEnhancedHue */ \
Expand Down
2 changes: 1 addition & 1 deletion scripts/tools/zap/tests/outputs/lighting-app/app-templates/endpoint_config.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -500,7 +500,7 @@
{ ZAP_SIMPLE_DEFAULT(0x0000), 0x00004000, 2, ZAP_TYPE(INT16U), 0 }, /* EnhancedCurrentHue */ \
{ ZAP_SIMPLE_DEFAULT(0x01), 0x00004001, 1, ZAP_TYPE(ENUM8), 0 }, /* EnhancedColorMode */ \
{ ZAP_SIMPLE_DEFAULT(0x00), 0x00004002, 1, ZAP_TYPE(INT8U), 0 }, /* ColorLoopActive */ \
{ ZAP_SIMPLE_DEFAULT(0x00), 0x00004003, 1, ZAP_TYPE(ENUM8), 0 }, /* ColorLoopDirection */ \
{ ZAP_SIMPLE_DEFAULT(0x00), 0x00004003, 1, ZAP_TYPE(INT8U), 0 }, /* ColorLoopDirection */ \
{ ZAP_SIMPLE_DEFAULT(0x0019), 0x00004004, 2, ZAP_TYPE(INT16U), 0 }, /* ColorLoopTime */ \
{ ZAP_SIMPLE_DEFAULT(0x2300), 0x00004005, 2, ZAP_TYPE(INT16U), 0 }, /* ColorLoopStartEnhancedHue */ \
{ ZAP_SIMPLE_DEFAULT(0x0000), 0x00004006, 2, ZAP_TYPE(INT16U), 0 }, /* ColorLoopStoredEnhancedHue */ \
Expand Down
2 changes: 1 addition & 1 deletion src/app/zap-templates/zcl/data-model/chip/color-control-cluster.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -379,7 +379,7 @@ limitations under the License.
<attribute side="server" code="0x4000" define="COLOR_CONTROL_ENHANCED_CURRENT_HUE" type="int16u" min="0x0000" max="0xFFFF" writable="false" default="0x0000" optional="true">EnhancedCurrentHue</attribute>
<attribute side="server" code="0x4001" define="COLOR_CONTROL_ENHANCED_COLOR_MODE" type="EnhancedColorModeEnum" min="0x00" max="0xFF" writable="false" default="0x01">EnhancedColorMode</attribute>
<attribute side="server" code="0x4002" define="COLOR_CONTROL_COLOR_LOOP_ACTIVE" type="int8u" min="0x00" max="0xFF" writable="false" default="0x00" optional="true">ColorLoopActive</attribute>
<attribute side="server" code="0x4003" define="COLOR_CONTROL_COLOR_LOOP_DIRECTION" type="ColorLoopDirectionEnum" min="0x00" max="0xFF" writable="false" default="0x00" optional="true">ColorLoopDirection</attribute>
<attribute side="server" code="0x4003" define="COLOR_CONTROL_COLOR_LOOP_DIRECTION" type="int8u" min="0x00" max="0xFF" writable="false" default="0x00" optional="true">ColorLoopDirection</attribute>
<attribute side="server" code="0x4004" define="COLOR_CONTROL_COLOR_LOOP_TIME" type="int16u" min="0x0000" max="0xFFFF" writable="false" default="0x0019" optional="true">ColorLoopTime</attribute>
<attribute side="server" code="0x4005" define="COLOR_CONTROL_COLOR_LOOP_START_ENHANCED_HUE" type="int16u" min="0x0000" max="0xFFFF" writable="false" default="0x2300" optional="true">ColorLoopStartEnhancedHue</attribute>
<attribute side="server" code="0x4006" define="COLOR_CONTROL_COLOR_LOOP_STORED_ENHANCED_HUE" type="int16u" min="0x0000" max="0xFFFF" writable="false" default="0x0000" optional="true">ColorLoopStoredEnhancedHue</attribute>
Expand Down
2 changes: 1 addition & 1 deletion src/controller/data_model/controller-clusters.matter
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6717,7 +6717,7 @@ cluster ColorControl = 768 {
readonly attribute optional int16u enhancedCurrentHue = 16384;
readonly attribute EnhancedColorModeEnum enhancedColorMode = 16385;
readonly attribute optional int8u colorLoopActive = 16386;
readonly attribute optional ColorLoopDirectionEnum colorLoopDirection = 16387;
readonly attribute optional int8u colorLoopDirection = 16387;
readonly attribute optional int16u colorLoopTime = 16388;
readonly attribute optional int16u colorLoopStartEnhancedHue = 16389;
readonly attribute optional int16u colorLoopStoredEnhancedHue = 16390;
Expand Down
8 changes: 4 additions & 4 deletions src/controller/python/chip/clusters/Objects.py
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/darwin/Framework/CHIP/zap-generated/MTRAttributeTLVValueDecoder.mm
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit d59e2b6

Please sign in to comment.