Skip to content

Commit dfc992b

Browse files
committed
build error resolved
1 parent d59e2b6 commit dfc992b

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

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

+8-8
Original file line numberDiff line numberDiff line change
@@ -123,10 +123,10 @@ class DefaultColorControlSceneHandler : public scenes::DefaultSceneHandlerImpl
123123
}
124124
AddAttributeValuePair(pairs, Attributes::ColorLoopActive::Id, loopActiveValue, attributeCount);
125125

126-
ColorControl::ColorLoopDirectionEnum loopDirectionValue;
126+
uint8_t loopDirectionValue;
127127
if (Status::Success != Attributes::ColorLoopDirection::Get(endpoint, &loopDirectionValue))
128128
{
129-
loopDirectionValue = ColorControl::ColorLoopDirectionEnum::kDecrement;
129+
loopDirectionValue = 0x00;
130130
}
131131
AddAttributeValuePair(pairs, Attributes::ColorLoopDirection::Id, static_cast<uint32_t>(loopDirectionValue),
132132
attributeCount);
@@ -201,7 +201,7 @@ class DefaultColorControlSceneHandler : public scenes::DefaultSceneHandlerImpl
201201
// Initialize action attributes to default values in case they are not in the scene
202202
ColorControl::EnhancedColorModeEnum targetColorMode = ColorControl::EnhancedColorModeEnum::kCurrentHueAndCurrentSaturation;
203203
uint8_t loopActiveValue = 0x00;
204-
ColorControl::ColorLoopDirectionEnum loopDirectionValue = ColorControl::ColorLoopDirectionEnum::kDecrement;
204+
uint8_t loopDirectionValue = 0x00;
205205
uint16_t loopTimeValue = 0x0019; // Default loop time value according to spec
206206

207207
while (pair_iterator.Next())
@@ -242,7 +242,7 @@ class DefaultColorControlSceneHandler : public scenes::DefaultSceneHandlerImpl
242242
loopActiveValue = static_cast<uint8_t>(decodePair.attributeValue);
243243
break;
244244
case Attributes::ColorLoopDirection::Id:
245-
loopDirectionValue = static_cast<ColorControl::ColorLoopDirectionEnum>(decodePair.attributeValue);
245+
loopDirectionValue = static_cast<uint8_t>(decodePair.attributeValue);
246246
break;
247247
case Attributes::ColorLoopTime::Id:
248248
loopTimeValue = static_cast<uint16_t>(decodePair.attributeValue);
@@ -934,7 +934,7 @@ void ColorControlServer::startColorLoop(EndpointId endpoint, uint8_t startFromSt
934934
ColorHueTransitionState * colorHueTransitionState = getColorHueTransitionState(endpoint);
935935
VerifyOrReturn(colorHueTransitionState != nullptr);
936936

937-
ColorControl::ColorLoopDirectionEnum direction = ColorControl::ColorLoopDirectionEnum::kDecrement;
937+
uint8_t direction = 0;
938938
Attributes::ColorLoopDirection::Get(endpoint, &direction);
939939

940940
uint16_t time = 0x0019;
@@ -957,7 +957,7 @@ void ColorControlServer::startColorLoop(EndpointId endpoint, uint8_t startFromSt
957957

958958
colorHueTransitionState->initialEnhancedHue = startHue;
959959

960-
if (direction == ColorLoopDirectionEnum::kIncrement)
960+
if (direction == to_underlying(ColorLoopDirectionEnum::kIncrement))
961961
{
962962
colorHueTransitionState->finalEnhancedHue = static_cast<uint16_t>(startHue - 1);
963963
}
@@ -966,7 +966,7 @@ void ColorControlServer::startColorLoop(EndpointId endpoint, uint8_t startFromSt
966966
colorHueTransitionState->finalEnhancedHue = static_cast<uint16_t>(startHue + 1);
967967
}
968968

969-
colorHueTransitionState->up = (direction == ColorLoopDirectionEnum::kIncrement);
969+
colorHueTransitionState->up = (direction == to_underlying(ColorLoopDirectionEnum::kIncrement));
970970
colorHueTransitionState->repeat = true;
971971

972972
colorHueTransitionState->stepsRemaining = static_cast<uint16_t>(time * TRANSITION_STEPS_PER_1S);
@@ -1904,7 +1904,7 @@ bool ColorControlServer::colorLoopCommand(app::CommandHandler * commandObj, cons
19041904

19051905
if (updateFlags.Has(UpdateFlagsBitmap::kUpdateDirection))
19061906
{
1907-
Attributes::ColorLoopDirection::Set(endpoint, direction);
1907+
Attributes::ColorLoopDirection::Set(endpoint, to_underlying(direction));
19081908

19091909
// Checks if color loop is active and stays active
19101910
if (isColorLoopActive && !deactiveColorLoop)

0 commit comments

Comments
 (0)