addressed review comments

project-chip · Jul 1, 2024 · 30aeb78 · 30aeb78
1 parent bef02cd
commit 30aeb78
Show file tree

Hide file tree

Showing 19 changed files with 21 additions and 21 deletions.
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
@@ -5487,7 +5487,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
@@ -4035,7 +4035,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
@@ -2238,7 +2238,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
@@ -2035,7 +2035,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
@@ -2048,7 +2048,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
@@ -5604,7 +5604,7 @@ cluster ColorControl = 768 {
     kHueSaturation = 0x1;
     kEnhancedHue = 0x2;
     kColorLoop = 0x4;
-    kXYAttributes = 0x8;
+    kXY = 0x8;
     kColorTemperature = 0x10;
   }
 
@@ -5932,7 +5932,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
@@ -5561,7 +5561,7 @@ cluster ColorControl = 768 {
     kHueSaturation = 0x1;
     kEnhancedHue = 0x2;
     kColorLoop = 0x4;
-    kXYAttributes = 0x8;
+    kXY = 0x8;
     kColorTemperature = 0x10;
   }
 
@@ -5889,7 +5889,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
@@ -6960,7 +6960,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