Skip to content

Commit d59e2b6

Browse files
ThirsrinThirsrin
committed
Revert colorloopdirection type change
1 parent b24414b commit d59e2b6

File tree

27 files changed

+46
-52
lines changed

27 files changed

+46
-52
lines changed

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -5541,7 +5541,7 @@ cluster ColorControl = 768 {
55415541
readonly attribute optional int16u enhancedCurrentHue = 16384;
55425542
readonly attribute EnhancedColorModeEnum enhancedColorMode = 16385;
55435543
readonly attribute optional int8u colorLoopActive = 16386;
5544-
readonly attribute optional ColorLoopDirectionEnum colorLoopDirection = 16387;
5544+
readonly attribute optional int8u colorLoopDirection = 16387;
55455545
readonly attribute optional int16u colorLoopTime = 16388;
55465546
readonly attribute optional int16u colorLoopStartEnhancedHue = 16389;
55475547
readonly attribute optional int16u colorLoopStoredEnhancedHue = 16390;

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -4100,7 +4100,7 @@ cluster ColorControl = 768 {
41004100
readonly attribute optional int16u enhancedCurrentHue = 16384;
41014101
readonly attribute EnhancedColorModeEnum enhancedColorMode = 16385;
41024102
readonly attribute optional int8u colorLoopActive = 16386;
4103-
readonly attribute optional ColorLoopDirectionEnum colorLoopDirection = 16387;
4103+
readonly attribute optional int8u colorLoopDirection = 16387;
41044104
readonly attribute optional int16u colorLoopTime = 16388;
41054105
readonly attribute optional int16u colorLoopStartEnhancedHue = 16389;
41064106
readonly attribute optional int16u colorLoopStoredEnhancedHue = 16390;

‎examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.matter

+1-1
Original file line numberDiff line numberDiff line change
@@ -1526,7 +1526,7 @@ cluster ColorControl = 768 {
15261526
readonly attribute optional int16u enhancedCurrentHue = 16384;
15271527
readonly attribute EnhancedColorModeEnum enhancedColorMode = 16385;
15281528
readonly attribute optional int8u colorLoopActive = 16386;
1529-
readonly attribute optional ColorLoopDirectionEnum colorLoopDirection = 16387;
1529+
readonly attribute optional int8u colorLoopDirection = 16387;
15301530
readonly attribute optional int16u colorLoopTime = 16388;
15311531
readonly attribute optional int16u colorLoopStartEnhancedHue = 16389;
15321532
readonly attribute optional int16u colorLoopStoredEnhancedHue = 16390;

‎examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.matter

+1-1
Original file line numberDiff line numberDiff line change
@@ -1627,7 +1627,7 @@ cluster ColorControl = 768 {
16271627
readonly attribute optional int16u enhancedCurrentHue = 16384;
16281628
readonly attribute EnhancedColorModeEnum enhancedColorMode = 16385;
16291629
readonly attribute optional int8u colorLoopActive = 16386;
1630-
readonly attribute optional ColorLoopDirectionEnum colorLoopDirection = 16387;
1630+
readonly attribute optional int8u colorLoopDirection = 16387;
16311631
readonly attribute optional int16u colorLoopTime = 16388;
16321632
readonly attribute optional int16u colorLoopStartEnhancedHue = 16389;
16331633
readonly attribute optional int16u colorLoopStoredEnhancedHue = 16390;

‎examples/light-switch-app/light-switch-common/light-switch-app.matter

+1-1
Original file line numberDiff line numberDiff line change
@@ -2296,7 +2296,7 @@ cluster ColorControl = 768 {
22962296
readonly attribute optional int16u enhancedCurrentHue = 16384;
22972297
readonly attribute EnhancedColorModeEnum enhancedColorMode = 16385;
22982298
readonly attribute optional int8u colorLoopActive = 16386;
2299-
readonly attribute optional ColorLoopDirectionEnum colorLoopDirection = 16387;
2299+
readonly attribute optional int8u colorLoopDirection = 16387;
23002300
readonly attribute optional int16u colorLoopTime = 16388;
23012301
readonly attribute optional int16u colorLoopStartEnhancedHue = 16389;
23022302
readonly attribute optional int16u colorLoopStoredEnhancedHue = 16390;

‎examples/light-switch-app/qpg/zap/switch.matter

+1-1
Original file line numberDiff line numberDiff line change
@@ -2093,7 +2093,7 @@ cluster ColorControl = 768 {
20932093
readonly attribute optional int16u enhancedCurrentHue = 16384;
20942094
readonly attribute EnhancedColorModeEnum enhancedColorMode = 16385;
20952095
readonly attribute optional int8u colorLoopActive = 16386;
2096-
readonly attribute optional ColorLoopDirectionEnum colorLoopDirection = 16387;
2096+
readonly attribute optional int8u colorLoopDirection = 16387;
20972097
readonly attribute optional int16u colorLoopTime = 16388;
20982098
readonly attribute optional int16u colorLoopStartEnhancedHue = 16389;
20992099
readonly attribute optional int16u colorLoopStoredEnhancedHue = 16390;

‎examples/lighting-app/bouffalolab/data_model/lighting-app-ethernet.matter

+1-1
Original file line numberDiff line numberDiff line change
@@ -1666,7 +1666,7 @@ cluster ColorControl = 768 {
16661666
readonly attribute optional int16u enhancedCurrentHue = 16384;
16671667
readonly attribute EnhancedColorModeEnum enhancedColorMode = 16385;
16681668
readonly attribute optional int8u colorLoopActive = 16386;
1669-
readonly attribute optional ColorLoopDirectionEnum colorLoopDirection = 16387;
1669+
readonly attribute optional int8u colorLoopDirection = 16387;
16701670
readonly attribute optional int16u colorLoopTime = 16388;
16711671
readonly attribute optional int16u colorLoopStartEnhancedHue = 16389;
16721672
readonly attribute optional int16u colorLoopStoredEnhancedHue = 16390;

‎examples/lighting-app/bouffalolab/data_model/lighting-app-thread.matter

+1-1
Original file line numberDiff line numberDiff line change
@@ -1790,7 +1790,7 @@ cluster ColorControl = 768 {
17901790
readonly attribute optional int16u enhancedCurrentHue = 16384;
17911791
readonly attribute EnhancedColorModeEnum enhancedColorMode = 16385;
17921792
readonly attribute optional int8u colorLoopActive = 16386;
1793-
readonly attribute optional ColorLoopDirectionEnum colorLoopDirection = 16387;
1793+
readonly attribute optional int8u colorLoopDirection = 16387;
17941794
readonly attribute optional int16u colorLoopTime = 16388;
17951795
readonly attribute optional int16u colorLoopStartEnhancedHue = 16389;
17961796
readonly attribute optional int16u colorLoopStoredEnhancedHue = 16390;

‎examples/lighting-app/bouffalolab/data_model/lighting-app-wifi.matter

+1-1
Original file line numberDiff line numberDiff line change
@@ -1701,7 +1701,7 @@ cluster ColorControl = 768 {
17011701
readonly attribute optional int16u enhancedCurrentHue = 16384;
17021702
readonly attribute EnhancedColorModeEnum enhancedColorMode = 16385;
17031703
readonly attribute optional int8u colorLoopActive = 16386;
1704-
readonly attribute optional ColorLoopDirectionEnum colorLoopDirection = 16387;
1704+
readonly attribute optional int8u colorLoopDirection = 16387;
17051705
readonly attribute optional int16u colorLoopTime = 16388;
17061706
readonly attribute optional int16u colorLoopStartEnhancedHue = 16389;
17071707
readonly attribute optional int16u colorLoopStoredEnhancedHue = 16390;

‎examples/lighting-app/lighting-common/lighting-app.matter

+1-1
Original file line numberDiff line numberDiff line change
@@ -2113,7 +2113,7 @@ cluster ColorControl = 768 {
21132113
readonly attribute optional int16u enhancedCurrentHue = 16384;
21142114
readonly attribute EnhancedColorModeEnum enhancedColorMode = 16385;
21152115
readonly attribute optional int8u colorLoopActive = 16386;
2116-
readonly attribute optional ColorLoopDirectionEnum colorLoopDirection = 16387;
2116+
readonly attribute optional int8u colorLoopDirection = 16387;
21172117
readonly attribute optional int16u colorLoopTime = 16388;
21182118
readonly attribute optional int16u colorLoopStartEnhancedHue = 16389;
21192119
readonly attribute optional int16u colorLoopStoredEnhancedHue = 16390;

‎examples/lighting-app/qpg/zap/light.matter

+1-1
Original file line numberDiff line numberDiff line change
@@ -1729,7 +1729,7 @@ cluster ColorControl = 768 {
17291729
readonly attribute optional int16u enhancedCurrentHue = 16384;
17301730
readonly attribute EnhancedColorModeEnum enhancedColorMode = 16385;
17311731
readonly attribute optional int8u colorLoopActive = 16386;
1732-
readonly attribute optional ColorLoopDirectionEnum colorLoopDirection = 16387;
1732+
readonly attribute optional int8u colorLoopDirection = 16387;
17331733
readonly attribute optional int16u colorLoopTime = 16388;
17341734
readonly attribute optional int16u colorLoopStartEnhancedHue = 16389;
17351735
readonly attribute optional int16u colorLoopStoredEnhancedHue = 16390;

‎examples/lighting-app/silabs/data_model/lighting-thread-app.matter

+1-1
Original file line numberDiff line numberDiff line change
@@ -1818,7 +1818,7 @@ cluster ColorControl = 768 {
18181818
readonly attribute optional int16u enhancedCurrentHue = 16384;
18191819
readonly attribute EnhancedColorModeEnum enhancedColorMode = 16385;
18201820
readonly attribute optional int8u colorLoopActive = 16386;
1821-
readonly attribute optional ColorLoopDirectionEnum colorLoopDirection = 16387;
1821+
readonly attribute optional int8u colorLoopDirection = 16387;
18221822
readonly attribute optional int16u colorLoopTime = 16388;
18231823
readonly attribute optional int16u colorLoopStartEnhancedHue = 16389;
18241824
readonly attribute optional int16u colorLoopStoredEnhancedHue = 16390;

‎examples/lighting-app/silabs/data_model/lighting-wifi-app.matter

+1-1
Original file line numberDiff line numberDiff line change
@@ -2109,7 +2109,7 @@ cluster ColorControl = 768 {
21092109
readonly attribute optional int16u enhancedCurrentHue = 16384;
21102110
readonly attribute EnhancedColorModeEnum enhancedColorMode = 16385;
21112111
readonly attribute optional int8u colorLoopActive = 16386;
2112-
readonly attribute optional ColorLoopDirectionEnum colorLoopDirection = 16387;
2112+
readonly attribute optional int8u colorLoopDirection = 16387;
21132113
readonly attribute optional int16u colorLoopTime = 16388;
21142114
readonly attribute optional int16u colorLoopStartEnhancedHue = 16389;
21152115
readonly attribute optional int16u colorLoopStoredEnhancedHue = 16390;

‎examples/placeholder/linux/apps/app1/config.matter

+2-2
Original file line numberDiff line numberDiff line change
@@ -5668,7 +5668,7 @@ cluster ColorControl = 768 {
56685668
readonly attribute optional int16u enhancedCurrentHue = 16384;
56695669
readonly attribute EnhancedColorModeEnum enhancedColorMode = 16385;
56705670
readonly attribute optional int8u colorLoopActive = 16386;
5671-
readonly attribute optional ColorLoopDirectionEnum colorLoopDirection = 16387;
5671+
readonly attribute optional int8u colorLoopDirection = 16387;
56725672
readonly attribute optional int16u colorLoopTime = 16388;
56735673
readonly attribute optional int16u colorLoopStartEnhancedHue = 16389;
56745674
readonly attribute optional int16u colorLoopStoredEnhancedHue = 16390;
@@ -5996,7 +5996,7 @@ cluster ColorControl = 768 {
59965996
readonly attribute optional int16u enhancedCurrentHue = 16384;
59975997
readonly attribute EnhancedColorModeEnum enhancedColorMode = 16385;
59985998
readonly attribute optional int8u colorLoopActive = 16386;
5999-
readonly attribute optional ColorLoopDirectionEnum colorLoopDirection = 16387;
5999+
readonly attribute optional int8u colorLoopDirection = 16387;
60006000
readonly attribute optional int16u colorLoopTime = 16388;
60016001
readonly attribute optional int16u colorLoopStartEnhancedHue = 16389;
60026002
readonly attribute optional int16u colorLoopStoredEnhancedHue = 16390;

‎examples/placeholder/linux/apps/app2/config.matter

+2-2
Original file line numberDiff line numberDiff line change
@@ -5625,7 +5625,7 @@ cluster ColorControl = 768 {
56255625
readonly attribute optional int16u enhancedCurrentHue = 16384;
56265626
readonly attribute EnhancedColorModeEnum enhancedColorMode = 16385;
56275627
readonly attribute optional int8u colorLoopActive = 16386;
5628-
readonly attribute optional ColorLoopDirectionEnum colorLoopDirection = 16387;
5628+
readonly attribute optional int8u colorLoopDirection = 16387;
56295629
readonly attribute optional int16u colorLoopTime = 16388;
56305630
readonly attribute optional int16u colorLoopStartEnhancedHue = 16389;
56315631
readonly attribute optional int16u colorLoopStoredEnhancedHue = 16390;
@@ -5953,7 +5953,7 @@ cluster ColorControl = 768 {
59535953
readonly attribute optional int16u enhancedCurrentHue = 16384;
59545954
readonly attribute EnhancedColorModeEnum enhancedColorMode = 16385;
59555955
readonly attribute optional int8u colorLoopActive = 16386;
5956-
readonly attribute optional ColorLoopDirectionEnum colorLoopDirection = 16387;
5956+
readonly attribute optional int8u colorLoopDirection = 16387;
59575957
readonly attribute optional int16u colorLoopTime = 16388;
59585958
readonly attribute optional int16u colorLoopStartEnhancedHue = 16389;
59595959
readonly attribute optional int16u colorLoopStoredEnhancedHue = 16390;

‎examples/virtual-device-app/virtual-device-common/virtual-device-app.matter

+1-1
Original file line numberDiff line numberDiff line change
@@ -2965,7 +2965,7 @@ cluster ColorControl = 768 {
29652965
readonly attribute optional int16u enhancedCurrentHue = 16384;
29662966
readonly attribute EnhancedColorModeEnum enhancedColorMode = 16385;
29672967
readonly attribute optional int8u colorLoopActive = 16386;
2968-
readonly attribute optional ColorLoopDirectionEnum colorLoopDirection = 16387;
2968+
readonly attribute optional int8u colorLoopDirection = 16387;
29692969
readonly attribute optional int16u colorLoopTime = 16388;
29702970
readonly attribute optional int16u colorLoopStartEnhancedHue = 16389;
29712971
readonly attribute optional int16u colorLoopStoredEnhancedHue = 16390;

‎scripts/tools/zap/tests/outputs/all-clusters-app/app-templates/endpoint_config.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1107,7 +1107,7 @@
11071107
{ ZAP_SIMPLE_DEFAULT(0x0000), 0x00004000, 2, ZAP_TYPE(INT16U), 0 }, /* EnhancedCurrentHue */ \
11081108
{ ZAP_SIMPLE_DEFAULT(0x01), 0x00004001, 1, ZAP_TYPE(ENUM8), 0 }, /* EnhancedColorMode */ \
11091109
{ ZAP_SIMPLE_DEFAULT(0x00), 0x00004002, 1, ZAP_TYPE(INT8U), 0 }, /* ColorLoopActive */ \
1110-
{ ZAP_SIMPLE_DEFAULT(0x00), 0x00004003, 1, ZAP_TYPE(ENUM8), 0 }, /* ColorLoopDirection */ \
1110+
{ ZAP_SIMPLE_DEFAULT(0x00), 0x00004003, 1, ZAP_TYPE(INT8U), 0 }, /* ColorLoopDirection */ \
11111111
{ ZAP_SIMPLE_DEFAULT(0x0019), 0x00004004, 2, ZAP_TYPE(INT16U), 0 }, /* ColorLoopTime */ \
11121112
{ ZAP_SIMPLE_DEFAULT(0x2300), 0x00004005, 2, ZAP_TYPE(INT16U), 0 }, /* ColorLoopStartEnhancedHue */ \
11131113
{ ZAP_SIMPLE_DEFAULT(0x0000), 0x00004006, 2, ZAP_TYPE(INT16U), 0 }, /* ColorLoopStoredEnhancedHue */ \

‎scripts/tools/zap/tests/outputs/lighting-app/app-templates/endpoint_config.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -500,7 +500,7 @@
500500
{ ZAP_SIMPLE_DEFAULT(0x0000), 0x00004000, 2, ZAP_TYPE(INT16U), 0 }, /* EnhancedCurrentHue */ \
501501
{ ZAP_SIMPLE_DEFAULT(0x01), 0x00004001, 1, ZAP_TYPE(ENUM8), 0 }, /* EnhancedColorMode */ \
502502
{ ZAP_SIMPLE_DEFAULT(0x00), 0x00004002, 1, ZAP_TYPE(INT8U), 0 }, /* ColorLoopActive */ \
503-
{ ZAP_SIMPLE_DEFAULT(0x00), 0x00004003, 1, ZAP_TYPE(ENUM8), 0 }, /* ColorLoopDirection */ \
503+
{ ZAP_SIMPLE_DEFAULT(0x00), 0x00004003, 1, ZAP_TYPE(INT8U), 0 }, /* ColorLoopDirection */ \
504504
{ ZAP_SIMPLE_DEFAULT(0x0019), 0x00004004, 2, ZAP_TYPE(INT16U), 0 }, /* ColorLoopTime */ \
505505
{ ZAP_SIMPLE_DEFAULT(0x2300), 0x00004005, 2, ZAP_TYPE(INT16U), 0 }, /* ColorLoopStartEnhancedHue */ \
506506
{ ZAP_SIMPLE_DEFAULT(0x0000), 0x00004006, 2, ZAP_TYPE(INT16U), 0 }, /* ColorLoopStoredEnhancedHue */ \

‎src/app/zap-templates/zcl/data-model/chip/color-control-cluster.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -379,7 +379,7 @@ limitations under the License.
379379
<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>
380380
<attribute side="server" code="0x4001" define="COLOR_CONTROL_ENHANCED_COLOR_MODE" type="EnhancedColorModeEnum" min="0x00" max="0xFF" writable="false" default="0x01">EnhancedColorMode</attribute>
381381
<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>
382-
<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>
382+
<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>
383383
<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>
384384
<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>
385385
<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>

‎src/controller/data_model/controller-clusters.matter

+1-1
Original file line numberDiff line numberDiff line change
@@ -6717,7 +6717,7 @@ cluster ColorControl = 768 {
67176717
readonly attribute optional int16u enhancedCurrentHue = 16384;
67186718
readonly attribute EnhancedColorModeEnum enhancedColorMode = 16385;
67196719
readonly attribute optional int8u colorLoopActive = 16386;
6720-
readonly attribute optional ColorLoopDirectionEnum colorLoopDirection = 16387;
6720+
readonly attribute optional int8u colorLoopDirection = 16387;
67216721
readonly attribute optional int16u colorLoopTime = 16388;
67226722
readonly attribute optional int16u colorLoopStartEnhancedHue = 16389;
67236723
readonly attribute optional int16u colorLoopStoredEnhancedHue = 16390;

‎src/controller/python/chip/clusters/Objects.py

+4-4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/darwin/Framework/CHIP/zap-generated/MTRAttributeTLVValueDecoder.mm

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)