@@ -199,10 +199,10 @@ class DefaultColorControlSceneHandler : public scenes::DefaultSceneHandlerImpl
199
199
#endif
200
200
201
201
// Initialize action attributes to default values in case they are not in the scene
202
- auto targetColorMode = EnhancedColorMode::kCurrentHueAndCurrentSaturation ;
203
- uint8_t loopActiveValue = 0x00 ;
204
- uint8_t loopDirectionValue = 0x00 ;
205
- uint16_t loopTimeValue = 0x0019 ; // Default loop time value according to spec
202
+ auto targetColorMode = EnhancedColorMode::kCurrentHueAndCurrentSaturation ;
203
+ uint8_t loopActiveValue = 0x00 ;
204
+ uint8_t loopDirectionValue = 0x00 ;
205
+ uint16_t loopTimeValue = 0x0019 ; // Default loop time value according to spec
206
206
207
207
while (pair_iterator.Next ())
208
208
{
@@ -266,7 +266,7 @@ class DefaultColorControlSceneHandler : public scenes::DefaultSceneHandlerImpl
266
266
if (decodePair.valueUnsigned8 .Value () <=
267
267
static_cast <uint8_t >(EnhancedColorModeEnum::kEnhancedCurrentHueAndCurrentSaturation ))
268
268
{
269
- targetColorMode =static_cast <EnhancedColorModeEnum>(decodePair.valueUnsigned8 .Value ());
269
+ targetColorMode = static_cast <EnhancedColorModeEnum>(decodePair.valueUnsigned8 .Value ());
270
270
}
271
271
break ;
272
272
default :
@@ -532,8 +532,7 @@ bool ColorControlServer::shouldExecuteIfOff(EndpointId endpoint, chip::BitMask<O
532
532
// ---------- The following order is important in decision making -------
533
533
// -----------more readable ----------
534
534
//
535
- if (optionMask == static_cast <OptionsBitmap>(0xFF ) &&
536
- optionOverride == static_cast <OptionsBitmap>(0xFF ))
535
+ if (optionMask == static_cast <OptionsBitmap>(0xFF ) && optionOverride == static_cast <OptionsBitmap>(0xFF ))
537
536
{
538
537
// 0xFF are the default values passed to the command handler when
539
538
// the payload is not present - in that case there is use of option
@@ -574,17 +573,17 @@ void ColorControlServer::handleModeSwitch(EndpointId endpoint, EnhancedColorMode
574
573
EnhancedColorMode enhancedColorMode;
575
574
switch (oldColorMode)
576
575
{
577
- case ColorMode::kCurrentHueAndCurrentSaturation :
578
- enhancedColorMode = EnhancedColorMode::kEnhancedCurrentHueAndCurrentSaturation ;
579
- break ;
580
- case ColorMode::kCurrentXAndCurrentY :
581
- enhancedColorMode = EnhancedColorMode::kCurrentXAndCurrentY ;
582
- break ;
583
- case ColorMode::kColorTemperatureMireds :
584
- enhancedColorMode = EnhancedColorMode::kColorTemperatureMireds ;
585
- break ;
586
- default :
587
- break ;
576
+ case ColorMode::kCurrentHueAndCurrentSaturation :
577
+ enhancedColorMode = EnhancedColorMode::kEnhancedCurrentHueAndCurrentSaturation ;
578
+ break ;
579
+ case ColorMode::kCurrentXAndCurrentY :
580
+ enhancedColorMode = EnhancedColorMode::kCurrentXAndCurrentY ;
581
+ break ;
582
+ case ColorMode::kColorTemperatureMireds :
583
+ enhancedColorMode = EnhancedColorMode::kColorTemperatureMireds ;
584
+ break ;
585
+ default :
586
+ break ;
588
587
}
589
588
590
589
if (enhancedColorMode == newColorMode)
@@ -603,17 +602,17 @@ void ColorControlServer::handleModeSwitch(EndpointId endpoint, EnhancedColorMode
603
602
ColorModeEnum colorMode = ColorModeEnum::kUnknownEnumValue ;
604
603
switch (newColorMode)
605
604
{
606
- case EnhancedColorModeEnum::kEnhancedCurrentHueAndCurrentSaturation :
607
- colorMode = ColorModeEnum::kCurrentHueAndCurrentSaturation ;
608
- break ;
609
- case EnhancedColorModeEnum::kCurrentXAndCurrentY :
610
- colorMode = ColorModeEnum::kCurrentXAndCurrentY ;
611
- break ;
612
- case EnhancedColorModeEnum::kColorTemperatureMireds :
613
- colorMode = ColorModeEnum::kColorTemperatureMireds ;
614
- break ;
615
- default :
616
- break ;
605
+ case EnhancedColorModeEnum::kEnhancedCurrentHueAndCurrentSaturation :
606
+ colorMode = ColorModeEnum::kCurrentHueAndCurrentSaturation ;
607
+ break ;
608
+ case EnhancedColorModeEnum::kCurrentXAndCurrentY :
609
+ colorMode = ColorModeEnum::kCurrentXAndCurrentY ;
610
+ break ;
611
+ case EnhancedColorModeEnum::kColorTemperatureMireds :
612
+ colorMode = ColorModeEnum::kColorTemperatureMireds ;
613
+ break ;
614
+ default :
615
+ break ;
617
616
}
618
617
Attributes::ColorMode::Set (endpoint, colorMode);
619
618
@@ -2624,17 +2623,17 @@ void ColorControlServer::startUpColorTempCommand(EndpointId endpoint)
2624
2623
EnhancedColorModeEnum enhancedColorMode;
2625
2624
switch (updateColorMode)
2626
2625
{
2627
- case ColorModeEnum::kCurrentHueAndCurrentSaturation :
2628
- enhancedColorMode = EnhancedColorModeEnum::kEnhancedCurrentHueAndCurrentSaturation ;
2629
- break ;
2630
- case ColorModeEnum::kCurrentXAndCurrentY :
2631
- enhancedColorMode = EnhancedColorModeEnum::kCurrentXAndCurrentY ;
2632
- break ;
2633
- case ColorModeEnum::kColorTemperatureMireds :
2634
- enhancedColorMode = EnhancedColorModeEnum::kColorTemperatureMireds ;
2635
- break ;
2636
- default :
2637
- break ;
2626
+ case ColorModeEnum::kCurrentHueAndCurrentSaturation :
2627
+ enhancedColorMode = EnhancedColorModeEnum::kEnhancedCurrentHueAndCurrentSaturation ;
2628
+ break ;
2629
+ case ColorModeEnum::kCurrentXAndCurrentY :
2630
+ enhancedColorMode = EnhancedColorModeEnum::kCurrentXAndCurrentY ;
2631
+ break ;
2632
+ case ColorModeEnum::kColorTemperatureMireds :
2633
+ enhancedColorMode = EnhancedColorModeEnum::kColorTemperatureMireds ;
2634
+ break ;
2635
+ default :
2636
+ break ;
2638
2637
}
2639
2638
Attributes::EnhancedColorMode::Set (endpoint, enhancedColorMode);
2640
2639
}
@@ -2970,17 +2969,17 @@ void ColorControlServer::levelControlColorTempChangeCommand(EndpointId endpoint)
2970
2969
EnhancedColorModeEnum enhancedColorMode;
2971
2970
switch (colorMode)
2972
2971
{
2973
- case ColorModeEnum::kCurrentHueAndCurrentSaturation :
2974
- enhancedColorMode = EnhancedColorModeEnum::kEnhancedCurrentHueAndCurrentSaturation ;
2975
- break ;
2976
- case ColorModeEnum::kCurrentXAndCurrentY :
2977
- enhancedColorMode = EnhancedColorModeEnum::kCurrentXAndCurrentY ;
2978
- break ;
2979
- case ColorModeEnum::kColorTemperatureMireds :
2980
- enhancedColorMode = EnhancedColorModeEnum::kColorTemperatureMireds ;
2981
- break ;
2982
- default :
2983
- break ;
2972
+ case ColorModeEnum::kCurrentHueAndCurrentSaturation :
2973
+ enhancedColorMode = EnhancedColorModeEnum::kEnhancedCurrentHueAndCurrentSaturation ;
2974
+ break ;
2975
+ case ColorModeEnum::kCurrentXAndCurrentY :
2976
+ enhancedColorMode = EnhancedColorModeEnum::kCurrentXAndCurrentY ;
2977
+ break ;
2978
+ case ColorModeEnum::kColorTemperatureMireds :
2979
+ enhancedColorMode = EnhancedColorModeEnum::kColorTemperatureMireds ;
2980
+ break ;
2981
+ default :
2982
+ break ;
2984
2983
}
2985
2984
2986
2985
if (enhancedColorMode == EnhancedColorMode::kColorTemperatureMireds )
0 commit comments