Align naming in Color Control cluster XML with the spec. (#24388)

* Align naming in Color Control cluster XML with the spec. * Regenerate generated code. * Address review comment: undo changes that introduced spaces and slashes in names. Instead this should be fixed on the spec side, which is tracked in https://github.com/CHIP-Specifications/connectedhomeip-spec/issues/6174 * Regenerate generated code.
project-chip · Jul 12, 2023 · 1699252 · 1699252
1 parent 6936882
commit 1699252
Show file tree

Hide file tree

Showing 29 changed files with 115 additions and 82 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
@@ -2975,7 +2975,7 @@ server cluster ColorControl = 768 {
   }
 
   request struct MoveToColorTemperatureRequest {
-    INT16U colorTemperature = 0;
+    INT16U colorTemperatureMireds = 0;
     INT16U transitionTime = 1;
     BITMAP8 optionsMask = 2;
     BITMAP8 optionsOverride = 3;

diff --git a/examples/all-clusters-app/ameba/main/include/ColorControlCommands.h b/examples/all-clusters-app/ameba/main/include/ColorControlCommands.h
@@ -453,10 +453,10 @@ void ProcessColorControlUnicastBindingCommand(BindingCommandData * data, const E
         break;
 
     case Clusters::ColorControl::Commands::MoveToColorTemperature::Id:
-        moveToColorTemperatureCommand.colorTemperature = static_cast<uint16_t>(data->args[0]);
-        moveToColorTemperatureCommand.transitionTime   = static_cast<uint16_t>(data->args[1]);
-        moveToColorTemperatureCommand.optionsMask      = static_cast<uint8_t>(data->args[2]);
-        moveToColorTemperatureCommand.optionsOverride  = static_cast<uint8_t>(data->args[3]);
+        moveToColorTemperatureCommand.colorTemperatureMireds = static_cast<uint16_t>(data->args[0]);
+        moveToColorTemperatureCommand.transitionTime         = static_cast<uint16_t>(data->args[1]);
+        moveToColorTemperatureCommand.optionsMask            = static_cast<uint8_t>(data->args[2]);
+        moveToColorTemperatureCommand.optionsOverride        = static_cast<uint8_t>(data->args[3]);
         Controller::InvokeCommandRequest(peer_device->GetExchangeManager(), peer_device->GetSecureSession().Value(), binding.remote,
                                          moveToColorTemperatureCommand, onSuccess, onFailure);
         break;
@@ -658,10 +658,10 @@ void ProcessColorControlGroupBindingCommand(BindingCommandData * data, const Emb
         break;
 
     case Clusters::ColorControl::Commands::MoveToColorTemperature::Id:
-        moveToColorTemperatureCommand.colorTemperature = static_cast<uint16_t>(data->args[0]);
-        moveToColorTemperatureCommand.transitionTime   = static_cast<uint16_t>(data->args[1]);
-        moveToColorTemperatureCommand.optionsMask      = static_cast<uint8_t>(data->args[2]);
-        moveToColorTemperatureCommand.optionsOverride  = static_cast<uint8_t>(data->args[3]);
+        moveToColorTemperatureCommand.colorTemperatureMireds = static_cast<uint16_t>(data->args[0]);
+        moveToColorTemperatureCommand.transitionTime         = static_cast<uint16_t>(data->args[1]);
+        moveToColorTemperatureCommand.optionsMask            = static_cast<uint8_t>(data->args[2]);
+        moveToColorTemperatureCommand.optionsOverride        = static_cast<uint8_t>(data->args[3]);
         Controller::InvokeGroupCommandRequest(&exchangeMgr, binding.fabricIndex, binding.groupId, moveToColorTemperatureCommand);
         break;
 

diff --git a/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.matter b/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.matter
@@ -1283,7 +1283,7 @@ server cluster ColorControl = 768 {
   }
 
   request struct MoveToColorTemperatureRequest {
-    INT16U colorTemperature = 0;
+    INT16U colorTemperatureMireds = 0;
     INT16U transitionTime = 1;
     BITMAP8 optionsMask = 2;
     BITMAP8 optionsOverride = 3;

diff --git a/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.matter b/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.matter
@@ -1349,7 +1349,7 @@ server cluster ColorControl = 768 {
   }
 
   request struct MoveToColorTemperatureRequest {
-    INT16U colorTemperature = 0;
+    INT16U colorTemperatureMireds = 0;
     INT16U transitionTime = 1;
     BITMAP8 optionsMask = 2;
     BITMAP8 optionsOverride = 3;

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
@@ -1658,7 +1658,7 @@ client cluster ColorControl = 768 {
   }
 
   request struct MoveToColorTemperatureRequest {
-    INT16U colorTemperature = 0;
+    INT16U colorTemperatureMireds = 0;
     INT16U transitionTime = 1;
     BITMAP8 optionsMask = 2;
     BITMAP8 optionsOverride = 3;

diff --git a/examples/lighting-app/lighting-common/lighting-app.matter b/examples/lighting-app/lighting-common/lighting-app.matter
@@ -1610,7 +1610,7 @@ server cluster ColorControl = 768 {
   }
 
   request struct MoveToColorTemperatureRequest {
-    INT16U colorTemperature = 0;
+    INT16U colorTemperatureMireds = 0;
     INT16U transitionTime = 1;
     BITMAP8 optionsMask = 2;
     BITMAP8 optionsOverride = 3;

diff --git a/src/app/clusters/color-control-server/color-control-server.cpp b/src/app/clusters/color-control-server/color-control-server.cpp
@@ -2270,7 +2270,7 @@ bool ColorControlServer::moveColorTempCommand(const app::ConcreteCommandPath & c
 bool ColorControlServer::moveToColorTempCommand(const app::ConcreteCommandPath & commandPath,
                                                 const Commands::MoveToColorTemperature::DecodableType & commandData)
 {
-    uint16_t colorTemperature = commandData.colorTemperature;
+    uint16_t colorTemperature = commandData.colorTemperatureMireds;
     uint16_t transitionTime   = commandData.transitionTime;
     uint8_t optionsMask       = commandData.optionsMask;
     uint8_t optionsOverride   = commandData.optionsOverride;

diff --git a/src/app/tests/suites/certification/Test_TC_CC_6_1.yaml b/src/app/tests/suites/certification/Test_TC_CC_6_1.yaml
@@ -84,7 +84,7 @@ tests:
       command: "MoveToColorTemperature"
       arguments:
           values:
-              - name: "colorTemperature"
+              - name: "ColorTemperatureMireds"
                 value: 310
               - name: "TransitionTime"
                 value: 0
@@ -108,7 +108,7 @@ tests:
       command: "MoveToColorTemperature"
       arguments:
           values:
-              - name: "colorTemperature"
+              - name: "ColorTemperatureMireds"
                 value: 250
               - name: "TransitionTime"
                 value: 300

diff --git a/src/app/tests/suites/certification/Test_TC_CC_6_2.yaml b/src/app/tests/suites/certification/Test_TC_CC_6_2.yaml
@@ -84,7 +84,7 @@ tests:
       command: "MoveToColorTemperature"
       arguments:
           values:
-              - name: "colorTemperature"
+              - name: "ColorTemperatureMireds"
                 value:
                     ( ColorTempPhysicalMinMiredsValue +
                     ColorTempPhysicalMaxMiredsValue ) / 2

diff --git a/src/app/tests/suites/certification/Test_TC_CC_6_3.yaml b/src/app/tests/suites/certification/Test_TC_CC_6_3.yaml
@@ -84,7 +84,7 @@ tests:
       command: "MoveToColorTemperature"
       arguments:
           values:
-              - name: "colorTemperature"
+              - name: "ColorTemperatureMireds"
                 value:
                     ( ColorTempPhysicalMinMiredsValue +
                     ColorTempPhysicalMaxMiredsValue ) / 2

diff --git a/src/app/tests/suites/certification/Test_TC_CC_8_1.yaml b/src/app/tests/suites/certification/Test_TC_CC_8_1.yaml
@@ -243,7 +243,7 @@ tests:
       command: "MoveToColorTemperature"
       arguments:
           values:
-              - name: "colorTemperature"
+              - name: "ColorTemperatureMireds"
                 value:
                     ( ColorTempPhysicalMinMireds + ColorTempPhysicalMaxMireds )
                     / 2

diff --git a/src/app/zap-templates/zcl/data-model/silabs/ha.xml b/src/app/zap-templates/zcl/data-model/silabs/ha.xml
@@ -349,7 +349,7 @@ limitations under the License.
       <description>
         Move to a specific color temperature.
       </description>
-      <arg name="ColorTemperature" type="INT16U"/>
+      <arg name="ColorTemperatureMireds" type="INT16U"/>
       <arg name="TransitionTime" type="INT16U"/>
       <arg name="OptionsMask" type="BITMAP8"/>
       <arg name="OptionsOverride" type="BITMAP8"/>

diff --git a/src/app/zap-templates/zcl/data-model/silabs/types.xml b/src/app/zap-templates/zcl/data-model/silabs/types.xml
@@ -216,7 +216,7 @@ limitations under the License.
   </enum>
   <enum name="HueMoveMode" type="ENUM8">
     <cluster code="0x0300"/>
-    <item name="stop" value="0x0"/>
+    <item name="Stop" value="0x0"/>
     <item name="Up" value="0x1"/>
     <item name="Down" value="0x3"/>
   </enum>
@@ -227,7 +227,7 @@ limitations under the License.
   </enum>
   <enum name="SaturationMoveMode" type="ENUM8">
     <cluster code="0x0300"/>
-    <item name="stop" value="0x0"/>
+    <item name="Stop" value="0x0"/>
     <item name="Up" value="0x1"/>
     <item name="Down" value="0x3"/>
   </enum>

diff --git a/src/controller/data_model/controller-clusters.matter b/src/controller/data_model/controller-clusters.matter
@@ -3305,7 +3305,7 @@ client cluster ColorControl = 768 {
   }
 
   request struct MoveToColorTemperatureRequest {
-    INT16U colorTemperature = 0;
+    INT16U colorTemperatureMireds = 0;
     INT16U transitionTime = 1;
     BITMAP8 optionsMask = 2;
     BITMAP8 optionsOverride = 3;

diff --git a/src/controller/java/zap-generated/chip/devicecontroller/ChipClusters.java b/src/controller/java/zap-generated/chip/devicecontroller/ChipClusters.java
diff --git a/src/controller/java/zap-generated/chip/devicecontroller/ClusterInfoMapping.java b/src/controller/java/zap-generated/chip/devicecontroller/ClusterInfoMapping.java
diff --git a/src/controller/python/chip/clusters/CHIPClusters.py b/src/controller/python/chip/clusters/CHIPClusters.py
diff --git a/src/controller/python/chip/clusters/Objects.py b/src/controller/python/chip/clusters/Objects.py
diff --git a/src/darwin/Framework/CHIP/templates/availability.yaml b/src/darwin/Framework/CHIP/templates/availability.yaml
@@ -5021,6 +5021,9 @@
                   - userUniqueID
               GetUserResponse:
                   - userUniqueID
+          ColorControl:
+              MoveToColorTemperature:
+                  - colorTemperatureMireds
       structs:
           OTASoftwareUpdateRequestor:
               - ProviderLocation
@@ -5622,6 +5625,9 @@
                   - userUniqueId
               GetUserResponse:
                   - userUniqueId
+          ColorControl:
+              MoveToColorTemperature:
+                  - colorTemperature
       structs:
           Descriptor:
               - DeviceType
@@ -5875,6 +5881,9 @@
                   userUniqueID: userUniqueId
               GetUserResponse:
                   userUniqueID: userUniqueId
+          ColorControl:
+              MoveToColorTemperature:
+                  colorTemperatureMireds: colorTemperature
       structs:
           AccessControl:
               AccessControlEntryStruct: AccessControlEntry

diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.mm b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.mm
diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRClusters.mm b/src/darwin/Framework/CHIP/zap-generated/MTRClusters.mm
diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.h b/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.h
diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.mm b/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.mm
diff --git a/zzz_generated/app-common/app-common/zap-generated/cluster-objects.cpp b/zzz_generated/app-common/app-common/zap-generated/cluster-objects.cpp