Skip to content

Commit d820f46

Browse files
committed
build error resolved
1 parent 934bbf0 commit d820f46

File tree

1 file changed

+16
-16
lines changed

1 file changed

+16
-16
lines changed

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

+16-16
Original file line numberDiff line numberDiff line change
@@ -1020,7 +1020,7 @@ void ColorControlServer::startColorLoop(EndpointId endpoint, uint8_t startFromSt
10201020

10211021
colorHueTransitionState->initialEnhancedHue = startHue;
10221022

1023-
if (direction == to_underlying(ColorLoopDirection::IncrementHue))
1023+
if (direction == to_underlying(ColorLoopDirectionEnum::kIncrement))
10241024
{
10251025
colorHueTransitionState->finalEnhancedHue = static_cast<uint16_t>(startHue - 1);
10261026
}
@@ -1029,7 +1029,7 @@ void ColorControlServer::startColorLoop(EndpointId endpoint, uint8_t startFromSt
10291029
colorHueTransitionState->finalEnhancedHue = static_cast<uint16_t>(startHue + 1);
10301030
}
10311031

1032-
colorHueTransitionState->up = (direction == to_underlying(ColorLoopDirection::IncrementHue));
1032+
colorHueTransitionState->up = (direction == to_underlying(ColorLoopDirectionEnum::kIncrement));
10331033
colorHueTransitionState->repeat = true;
10341034

10351035
colorHueTransitionState->stepsRemaining = static_cast<uint16_t>(time * TRANSITION_STEPS_PER_1S);
@@ -1507,7 +1507,7 @@ bool ColorControlServer::moveHueCommand(app::CommandHandler * commandObj, const
15071507
* @return false Failed
15081508
*/
15091509
bool ColorControlServer::moveToHueCommand(app::CommandHandler * commandObj, const app::ConcreteCommandPath & commandPath,
1510-
uint16_t hue, HueDirection moveDirection, uint16_t transitionTime,
1510+
uint16_t hue, DirectionEnum moveDirection, uint16_t transitionTime,
15111511
BitMask<OptionsBitmap> optionsMask, BitMask<OptionsBitmap> optionsOverride,
15121512
bool isEnhanced)
15131513
{
@@ -1516,7 +1516,7 @@ bool ColorControlServer::moveToHueCommand(app::CommandHandler * commandObj, cons
15161516

15171517
Status status = Status::Success;
15181518
uint16_t currentHue = 0;
1519-
HueDirection direction;
1519+
DirectionEnum direction;
15201520

15211521
ColorHueTransitionState * colorHueTransitionState = getColorHueTransitionState(endpoint);
15221522

@@ -1545,33 +1545,33 @@ bool ColorControlServer::moveToHueCommand(app::CommandHandler * commandObj, cons
15451545
// Convert the ShortestDistance/LongestDistance moveDirection values into Up/Down.
15461546
switch (moveDirection)
15471547
{
1548-
case HueDirection::kShortest:
1548+
case DirectionEnum::kShortest:
15491549
if ((isEnhanced && (static_cast<uint16_t>(currentHue - hue) > HALF_MAX_UINT16T)) ||
15501550
(!isEnhanced && (static_cast<uint8_t>(currentHue - hue) > HALF_MAX_UINT8T)))
15511551
{
1552-
direction = HueDirection::kUp;
1552+
direction = DirectionEnum::kUp;
15531553
}
15541554
else
15551555
{
1556-
direction = HueDirection::kDown;
1556+
direction = DirectionEnum::kDown;
15571557
}
15581558
break;
1559-
case HueDirection::kLongest:
1559+
case DirectionEnum::kLongest:
15601560
if ((isEnhanced && (static_cast<uint16_t>(currentHue - hue) > HALF_MAX_UINT16T)) ||
15611561
(!isEnhanced && (static_cast<uint8_t>(currentHue - hue) > HALF_MAX_UINT8T)))
15621562
{
1563-
direction = HueDirection::kDown;
1563+
direction = DirectionEnum::kDown;
15641564
}
15651565
else
15661566
{
1567-
direction = HueDirection::kUp;
1567+
direction = DirectionEnum::kUp;
15681568
}
15691569
break;
1570-
case HueDirection::kUp:
1571-
case HueDirection::kDown:
1570+
case DirectionEnum::kUp:
1571+
case DirectionEnum::kDown:
15721572
direction = moveDirection;
15731573
break;
1574-
case HueDirection::kUnknownEnumValue:
1574+
case DirectionEnum::kUnknownEnumValue:
15751575
commandObj->AddStatus(commandPath, Status::InvalidCommand);
15761576
return true;
15771577
/* No default case, so if a new direction value gets added we will just fail
@@ -1614,7 +1614,7 @@ bool ColorControlServer::moveToHueCommand(app::CommandHandler * commandObj, cons
16141614
colorHueTransitionState->timeRemaining = transitionTime;
16151615
colorHueTransitionState->transitionTime = transitionTime;
16161616
colorHueTransitionState->endpoint = endpoint;
1617-
colorHueTransitionState->up = (direction == HueDirection::kUp);
1617+
colorHueTransitionState->up = (direction == DirectionEnum::kUp);
16181618
colorHueTransitionState->repeat = false;
16191619

16201620
SetHSVRemainingTime(endpoint);
@@ -1995,10 +1995,10 @@ bool ColorControlServer::colorLoopCommand(app::CommandHandler * commandObj, cons
19951995
// Checks if color loop is active and stays active
19961996
if (isColorLoopActive && !deactiveColorLoop)
19971997
{
1998-
colorHueTransitionState->up = (direction == ColorLoopDirection::kIncrement);
1998+
colorHueTransitionState->up = (direction == ColorLoopDirectionEnum::kIncrement);
19991999
colorHueTransitionState->initialEnhancedHue = colorHueTransitionState->currentEnhancedHue;
20002000

2001-
if (direction == ColorLoopDirection::kIncrement)
2001+
if (direction == ColorLoopDirectionEnum::kIncrement)
20022002
{
20032003
colorHueTransitionState->finalEnhancedHue = static_cast<uint16_t>(colorHueTransitionState->initialEnhancedHue - 1);
20042004
}

0 commit comments

Comments
 (0)