Skip to content

Commit 7ee92c7

Browse files
ThirsrinThirsrin
committed
addressed review comments
1 parent b1fe920 commit 7ee92c7

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
@@ -462,8 +462,8 @@ Status ColorControlServer::stopAllColorTransitions(EndpointId endpoint)
462462
}
463463

464464
bool ColorControlServer::stopMoveStepCommand(app::CommandHandler * commandObj, const app::ConcreteCommandPath & commandPath,
465-
chip::BitMask<chip::app::Clusters::ColorControl::OptionsBitmap> optionsMask,
466-
chip::BitMask<chip::app::Clusters::ColorControl::OptionsBitmap> optionsOverride)
465+
chip::BitMask<OptionsBitmap> optionsMask,
466+
chip::BitMask<OptionsBitmap> optionsOverride)
467467
{
468468
EndpointId endpoint = commandPath.mEndpointId;
469469
Status status = Status::Success;
@@ -491,8 +491,8 @@ bool ColorControlServer::stopMoveStepCommand(app::CommandHandler * commandObj, c
491491
}
492492

493493
bool ColorControlServer::shouldExecuteIfOff(EndpointId endpoint,
494-
chip::BitMask<chip::app::Clusters::ColorControl::OptionsBitmap> optionMask,
495-
chip::BitMask<chip::app::Clusters::ColorControl::OptionsBitmap> optionOverride)
494+
chip::BitMask<OptionsBitmap> optionMask,
495+
chip::BitMask<OptionsBitmap> optionOverride)
496496
{
497497
// From 5.2.2.2.1.10 of ZCL7 document 14-0129-15f-zcl-ch-5-lighting.docx:
498498
// "Command execution SHALL NOT continue beyond the Options processing if
@@ -507,7 +507,7 @@ bool ColorControlServer::shouldExecuteIfOff(EndpointId endpoint,
507507
return true;
508508
}
509509

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

513513
bool on = true;
@@ -540,14 +540,14 @@ bool ColorControlServer::shouldExecuteIfOff(EndpointId endpoint,
540540
// 0xFF are the default values passed to the command handler when
541541
// the payload is not present - in that case there is use of option
542542
// attribute to decide execution of the command
543-
return options.GetField(ColorControl::OptionsBitmap::kExecuteIfOff);
543+
return options.Has(ColorControl::OptionsBitmap::kExecuteIfOff);
544544
}
545545
// ---------- The above is to distinguish if the payload is present or not
546546

547547
if (optionMask.Has(ColorControl::OptionsBitmap::kExecuteIfOff))
548548
{
549549
// Mask is present and set in the command payload, this indicates
550-
// use the over ride as temporary option
550+
// use the override as temporary option
551551
return optionOverride.Has(ColorControl::OptionsBitmap::kExecuteIfOff);
552552
}
553553
// if we are here - use the option bits
@@ -1358,8 +1358,8 @@ Status ColorControlServer::moveToHueAndSaturation(uint16_t hue, uint8_t saturati
13581358
*/
13591359
bool ColorControlServer::moveHueCommand(app::CommandHandler * commandObj, const app::ConcreteCommandPath & commandPath,
13601360
MoveModeEnum moveMode, uint16_t rate,
1361-
chip::BitMask<chip::app::Clusters::ColorControl::OptionsBitmap> optionsMask,
1362-
chip::BitMask<chip::app::Clusters::ColorControl::OptionsBitmap> optionsOverride,
1361+
chip::BitMask<OptionsBitmap> optionsMask,
1362+
chip::BitMask<OptionsBitmap> optionsOverride,
13631363
bool isEnhanced)
13641364
{
13651365
MATTER_TRACE_SCOPE("moveHue", "ColorControl");
@@ -1466,8 +1466,8 @@ bool ColorControlServer::moveHueCommand(app::CommandHandler * commandObj, const
14661466
*/
14671467
bool ColorControlServer::moveToHueCommand(app::CommandHandler * commandObj, const app::ConcreteCommandPath & commandPath,
14681468
uint16_t hue, DirectionEnum moveDirection, uint16_t transitionTime,
1469-
chip::BitMask<chip::app::Clusters::ColorControl::OptionsBitmap> optionsMask,
1470-
chip::BitMask<chip::app::Clusters::ColorControl::OptionsBitmap> optionsOverride,
1469+
chip::BitMask<OptionsBitmap> optionsMask,
1470+
chip::BitMask<OptionsBitmap> optionsOverride,
14711471
bool isEnhanced)
14721472
{
14731473
MATTER_TRACE_SCOPE("moveToHue", "ColorControl");
@@ -1602,8 +1602,8 @@ bool ColorControlServer::moveToHueCommand(app::CommandHandler * commandObj, cons
16021602
*/
16031603
bool ColorControlServer::moveToHueAndSaturationCommand(
16041604
app::CommandHandler * commandObj, const app::ConcreteCommandPath & commandPath, uint16_t hue, uint8_t saturation,
1605-
uint16_t transitionTime, chip::BitMask<chip::app::Clusters::ColorControl::OptionsBitmap> optionsMask,
1606-
chip::BitMask<chip::app::Clusters::ColorControl::OptionsBitmap> optionsOverride, bool isEnhanced)
1605+
uint16_t transitionTime, chip::BitMask<OptionsBitmap> optionsMask,
1606+
chip::BitMask<OptionsBitmap> optionsOverride, bool isEnhanced)
16071607
{
16081608
MATTER_TRACE_SCOPE("moveToHueAndSaturation", "ColorControl");
16091609
// limit checking: hue and saturation are 0..254. Spec dictates we ignore
@@ -1643,8 +1643,8 @@ bool ColorControlServer::moveToHueAndSaturationCommand(
16431643
*/
16441644
bool ColorControlServer::stepHueCommand(app::CommandHandler * commandObj, const app::ConcreteCommandPath & commandPath,
16451645
StepModeEnum stepMode, uint16_t stepSize, uint16_t transitionTime,
1646-
chip::BitMask<chip::app::Clusters::ColorControl::OptionsBitmap> optionsMask,
1647-
chip::BitMask<chip::app::Clusters::ColorControl::OptionsBitmap> optionsOverride,
1646+
chip::BitMask<OptionsBitmap> optionsMask,
1647+
chip::BitMask<OptionsBitmap> optionsOverride,
16481648
bool isEnhanced)
16491649
{
16501650
MATTER_TRACE_SCOPE("stepHue", "ColorControl");
@@ -1844,8 +1844,8 @@ bool ColorControlServer::stepSaturationCommand(app::CommandHandler * commandObj,
18441844
auto stepMode = commandData.stepMode;
18451845
uint8_t stepSize = commandData.stepSize;
18461846
uint8_t transitionTime = commandData.transitionTime;
1847-
chip::BitMask<chip::app::Clusters::ColorControl::OptionsBitmap> optionsMask = commandData.optionsMask;
1848-
chip::BitMask<chip::app::Clusters::ColorControl::OptionsBitmap> optionsOverride = commandData.optionsOverride;
1847+
chip::BitMask<OptionsBitmap> optionsMask = commandData.optionsMask;
1848+
chip::BitMask<OptionsBitmap> optionsOverride = commandData.optionsOverride;
18491849
EndpointId endpoint = commandPath.mEndpointId;
18501850
Status status = Status::Success;
18511851
uint8_t currentSaturation = 0;
@@ -1910,8 +1910,8 @@ bool ColorControlServer::colorLoopCommand(app::CommandHandler * commandObj, cons
19101910
auto direction = commandData.direction;
19111911
uint16_t time = commandData.time;
19121912
uint16_t startHue = commandData.startHue;
1913-
chip::BitMask<chip::app::Clusters::ColorControl::OptionsBitmap> optionsMask = commandData.optionsMask;
1914-
chip::BitMask<chip::app::Clusters::ColorControl::OptionsBitmap> optionsOverride = commandData.optionsOverride;
1913+
chip::BitMask<OptionsBitmap> optionsMask = commandData.optionsMask;
1914+
chip::BitMask<OptionsBitmap> optionsOverride = commandData.optionsOverride;
19151915
EndpointId endpoint = commandPath.mEndpointId;
19161916
Status status = Status::Success;
19171917
uint8_t isColorLoopActive = 0;
@@ -2238,8 +2238,8 @@ bool ColorControlServer::moveColorCommand(app::CommandHandler * commandObj, cons
22382238
{
22392239
int16_t rateX = commandData.rateX;
22402240
int16_t rateY = commandData.rateY;
2241-
chip::BitMask<chip::app::Clusters::ColorControl::OptionsBitmap> optionsMask = commandData.optionsMask;
2242-
chip::BitMask<chip::app::Clusters::ColorControl::OptionsBitmap> optionsOverride = commandData.optionsOverride;
2241+
chip::BitMask<OptionsBitmap> optionsMask = commandData.optionsMask;
2242+
chip::BitMask<OptionsBitmap> optionsOverride = commandData.optionsOverride;
22432243
EndpointId endpoint = commandPath.mEndpointId;
22442244
Status status = Status::Success;
22452245

@@ -2334,8 +2334,8 @@ bool ColorControlServer::stepColorCommand(app::CommandHandler * commandObj, cons
23342334
int16_t stepX = commandData.stepX;
23352335
int16_t stepY = commandData.stepY;
23362336
uint16_t transitionTime = commandData.transitionTime;
2337-
chip::BitMask<chip::app::Clusters::ColorControl::OptionsBitmap> optionsMask = commandData.optionsMask;
2338-
chip::BitMask<chip::app::Clusters::ColorControl::OptionsBitmap> optionsOverride = commandData.optionsOverride;
2337+
chip::BitMask<OptionsBitmap> optionsMask = commandData.optionsMask;
2338+
chip::BitMask<OptionsBitmap> optionsOverride = commandData.optionsOverride;
23392339
EndpointId endpoint = commandPath.mEndpointId;
23402340
uint16_t currentColorX = 0;
23412341
uint16_t currentColorY = 0;
@@ -2590,7 +2590,7 @@ void ColorControlServer::startUpColorTempCommand(EndpointId endpoint)
25902590
if (status == Status::Success)
25912591
{
25922592
// Set ColorMode attributes to reflect ColorTemperature.
2593-
ColorControl::ColorModeEnum updateColorMode = ColorControl::ColorModeEnum::kColorTemperatureMireds;
2593+
auto updateColorMode = ColorControl::ColorModeEnum::kColorTemperatureMireds;
25942594
Attributes::ColorMode::Set(endpoint, updateColorMode);
25952595

25962596
Attributes::EnhancedColorMode::Set(endpoint, static_cast<ColorControl::EnhancedColorModeEnum>(updateColorMode));
@@ -2667,8 +2667,8 @@ bool ColorControlServer::moveColorTempCommand(app::CommandHandler * commandObj,
26672667
uint16_t rate = commandData.rate;
26682668
uint16_t colorTemperatureMinimum = commandData.colorTemperatureMinimumMireds;
26692669
uint16_t colorTemperatureMaximum = commandData.colorTemperatureMaximumMireds;
2670-
chip::BitMask<chip::app::Clusters::ColorControl::OptionsBitmap> optionsMask = commandData.optionsMask;
2671-
chip::BitMask<chip::app::Clusters::ColorControl::OptionsBitmap> optionsOverride = commandData.optionsOverride;
2670+
chip::BitMask<OptionsBitmap> optionsMask = commandData.optionsMask;
2671+
chip::BitMask<OptionsBitmap> optionsOverride = commandData.optionsOverride;
26722672
EndpointId endpoint = commandPath.mEndpointId;
26732673
Status status = Status::Success;
26742674
uint16_t tempPhysicalMin = MIN_TEMPERATURE_VALUE;
@@ -2790,8 +2790,8 @@ bool ColorControlServer::stepColorTempCommand(app::CommandHandler * commandObj,
27902790
uint16_t transitionTime = commandData.transitionTime;
27912791
uint16_t colorTemperatureMinimum = commandData.colorTemperatureMinimumMireds;
27922792
uint16_t colorTemperatureMaximum = commandData.colorTemperatureMaximumMireds;
2793-
chip::BitMask<chip::app::Clusters::ColorControl::OptionsBitmap> optionsMask = commandData.optionsMask;
2794-
chip::BitMask<chip::app::Clusters::ColorControl::OptionsBitmap> optionsOverride = commandData.optionsOverride;
2793+
chip::BitMask<OptionsBitmap> optionsMask = commandData.optionsMask;
2794+
chip::BitMask<OptionsBitmap> optionsOverride = commandData.optionsOverride;
27952795
EndpointId endpoint = commandPath.mEndpointId;
27962796
Status status = Status::Success;
27972797
uint16_t tempPhysicalMin = MIN_TEMPERATURE_VALUE;
@@ -2920,7 +2920,7 @@ void ColorControlServer::levelControlColorTempChangeCommand(EndpointId endpoint)
29202920
return;
29212921
}
29222922

2923-
ColorControl::ColorModeEnum colorMode = ColorControl::ColorModeEnum::kCurrentHueAndCurrentSaturation;
2923+
auto colorMode = ColorControl::ColorModeEnum::kCurrentHueAndCurrentSaturation;
29242924
Attributes::ColorMode::Get(endpoint, &colorMode);
29252925

29262926
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)