Skip to content

Commit f8f1d2d

Browse files
ThirsrinThirsrin
committed
addressed review comments
1 parent ddc8750 commit f8f1d2d

File tree

2 files changed

+29
-30
lines changed

2 files changed

+29
-30
lines changed

‎src/app/clusters/color-control-server/color-control-server.cpp

+29-29
Original file line numberDiff line numberDiff line change
@@ -438,8 +438,8 @@ Status ColorControlServer::stopAllColorTransitions(EndpointId endpoint)
438438
}
439439

440440
bool ColorControlServer::stopMoveStepCommand(app::CommandHandler * commandObj, const app::ConcreteCommandPath & commandPath,
441-
chip::BitMask<chip::app::Clusters::ColorControl::OptionsBitmap> optionsMask,
442-
chip::BitMask<chip::app::Clusters::ColorControl::OptionsBitmap> optionsOverride)
441+
chip::BitMask<OptionsBitmap> optionsMask,
442+
chip::BitMask<OptionsBitmap> optionsOverride)
443443
{
444444
EndpointId endpoint = commandPath.mEndpointId;
445445
Status status = Status::Success;
@@ -467,8 +467,8 @@ bool ColorControlServer::stopMoveStepCommand(app::CommandHandler * commandObj, c
467467
}
468468

469469
bool ColorControlServer::shouldExecuteIfOff(EndpointId endpoint,
470-
chip::BitMask<chip::app::Clusters::ColorControl::OptionsBitmap> optionMask,
471-
chip::BitMask<chip::app::Clusters::ColorControl::OptionsBitmap> optionOverride)
470+
chip::BitMask<OptionsBitmap> optionMask,
471+
chip::BitMask<OptionsBitmap> optionOverride)
472472
{
473473
// From 5.2.2.2.1.10 of ZCL7 document 14-0129-15f-zcl-ch-5-lighting.docx:
474474
// "Command execution SHALL NOT continue beyond the Options processing if
@@ -483,7 +483,7 @@ bool ColorControlServer::shouldExecuteIfOff(EndpointId endpoint,
483483
return true;
484484
}
485485

486-
chip::BitMask<chip::app::Clusters::ColorControl::OptionsBitmap> options = 0x00;
486+
chip::BitMask<OptionsBitmap> options = 0x00;
487487
Attributes::Options::Get(endpoint, &options);
488488

489489
bool on = true;
@@ -516,14 +516,14 @@ bool ColorControlServer::shouldExecuteIfOff(EndpointId endpoint,
516516
// 0xFF are the default values passed to the command handler when
517517
// the payload is not present - in that case there is use of option
518518
// attribute to decide execution of the command
519-
return options.GetField(ColorControl::OptionsBitmap::kExecuteIfOff);
519+
return options.Has(ColorControl::OptionsBitmap::kExecuteIfOff);
520520
}
521521
// ---------- The above is to distinguish if the payload is present or not
522522

523523
if (optionMask.Has(ColorControl::OptionsBitmap::kExecuteIfOff))
524524
{
525525
// Mask is present and set in the command payload, this indicates
526-
// use the over ride as temporary option
526+
// use the override as temporary option
527527
return optionOverride.Has(ColorControl::OptionsBitmap::kExecuteIfOff);
528528
}
529529
// if we are here - use the option bits
@@ -1334,8 +1334,8 @@ Status ColorControlServer::moveToHueAndSaturation(uint16_t hue, uint8_t saturati
13341334
*/
13351335
bool ColorControlServer::moveHueCommand(app::CommandHandler * commandObj, const app::ConcreteCommandPath & commandPath,
13361336
MoveModeEnum moveMode, uint16_t rate,
1337-
chip::BitMask<chip::app::Clusters::ColorControl::OptionsBitmap> optionsMask,
1338-
chip::BitMask<chip::app::Clusters::ColorControl::OptionsBitmap> optionsOverride,
1337+
chip::BitMask<OptionsBitmap> optionsMask,
1338+
chip::BitMask<OptionsBitmap> optionsOverride,
13391339
bool isEnhanced)
13401340
{
13411341
MATTER_TRACE_SCOPE("moveHue", "ColorControl");
@@ -1442,8 +1442,8 @@ bool ColorControlServer::moveHueCommand(app::CommandHandler * commandObj, const
14421442
*/
14431443
bool ColorControlServer::moveToHueCommand(app::CommandHandler * commandObj, const app::ConcreteCommandPath & commandPath,
14441444
uint16_t hue, DirectionEnum moveDirection, uint16_t transitionTime,
1445-
chip::BitMask<chip::app::Clusters::ColorControl::OptionsBitmap> optionsMask,
1446-
chip::BitMask<chip::app::Clusters::ColorControl::OptionsBitmap> optionsOverride,
1445+
chip::BitMask<OptionsBitmap> optionsMask,
1446+
chip::BitMask<OptionsBitmap> optionsOverride,
14471447
bool isEnhanced)
14481448
{
14491449
MATTER_TRACE_SCOPE("moveToHue", "ColorControl");
@@ -1578,8 +1578,8 @@ bool ColorControlServer::moveToHueCommand(app::CommandHandler * commandObj, cons
15781578
*/
15791579
bool ColorControlServer::moveToHueAndSaturationCommand(
15801580
app::CommandHandler * commandObj, const app::ConcreteCommandPath & commandPath, uint16_t hue, uint8_t saturation,
1581-
uint16_t transitionTime, chip::BitMask<chip::app::Clusters::ColorControl::OptionsBitmap> optionsMask,
1582-
chip::BitMask<chip::app::Clusters::ColorControl::OptionsBitmap> optionsOverride, bool isEnhanced)
1581+
uint16_t transitionTime, chip::BitMask<OptionsBitmap> optionsMask,
1582+
chip::BitMask<OptionsBitmap> optionsOverride, bool isEnhanced)
15831583
{
15841584
MATTER_TRACE_SCOPE("moveToHueAndSaturation", "ColorControl");
15851585
// limit checking: hue and saturation are 0..254. Spec dictates we ignore
@@ -1619,8 +1619,8 @@ bool ColorControlServer::moveToHueAndSaturationCommand(
16191619
*/
16201620
bool ColorControlServer::stepHueCommand(app::CommandHandler * commandObj, const app::ConcreteCommandPath & commandPath,
16211621
StepModeEnum stepMode, uint16_t stepSize, uint16_t transitionTime,
1622-
chip::BitMask<chip::app::Clusters::ColorControl::OptionsBitmap> optionsMask,
1623-
chip::BitMask<chip::app::Clusters::ColorControl::OptionsBitmap> optionsOverride,
1622+
chip::BitMask<OptionsBitmap> optionsMask,
1623+
chip::BitMask<OptionsBitmap> optionsOverride,
16241624
bool isEnhanced)
16251625
{
16261626
MATTER_TRACE_SCOPE("stepHue", "ColorControl");
@@ -1820,8 +1820,8 @@ bool ColorControlServer::stepSaturationCommand(app::CommandHandler * commandObj,
18201820
auto stepMode = commandData.stepMode;
18211821
uint8_t stepSize = commandData.stepSize;
18221822
uint8_t transitionTime = commandData.transitionTime;
1823-
chip::BitMask<chip::app::Clusters::ColorControl::OptionsBitmap> optionsMask = commandData.optionsMask;
1824-
chip::BitMask<chip::app::Clusters::ColorControl::OptionsBitmap> optionsOverride = commandData.optionsOverride;
1823+
chip::BitMask<OptionsBitmap> optionsMask = commandData.optionsMask;
1824+
chip::BitMask<OptionsBitmap> optionsOverride = commandData.optionsOverride;
18251825
EndpointId endpoint = commandPath.mEndpointId;
18261826
Status status = Status::Success;
18271827
uint8_t currentSaturation = 0;
@@ -1886,8 +1886,8 @@ bool ColorControlServer::colorLoopCommand(app::CommandHandler * commandObj, cons
18861886
auto direction = commandData.direction;
18871887
uint16_t time = commandData.time;
18881888
uint16_t startHue = commandData.startHue;
1889-
chip::BitMask<chip::app::Clusters::ColorControl::OptionsBitmap> optionsMask = commandData.optionsMask;
1890-
chip::BitMask<chip::app::Clusters::ColorControl::OptionsBitmap> optionsOverride = commandData.optionsOverride;
1889+
chip::BitMask<OptionsBitmap> optionsMask = commandData.optionsMask;
1890+
chip::BitMask<OptionsBitmap> optionsOverride = commandData.optionsOverride;
18911891
EndpointId endpoint = commandPath.mEndpointId;
18921892
Status status = Status::Success;
18931893
uint8_t isColorLoopActive = 0;
@@ -2214,8 +2214,8 @@ bool ColorControlServer::moveColorCommand(app::CommandHandler * commandObj, cons
22142214
{
22152215
int16_t rateX = commandData.rateX;
22162216
int16_t rateY = commandData.rateY;
2217-
chip::BitMask<chip::app::Clusters::ColorControl::OptionsBitmap> optionsMask = commandData.optionsMask;
2218-
chip::BitMask<chip::app::Clusters::ColorControl::OptionsBitmap> optionsOverride = commandData.optionsOverride;
2217+
chip::BitMask<OptionsBitmap> optionsMask = commandData.optionsMask;
2218+
chip::BitMask<OptionsBitmap> optionsOverride = commandData.optionsOverride;
22192219
EndpointId endpoint = commandPath.mEndpointId;
22202220
Status status = Status::Success;
22212221

@@ -2310,8 +2310,8 @@ bool ColorControlServer::stepColorCommand(app::CommandHandler * commandObj, cons
23102310
int16_t stepX = commandData.stepX;
23112311
int16_t stepY = commandData.stepY;
23122312
uint16_t transitionTime = commandData.transitionTime;
2313-
chip::BitMask<chip::app::Clusters::ColorControl::OptionsBitmap> optionsMask = commandData.optionsMask;
2314-
chip::BitMask<chip::app::Clusters::ColorControl::OptionsBitmap> optionsOverride = commandData.optionsOverride;
2313+
chip::BitMask<OptionsBitmap> optionsMask = commandData.optionsMask;
2314+
chip::BitMask<OptionsBitmap> optionsOverride = commandData.optionsOverride;
23152315
EndpointId endpoint = commandPath.mEndpointId;
23162316
uint16_t currentColorX = 0;
23172317
uint16_t currentColorY = 0;
@@ -2566,7 +2566,7 @@ void ColorControlServer::startUpColorTempCommand(EndpointId endpoint)
25662566
if (status == Status::Success)
25672567
{
25682568
// Set ColorMode attributes to reflect ColorTemperature.
2569-
ColorControl::ColorModeEnum updateColorMode = ColorControl::ColorModeEnum::kColorTemperatureMireds;
2569+
auto updateColorMode = ColorControl::ColorModeEnum::kColorTemperatureMireds;
25702570
Attributes::ColorMode::Set(endpoint, updateColorMode);
25712571

25722572
Attributes::EnhancedColorMode::Set(endpoint, static_cast<ColorControl::EnhancedColorModeEnum>(updateColorMode));
@@ -2643,8 +2643,8 @@ bool ColorControlServer::moveColorTempCommand(app::CommandHandler * commandObj,
26432643
uint16_t rate = commandData.rate;
26442644
uint16_t colorTemperatureMinimum = commandData.colorTemperatureMinimumMireds;
26452645
uint16_t colorTemperatureMaximum = commandData.colorTemperatureMaximumMireds;
2646-
chip::BitMask<chip::app::Clusters::ColorControl::OptionsBitmap> optionsMask = commandData.optionsMask;
2647-
chip::BitMask<chip::app::Clusters::ColorControl::OptionsBitmap> optionsOverride = commandData.optionsOverride;
2646+
chip::BitMask<OptionsBitmap> optionsMask = commandData.optionsMask;
2647+
chip::BitMask<OptionsBitmap> optionsOverride = commandData.optionsOverride;
26482648
EndpointId endpoint = commandPath.mEndpointId;
26492649
Status status = Status::Success;
26502650
uint16_t tempPhysicalMin = MIN_TEMPERATURE_VALUE;
@@ -2766,8 +2766,8 @@ bool ColorControlServer::stepColorTempCommand(app::CommandHandler * commandObj,
27662766
uint16_t transitionTime = commandData.transitionTime;
27672767
uint16_t colorTemperatureMinimum = commandData.colorTemperatureMinimumMireds;
27682768
uint16_t colorTemperatureMaximum = commandData.colorTemperatureMaximumMireds;
2769-
chip::BitMask<chip::app::Clusters::ColorControl::OptionsBitmap> optionsMask = commandData.optionsMask;
2770-
chip::BitMask<chip::app::Clusters::ColorControl::OptionsBitmap> optionsOverride = commandData.optionsOverride;
2769+
chip::BitMask<OptionsBitmap> optionsMask = commandData.optionsMask;
2770+
chip::BitMask<OptionsBitmap> optionsOverride = commandData.optionsOverride;
27712771
EndpointId endpoint = commandPath.mEndpointId;
27722772
Status status = Status::Success;
27732773
uint16_t tempPhysicalMin = MIN_TEMPERATURE_VALUE;
@@ -2896,7 +2896,7 @@ void ColorControlServer::levelControlColorTempChangeCommand(EndpointId endpoint)
28962896
return;
28972897
}
28982898

2899-
ColorControl::ColorModeEnum colorMode = ColorControl::ColorModeEnum::kCurrentHueAndCurrentSaturation;
2899+
auto colorMode = ColorControl::ColorModeEnum::kCurrentHueAndCurrentSaturation;
29002900
Attributes::ColorMode::Get(endpoint, &colorMode);
29012901

29022902
if (static_cast<ColorControl::EnhancedColorModeEnum>(colorMode) == ColorControl::EnhancedColorModeEnum::kColorTemperatureMireds)

‎src/app/common/CompatEnumNames.h

-1
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,6 @@ using LevelControlOptions = OptionsBitmap;
8383
namespace ColorControl {
8484
// https://github.com/project-chip/connectedhomeip/pull/33612 renamed this
8585
using ColorMode = ColorModeEnum;
86-
using ColorTemperature = ColorTemperatureMireds;
8786
using ColorCapabilities = ColorCapabilitiesBitmap;
8887
using ColorLoopUpdateFlags = UpdateFlagsBitmap;
8988
using ColorLoopAction = ColorLoopActionEnum;

0 commit comments

Comments
 (0)