addressed review comments

Thirsrin · Thirsrin · commit 152dd325bc88 · 2024-06-04T11:14:35.000+05:30
diff --git a/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter b/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter
@@ -5475,7 +5475,7 @@ cluster ColorControl = 768 {
     kHueSaturation = 0x1;
     kEnhancedHue = 0x2;
     kColorLoop = 0x4;
-    kXYAttributes = 0x8;
+    kXY = 0x8;
     kColorTemperature = 0x10;
   }
 
diff --git a/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter b/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter
@@ -4034,7 +4034,7 @@ cluster ColorControl = 768 {
     kHueSaturation = 0x1;
     kEnhancedHue = 0x2;
     kColorLoop = 0x4;
-    kXYAttributes = 0x8;
+    kXY = 0x8;
     kColorTemperature = 0x10;
   }
 
diff --git a/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.matter b/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.matter
@@ -1460,7 +1460,7 @@ cluster ColorControl = 768 {
     kHueSaturation = 0x1;
     kEnhancedHue = 0x2;
     kColorLoop = 0x4;
-    kXYAttributes = 0x8;
+    kXY = 0x8;
     kColorTemperature = 0x10;
   }
 
diff --git a/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.matter b/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.matter
@@ -1561,7 +1561,7 @@ cluster ColorControl = 768 {
     kHueSaturation = 0x1;
     kEnhancedHue = 0x2;
     kColorLoop = 0x4;
-    kXYAttributes = 0x8;
+    kXY = 0x8;
     kColorTemperature = 0x10;
   }
 
diff --git a/examples/light-switch-app/light-switch-common/light-switch-app.matter b/examples/light-switch-app/light-switch-common/light-switch-app.matter
@@ -2230,7 +2230,7 @@ cluster ColorControl = 768 {
     kHueSaturation = 0x1;
     kEnhancedHue = 0x2;
     kColorLoop = 0x4;
-    kXYAttributes = 0x8;
+    kXY = 0x8;
     kColorTemperature = 0x10;
   }
 
diff --git a/examples/light-switch-app/qpg/zap/switch.matter b/examples/light-switch-app/qpg/zap/switch.matter
@@ -2027,7 +2027,7 @@ cluster ColorControl = 768 {
     kHueSaturation = 0x1;
     kEnhancedHue = 0x2;
     kColorLoop = 0x4;
-    kXYAttributes = 0x8;
+    kXY = 0x8;
     kColorTemperature = 0x10;
   }
 
diff --git a/examples/lighting-app/bouffalolab/data_model/lighting-app-ethernet.matter b/examples/lighting-app/bouffalolab/data_model/lighting-app-ethernet.matter
@@ -1600,7 +1600,7 @@ cluster ColorControl = 768 {
     kHueSaturation = 0x1;
     kEnhancedHue = 0x2;
     kColorLoop = 0x4;
-    kXYAttributes = 0x8;
+    kXY = 0x8;
     kColorTemperature = 0x10;
   }
 
diff --git a/examples/lighting-app/bouffalolab/data_model/lighting-app-thread.matter b/examples/lighting-app/bouffalolab/data_model/lighting-app-thread.matter
@@ -1724,7 +1724,7 @@ cluster ColorControl = 768 {
     kHueSaturation = 0x1;
     kEnhancedHue = 0x2;
     kColorLoop = 0x4;
-    kXYAttributes = 0x8;
+    kXY = 0x8;
     kColorTemperature = 0x10;
   }
 
diff --git a/examples/lighting-app/bouffalolab/data_model/lighting-app-wifi.matter b/examples/lighting-app/bouffalolab/data_model/lighting-app-wifi.matter
@@ -1635,7 +1635,7 @@ cluster ColorControl = 768 {
     kHueSaturation = 0x1;
     kEnhancedHue = 0x2;
     kColorLoop = 0x4;
-    kXYAttributes = 0x8;
+    kXY = 0x8;
     kColorTemperature = 0x10;
   }
 
diff --git a/examples/lighting-app/lighting-common/lighting-app.matter b/examples/lighting-app/lighting-common/lighting-app.matter
@@ -2047,7 +2047,7 @@ cluster ColorControl = 768 {
     kHueSaturation = 0x1;
     kEnhancedHue = 0x2;
     kColorLoop = 0x4;
-    kXYAttributes = 0x8;
+    kXY = 0x8;
     kColorTemperature = 0x10;
   }
 
diff --git a/examples/lighting-app/qpg/zap/light.matter b/examples/lighting-app/qpg/zap/light.matter
@@ -1663,7 +1663,7 @@ cluster ColorControl = 768 {
     kHueSaturation = 0x1;
     kEnhancedHue = 0x2;
     kColorLoop = 0x4;
-    kXYAttributes = 0x8;
+    kXY = 0x8;
     kColorTemperature = 0x10;
   }
 
diff --git a/examples/lighting-app/silabs/data_model/lighting-thread-app.matter b/examples/lighting-app/silabs/data_model/lighting-thread-app.matter
@@ -1752,7 +1752,7 @@ cluster ColorControl = 768 {
     kHueSaturation = 0x1;
     kEnhancedHue = 0x2;
     kColorLoop = 0x4;
-    kXYAttributes = 0x8;
+    kXY = 0x8;
     kColorTemperature = 0x10;
   }
 
diff --git a/examples/lighting-app/silabs/data_model/lighting-wifi-app.matter b/examples/lighting-app/silabs/data_model/lighting-wifi-app.matter
@@ -2043,7 +2043,7 @@ cluster ColorControl = 768 {
     kHueSaturation = 0x1;
     kEnhancedHue = 0x2;
     kColorLoop = 0x4;
-    kXYAttributes = 0x8;
+    kXY = 0x8;
     kColorTemperature = 0x10;
   }
 
diff --git a/examples/placeholder/linux/apps/app1/config.matter b/examples/placeholder/linux/apps/app1/config.matter
@@ -5602,7 +5602,7 @@ cluster ColorControl = 768 {
     kHueSaturation = 0x1;
     kEnhancedHue = 0x2;
     kColorLoop = 0x4;
-    kXYAttributes = 0x8;
+    kXY = 0x8;
     kColorTemperature = 0x10;
   }
 
@@ -5930,7 +5930,7 @@ cluster ColorControl = 768 {
     kHueSaturation = 0x1;
     kEnhancedHue = 0x2;
     kColorLoop = 0x4;
-    kXYAttributes = 0x8;
+    kXY = 0x8;
     kColorTemperature = 0x10;
   }
 
diff --git a/examples/placeholder/linux/apps/app2/config.matter b/examples/placeholder/linux/apps/app2/config.matter
@@ -5559,7 +5559,7 @@ cluster ColorControl = 768 {
     kHueSaturation = 0x1;
     kEnhancedHue = 0x2;
     kColorLoop = 0x4;
-    kXYAttributes = 0x8;
+    kXY = 0x8;
     kColorTemperature = 0x10;
   }
 
@@ -5887,7 +5887,7 @@ cluster ColorControl = 768 {
     kHueSaturation = 0x1;
     kEnhancedHue = 0x2;
     kColorLoop = 0x4;
-    kXYAttributes = 0x8;
+    kXY = 0x8;
     kColorTemperature = 0x10;
   }
 
diff --git a/examples/virtual-device-app/virtual-device-common/virtual-device-app.matter b/examples/virtual-device-app/virtual-device-common/virtual-device-app.matter
@@ -2899,7 +2899,7 @@ cluster ColorControl = 768 {
     kHueSaturation = 0x1;
     kEnhancedHue = 0x2;
     kColorLoop = 0x4;
-    kXYAttributes = 0x8;
+    kXY = 0x8;
     kColorTemperature = 0x10;
   }
 
diff --git a/src/app/zap-templates/zcl/data-model/chip/color-control-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/color-control-cluster.xml
@@ -50,7 +50,7 @@ limitations under the License.
     <field name="HueSaturation" mask="0x0001"/>
     <field name="EnhancedHue" mask="0x0002"/>
     <field name="ColorLoop" mask="0x0004"/>
-    <field name="XYAttributes" mask="0x0008"/>
+    <field name="XY" mask="0x0008"/>
     <field name="ColorTemperature" mask="0x0010"/>
   </bitmap>
 
diff --git a/src/controller/data_model/controller-clusters.matter b/src/controller/data_model/controller-clusters.matter
@@ -6651,7 +6651,7 @@ cluster ColorControl = 768 {
     kHueSaturation = 0x1;
     kEnhancedHue = 0x2;
     kColorLoop = 0x4;
-    kXYAttributes = 0x8;
+    kXY = 0x8;
     kColorTemperature = 0x10;
   }
 
diff --git a/src/controller/python/chip/clusters/Objects.py b/src/controller/python/chip/clusters/Objects.py

Original file line number	Diff line number	Diff line change
`@@ -5475,7 +5475,7 @@ cluster ColorControl = 768 {`
`5475`	`5475`	`kHueSaturation = 0x1;`
`5476`	`5476`	`kEnhancedHue = 0x2;`
`5477`	`5477`	`kColorLoop = 0x4;`
`5478`		`- kXYAttributes = 0x8;`
	`5478`	`+ kXY = 0x8;`
`5479`	`5479`	`kColorTemperature = 0x10;`
`5480`	`5480`	`}`
`5481`	`5481`
Original file line number	Diff line number	Diff line change
`@@ -4034,7 +4034,7 @@ cluster ColorControl = 768 {`
`4034`	`4034`	`kHueSaturation = 0x1;`
`4035`	`4035`	`kEnhancedHue = 0x2;`
`4036`	`4036`	`kColorLoop = 0x4;`
`4037`		`- kXYAttributes = 0x8;`
	`4037`	`+ kXY = 0x8;`
`4038`	`4038`	`kColorTemperature = 0x10;`
`4039`	`4039`	`}`
`4040`	`4040`
Original file line number	Diff line number	Diff line change
`@@ -1460,7 +1460,7 @@ cluster ColorControl = 768 {`
`1460`	`1460`	`kHueSaturation = 0x1;`
`1461`	`1461`	`kEnhancedHue = 0x2;`
`1462`	`1462`	`kColorLoop = 0x4;`
`1463`		`- kXYAttributes = 0x8;`
	`1463`	`+ kXY = 0x8;`
`1464`	`1464`	`kColorTemperature = 0x10;`
`1465`	`1465`	`}`
`1466`	`1466`
Original file line number	Diff line number	Diff line change
`@@ -1561,7 +1561,7 @@ cluster ColorControl = 768 {`
`1561`	`1561`	`kHueSaturation = 0x1;`
`1562`	`1562`	`kEnhancedHue = 0x2;`
`1563`	`1563`	`kColorLoop = 0x4;`
`1564`		`- kXYAttributes = 0x8;`
	`1564`	`+ kXY = 0x8;`
`1565`	`1565`	`kColorTemperature = 0x10;`
`1566`	`1566`	`}`
`1567`	`1567`
Original file line number	Diff line number	Diff line change
`@@ -2230,7 +2230,7 @@ cluster ColorControl = 768 {`
`2230`	`2230`	`kHueSaturation = 0x1;`
`2231`	`2231`	`kEnhancedHue = 0x2;`
`2232`	`2232`	`kColorLoop = 0x4;`
`2233`		`- kXYAttributes = 0x8;`
	`2233`	`+ kXY = 0x8;`
`2234`	`2234`	`kColorTemperature = 0x10;`
`2235`	`2235`	`}`
`2236`	`2236`
Original file line number	Diff line number	Diff line change
`@@ -2027,7 +2027,7 @@ cluster ColorControl = 768 {`
`2027`	`2027`	`kHueSaturation = 0x1;`
`2028`	`2028`	`kEnhancedHue = 0x2;`
`2029`	`2029`	`kColorLoop = 0x4;`
`2030`		`- kXYAttributes = 0x8;`
	`2030`	`+ kXY = 0x8;`
`2031`	`2031`	`kColorTemperature = 0x10;`
`2032`	`2032`	`}`
`2033`	`2033`
Original file line number	Diff line number	Diff line change
`@@ -1600,7 +1600,7 @@ cluster ColorControl = 768 {`
`1600`	`1600`	`kHueSaturation = 0x1;`
`1601`	`1601`	`kEnhancedHue = 0x2;`
`1602`	`1602`	`kColorLoop = 0x4;`
`1603`		`- kXYAttributes = 0x8;`
	`1603`	`+ kXY = 0x8;`
`1604`	`1604`	`kColorTemperature = 0x10;`
`1605`	`1605`	`}`
`1606`	`1606`
Original file line number	Diff line number	Diff line change
`@@ -1724,7 +1724,7 @@ cluster ColorControl = 768 {`
`1724`	`1724`	`kHueSaturation = 0x1;`
`1725`	`1725`	`kEnhancedHue = 0x2;`
`1726`	`1726`	`kColorLoop = 0x4;`
`1727`		`- kXYAttributes = 0x8;`
	`1727`	`+ kXY = 0x8;`
`1728`	`1728`	`kColorTemperature = 0x10;`
`1729`	`1729`	`}`
`1730`	`1730`
Original file line number	Diff line number	Diff line change
`@@ -1635,7 +1635,7 @@ cluster ColorControl = 768 {`
`1635`	`1635`	`kHueSaturation = 0x1;`
`1636`	`1636`	`kEnhancedHue = 0x2;`
`1637`	`1637`	`kColorLoop = 0x4;`
`1638`		`- kXYAttributes = 0x8;`
	`1638`	`+ kXY = 0x8;`
`1639`	`1639`	`kColorTemperature = 0x10;`
`1640`	`1640`	`}`
`1641`	`1641`
Original file line number	Diff line number	Diff line change
`@@ -2047,7 +2047,7 @@ cluster ColorControl = 768 {`
`2047`	`2047`	`kHueSaturation = 0x1;`
`2048`	`2048`	`kEnhancedHue = 0x2;`
`2049`	`2049`	`kColorLoop = 0x4;`
`2050`		`- kXYAttributes = 0x8;`
	`2050`	`+ kXY = 0x8;`
`2051`	`2051`	`kColorTemperature = 0x10;`
`2052`	`2052`	`}`
`2053`	`2053`