Apply ColorTempPhysicalMaxMireds when ColorTemperatureMaximumMireds field is 0. Add tests

jmartinez-silabs · jmartinez-silabs · commit c1da2cdbd86c · 2024-06-18T07:26:54.000-04:00
diff --git a/src/app/clusters/color-control-server/color-control-server.cpp b/src/app/clusters/color-control-server/color-control-server.cpp
@@ -2697,7 +2697,7 @@ bool ColorControlServer::moveColorTempCommand(app::CommandHandler * commandObj,
     {
         colorTemperatureMinimum = tempPhysicalMin;
     }
-    if (colorTemperatureMaximum > tempPhysicalMax)
+    if ((colorTemperatureMaximum == 0) || (colorTemperatureMaximum > tempPhysicalMax))
     {
         colorTemperatureMaximum = tempPhysicalMax;
     }
@@ -2808,7 +2808,7 @@ bool ColorControlServer::stepColorTempCommand(app::CommandHandler * commandObj,
     {
         colorTemperatureMinimum = tempPhysicalMin;
     }
-    if (colorTemperatureMaximum > tempPhysicalMax)
+    if ((colorTemperatureMaximum == 0) || (colorTemperatureMaximum > tempPhysicalMax))
     {
         colorTemperatureMaximum = tempPhysicalMax;
     }
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
@@ -364,6 +364,83 @@ tests:
           constraints:
               minValue: 0
               maxValue: 3
+    - label:
+          "Step 6a: TH sends MoveColorTemperature command to DUT with MoveMode =
+          0x03(down), Rate = 65535 (max value) with ColorTemperatureMinimumMireds of 0"
+      PICS: CC.S.F04 && CC.S.C4b.Rsp
+      command: MoveColorTemperature
+      arguments:
+          values:
+              - name: "MoveMode"
+                value: 1
+              - name: "Rate"
+                value: 65535
+              - name: "ColorTemperatureMinimumMireds"
+                value: 0
+              - name: "ColorTemperatureMaximumMireds"
+                value: ColorTempPhysicalMaxMiredsValue
+              - name: "OptionsMask"
+                value: 0
+              - name: "OptionsOverride"
+                value: 0
+
+    - label: "Wait 100ms"
+      PICS: CC.S.F04
+      cluster: "DelayCommands"
+      command: "WaitForMs"
+      arguments:
+          values:
+              - name: "ms"
+                value: 100
+
+    - label: "Step 6b: TH reads ColorTemperatureMireds attribute from DUT."
+      PICS: CC.S.F04 && CC.S.A0007 && CC.S.C4b.Rsp
+      command: "readAttribute"
+      attribute: "ColorTemperatureMireds"
+      response:
+          value: ColorTempPhysicalMinMiredsValue
+          constraints:
+              minValue: ColorTempPhysicalMinMiredsValue
+              maxValue: ColorTempPhysicalMaxMiredsValue
+    
+    - label:
+          "Step 7a: TH sends MoveColorTemperature command to DUT with MoveMode =
+          0x01(up), Rate = 65535 (max value) with ColorTemperatureMaximumMireds of 0"
+      PICS: CC.S.F04 && CC.S.C4b.Rsp
+      command: MoveColorTemperature
+      arguments:
+          values:
+              - name: "MoveMode"
+                value: 1
+              - name: "Rate"
+                value: 65535
+              - name: "ColorTemperatureMinimumMireds"
+                value: ColorTempPhysicalMinMiredsValue
+              - name: "ColorTemperatureMaximumMireds"
+                value: 0
+              - name: "OptionsMask"
+                value: 0
+              - name: "OptionsOverride"
+                value: 0
+
+    - label: "Wait 100ms"
+      PICS: CC.S.F04
+      cluster: "DelayCommands"
+      command: "WaitForMs"
+      arguments:
+          values:
+              - name: "ms"
+                value: 100
+
+    - label: "Step 7b: TH reads ColorTemperatureMireds attribute from DUT."
+      PICS: CC.S.F04 && CC.S.A0007 && CC.S.C4b.Rsp
+      command: "readAttribute"
+      attribute: "ColorTemperatureMireds"
+      response:
+          value: ColorTempPhysicalMaxMiredsValue
+          constraints:
+              minValue: ColorTempPhysicalMinMiredsValue
+              maxValue: ColorTempPhysicalMaxMiredsValue
 
     - label: "Turn off light that we turned on"
       PICS: OO.S.C00.Rsp
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
@@ -286,6 +286,90 @@ tests:
           constraints:
               minValue: 0
               maxValue: 3
+    
+    - label:
+          "Step 5a: TH sends StepColorTemperature command to DUT with StepMode =
+          0x01 (up), StepSize = ColorTempPhysicalMaxMireds and TransitionTime = 0 (instant)."
+      PICS: CC.S.F04 && CC.S.C4c.Rsp
+      command: "StepColorTemperature"
+      arguments:
+          values:
+              - name: "StepMode"
+                value: 1
+              - name: "StepSize"
+                value:
+                    ColorTempPhysicalMaxMiredsValue
+              - name: "ColorTemperatureMinimumMireds"
+                value: ColorTempPhysicalMinMiredsValue
+              - name: "ColorTemperatureMaximumMireds"
+                value: 0
+              - name: "TransitionTime"
+                value: 0
+              - name: "OptionsMask"
+                value: 0
+              - name: "OptionsOverride"
+                value: 0
+
+    - label: "Wait 100ms"
+      PICS: CC.S.F04
+      cluster: "DelayCommands"
+      command: "WaitForMs"
+      arguments:
+          values:
+              - name: "ms"
+                value: 100
+
+    - label: "Step 5b: TH reads ColorTemperatureMireds attribute from DUT."
+      PICS: CC.S.F04 && CC.S.A0007 && CC.S.C4c.Rsp
+      command: "readAttribute"
+      attribute: "ColorTemperatureMireds"
+      response:
+          value: ColorTempPhysicalMaxMiredsValue
+          constraints:
+              minValue: ColorTempPhysicalMinMiredsValue
+              maxValue: ColorTempPhysicalMaxMiredsValue
+    
+    - label:
+          "Step 6a: TH sends StepColorTemperature command to DUT with StepMode =
+          0x03 (down), StepSize = ColorTempPhysicalMaxMireds and TransitionTime = 0 (instant)."
+      PICS: CC.S.F04 && CC.S.C4c.Rsp
+      command: "StepColorTemperature"
+      arguments:
+          values:
+              - name: "StepMode"
+                value: 3
+              - name: "StepSize"
+                value:
+                    ColorTempPhysicalMaxMiredsValue
+              - name: "ColorTemperatureMinimumMireds"
+                value: 0
+              - name: "ColorTemperatureMaximumMireds"
+                value: ColorTempPhysicalMaxMiredsValue
+              - name: "TransitionTime"
+                value: 0
+              - name: "OptionsMask"
+                value: 0
+              - name: "OptionsOverride"
+                value: 0
+
+    - label: "Wait 100ms"
+      PICS: CC.S.F04
+      cluster: "DelayCommands"
+      command: "WaitForMs"
+      arguments:
+          values:
+              - name: "ms"
+                value: 100
+
+    - label: "Step 6b: TH reads ColorTemperatureMireds attribute from DUT."
+      PICS: CC.S.F04 && CC.S.A0007 && CC.S.C4c.Rsp
+      command: "readAttribute"
+      attribute: "ColorTemperatureMireds"
+      response:
+          value: ColorTempPhysicalMinMiredsValue
+          constraints:
+              minValue: ColorTempPhysicalMinMiredsValue
+              maxValue: ColorTempPhysicalMaxMiredsValue
 
     - label: "Turn Off light that we turned on"
       PICS: OO.S.C00.Rsp

Original file line number	Diff line number	Diff line change
`@@ -2697,7 +2697,7 @@ bool ColorControlServer::moveColorTempCommand(app::CommandHandler * commandObj,`
`2697`	`2697`	`{`
`2698`	`2698`	`colorTemperatureMinimum = tempPhysicalMin;`
`2699`	`2699`	`}`
`2700`		`- if (colorTemperatureMaximum > tempPhysicalMax)`
	`2700`	`+ if ((colorTemperatureMaximum == 0) \|\| (colorTemperatureMaximum > tempPhysicalMax))`
`2701`	`2701`	`{`
`2702`	`2702`	`colorTemperatureMaximum = tempPhysicalMax;`
`2703`	`2703`	`}`
`@@ -2808,7 +2808,7 @@ bool ColorControlServer::stepColorTempCommand(app::CommandHandler * commandObj,`
`2808`	`2808`	`{`
`2809`	`2809`	`colorTemperatureMinimum = tempPhysicalMin;`
`2810`	`2810`	`}`
`2811`		`- if (colorTemperatureMaximum > tempPhysicalMax)`
	`2811`	`+ if ((colorTemperatureMaximum == 0) \|\| (colorTemperatureMaximum > tempPhysicalMax))`
`2812`	`2812`	`{`
`2813`	`2813`	`colorTemperatureMaximum = tempPhysicalMax;`
`2814`	`2814`	`}`