Skip to content

Commit 94e193c

Browse files
committed
addressed reviews comments and build error resolved
1 parent 33e5398 commit 94e193c

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

examples/lighting-app/tizen/src/DBusInterface.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,7 @@ void DBusInterface::InitOnOff()
217217
void DBusInterface::InitColor()
218218
{
219219
{
220-
auto value = Clusters::ColorModeEnum::kCurrentHueAndCurrentSaturation;
220+
auto value = Clusters::ColorControl::ColorModeEnum::kCurrentHueAndCurrentSaturation;
221221
auto status = Clusters::ColorControl::Attributes::ColorMode::Get(mEndpointId, &value);
222222
VerifyOrReturn(status == Protocols::InteractionModel::Status::Success,
223223
ChipLogError(NotSpecified, "Error getting ColorMode: 0x%x", to_underlying(status)));

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

+5-5
Original file line numberDiff line numberDiff line change
@@ -268,7 +268,7 @@ class DefaultColorControlSceneHandler : public scenes::DefaultSceneHandlerImpl
268268
VerifyOrReturnError(decodePair.valueUnsigned8.HasValue(), CHIP_ERROR_INVALID_ARGUMENT);
269269
if (decodePair.valueUnsigned8.Value() <= to_underlying(EnhancedColorMode::kEnhancedCurrentHueAndCurrentSaturation))
270270
{
271-
targetColorMode = static_cast<EnhancedColorMode>(decodePair.valueUnsigned8.Value());
271+
targetColorMode = static_cast<EnhancedColorModeEnum>(decodePair.valueUnsigned8.Value());
272272
}
273273
break;
274274
default:
@@ -582,14 +582,14 @@ bool ColorControlServer::shouldExecuteIfOff(EndpointId endpoint, BitMask<Options
582582
* @param endpoint
583583
* @param newColorMode
584584
*/
585-
void ColorControlServer::handleModeSwitch(EndpointId endpoint, EnhancedColorMode newColorMode)
585+
void ColorControlServer::handleModeSwitch(EndpointId endpoint, EnhancedColorModeEnum newColorMode)
586586
{
587587
auto oldColorMode = ColorModeEnum::kCurrentHueAndCurrentSaturation;
588588
Attributes::ColorMode::Get(endpoint, &oldColorMode);
589589

590590
uint8_t colorModeTransition;
591591

592-
if (oldColorMode == static_cast<ColorModeEnum>(newColorMode))
592+
if (static_cast<EnhancedColorModeEnum>(oldColorMode) == newColorMode)
593593
{
594594
return;
595595
}
@@ -2705,7 +2705,7 @@ void ColorControlServer::startUpColorTempCommand(EndpointId endpoint)
27052705
auto updateColorMode = ColorModeEnum::kColorTemperatureMireds;
27062706
Attributes::ColorMode::Set(endpoint, updateColorMode);
27072707

2708-
Attributes::EnhancedColorMode::Set(endpoint, static_cast<EnhancedColorMode>(updateColorMode));
2708+
Attributes::EnhancedColorMode::Set(endpoint, static_cast<EnhancedColorModeEnum>(updateColorMode));
27092709
}
27102710
}
27112711
}
@@ -3038,7 +3038,7 @@ void ColorControlServer::levelControlColorTempChangeCommand(EndpointId endpoint)
30383038
auto colorMode = ColorModeEnum::kCurrentHueAndCurrentSaturation;
30393039
Attributes::ColorMode::Get(endpoint, &colorMode);
30403040

3041-
if (static_cast<EnhancedColorMode>(colorMode) == EnhancedColorMode::kColorTemperatureMireds)
3041+
if (static_cast<EnhancedColorModeEnum>(colorMode) == EnhancedColorMode::kColorTemperatureMireds)
30423042
{
30433043
app::DataModel::Nullable<uint8_t> currentLevel;
30443044
Status status = LevelControl::Attributes::CurrentLevel::Get(endpoint, currentLevel);

0 commit comments

Comments
 (0)