Skip to content

Commit 403d493

Browse files
ThirsrinThirsrin
committed
resolved build errors
1 parent e8722c7 commit 403d493

File tree

2 files changed

+29
-29
lines changed

2 files changed

+29
-29
lines changed

‎examples/all-clusters-app/ameba/main/include/ColorControlCommands.h

+23-23
Original file line numberDiff line numberDiff line change
@@ -360,7 +360,7 @@ void ProcessColorControlUnicastBindingCommand(BindingCommandData * data, const E
360360
{
361361
case Clusters::ColorControl::Commands::MoveToHue::Id:
362362
moveToHueCommand.hue = static_cast<uint8_t>(data->args[0]);
363-
moveToHueCommand.direction = static_cast<HueDirection>(data->args[1]);
363+
moveToHueCommand.direction = static_cast<DirectionEnum>(data->args[1]);
364364
moveToHueCommand.transitionTime = static_cast<uint16_t>(data->args[2]);
365365
moveToHueCommand.optionsMask = static_cast<uint8_t>(data->args[3]);
366366
moveToHueCommand.optionsOverride = static_cast<uint8_t>(data->args[4]);
@@ -369,7 +369,7 @@ void ProcessColorControlUnicastBindingCommand(BindingCommandData * data, const E
369369
break;
370370

371371
case Clusters::ColorControl::Commands::MoveHue::Id:
372-
moveHueCommand.moveMode = static_cast<HueMoveMode>(data->args[0]);
372+
moveHueCommand.moveMode = static_cast<MoveModeEnum>(data->args[0]);
373373
moveHueCommand.rate = static_cast<uint8_t>(data->args[1]);
374374
moveHueCommand.optionsMask = static_cast<uint8_t>(data->args[2]);
375375
moveHueCommand.optionsOverride = static_cast<uint8_t>(data->args[3]);
@@ -378,7 +378,7 @@ void ProcessColorControlUnicastBindingCommand(BindingCommandData * data, const E
378378
break;
379379

380380
case Clusters::ColorControl::Commands::StepHue::Id:
381-
stepHueCommand.stepMode = static_cast<HueStepMode>(data->args[0]);
381+
stepHueCommand.stepMode = static_cast<StepModeEnum>(data->args[0]);
382382
stepHueCommand.stepSize = static_cast<uint8_t>(data->args[1]);
383383
stepHueCommand.transitionTime = static_cast<uint8_t>(data->args[2]);
384384
stepHueCommand.optionsMask = static_cast<uint8_t>(data->args[3]);
@@ -397,7 +397,7 @@ void ProcessColorControlUnicastBindingCommand(BindingCommandData * data, const E
397397
break;
398398

399399
case Clusters::ColorControl::Commands::MoveSaturation::Id:
400-
moveSaturationCommand.moveMode = static_cast<SaturationMoveMode>(data->args[0]);
400+
moveSaturationCommand.moveMode = static_cast<MoveModeEnum>(data->args[0]);
401401
moveSaturationCommand.rate = static_cast<uint8_t>(data->args[1]);
402402
moveSaturationCommand.optionsMask = static_cast<uint8_t>(data->args[2]);
403403
moveSaturationCommand.optionsOverride = static_cast<uint8_t>(data->args[3]);
@@ -406,7 +406,7 @@ void ProcessColorControlUnicastBindingCommand(BindingCommandData * data, const E
406406
break;
407407

408408
case Clusters::ColorControl::Commands::StepSaturation::Id:
409-
stepSaturationCommand.stepMode = static_cast<SaturationStepMode>(data->args[0]);
409+
stepSaturationCommand.stepMode = static_cast<StepModeEnum>(data->args[0]);
410410
stepSaturationCommand.stepSize = static_cast<uint8_t>(data->args[1]);
411411
stepSaturationCommand.transitionTime = static_cast<uint8_t>(data->args[2]);
412412
stepSaturationCommand.optionsMask = static_cast<uint8_t>(data->args[3]);
@@ -504,9 +504,9 @@ void ProcessColorControlUnicastBindingCommand(BindingCommandData * data, const E
504504

505505
case Clusters::ColorControl::Commands::ColorLoopSet::Id:
506506
colorLoopSetCommand.updateFlags =
507-
static_cast<chip::BitMask<chip::app::Clusters::ColorControl::ColorLoopUpdateFlags>>(data->args[0]);
508-
colorLoopSetCommand.action = static_cast<ColorLoopAction>(data->args[1]);
509-
colorLoopSetCommand.direction = static_cast<ColorLoopDirection>(data->args[2]);
507+
static_cast<chip::BitMask<chip::app::Clusters::ColorControl::UpdateFlagsBitmap>>(data->args[0]);
508+
colorLoopSetCommand.action = static_cast<ColorLoopActionEnum>(data->args[1]);
509+
colorLoopSetCommand.direction = static_cast<ColorLoopDirectionEnum>(data->args[2]);
510510
colorLoopSetCommand.time = static_cast<uint16_t>(data->args[3]);
511511
colorLoopSetCommand.startHue = static_cast<uint16_t>(data->args[4]);
512512
colorLoopSetCommand.optionsMask = static_cast<uint8_t>(data->args[5]);
@@ -523,7 +523,7 @@ void ProcessColorControlUnicastBindingCommand(BindingCommandData * data, const E
523523
break;
524524

525525
case Clusters::ColorControl::Commands::MoveColorTemperature::Id:
526-
moveColorTemperatureCommand.moveMode = static_cast<HueMoveMode>(data->args[0]);
526+
moveColorTemperatureCommand.moveMode = static_cast<MoveModeEnum>(data->args[0]);
527527
moveColorTemperatureCommand.rate = static_cast<uint16_t>(data->args[1]);
528528
moveColorTemperatureCommand.colorTemperatureMinimumMireds = static_cast<uint16_t>(data->args[2]);
529529
moveColorTemperatureCommand.colorTemperatureMaximumMireds = static_cast<uint16_t>(data->args[3]);
@@ -534,7 +534,7 @@ void ProcessColorControlUnicastBindingCommand(BindingCommandData * data, const E
534534
break;
535535

536536
case Clusters::ColorControl::Commands::StepColorTemperature::Id:
537-
stepColorTemperatureCommand.stepMode = static_cast<HueStepMode>(data->args[0]);
537+
stepColorTemperatureCommand.stepMode = static_cast<StepModeEnum>(data->args[0]);
538538
stepColorTemperatureCommand.stepSize = static_cast<uint16_t>(data->args[1]);
539539
stepColorTemperatureCommand.transitionTime = static_cast<uint16_t>(data->args[2]);
540540
stepColorTemperatureCommand.colorTemperatureMinimumMireds = static_cast<uint16_t>(data->args[3]);
@@ -577,23 +577,23 @@ void ProcessColorControlGroupBindingCommand(BindingCommandData * data, const Emb
577577
{
578578
case Clusters::ColorControl::Commands::MoveToHue::Id:
579579
moveToHueCommand.hue = static_cast<uint8_t>(data->args[0]);
580-
moveToHueCommand.direction = static_cast<HueDirection>(data->args[1]);
580+
moveToHueCommand.direction = static_cast<DirectionEnum>(data->args[1]);
581581
moveToHueCommand.transitionTime = static_cast<uint16_t>(data->args[2]);
582582
moveToHueCommand.optionsMask = static_cast<uint8_t>(data->args[3]);
583583
moveToHueCommand.optionsOverride = static_cast<uint8_t>(data->args[4]);
584584
Controller::InvokeGroupCommandRequest(&exchangeMgr, binding.fabricIndex, binding.groupId, moveToHueCommand);
585585
break;
586586

587587
case Clusters::ColorControl::Commands::MoveHue::Id:
588-
moveHueCommand.moveMode = static_cast<HueMoveMode>(data->args[0]);
588+
moveHueCommand.moveMode = static_cast<MoveModeEnum>(data->args[0]);
589589
moveHueCommand.rate = static_cast<uint8_t>(data->args[1]);
590590
moveHueCommand.optionsMask = static_cast<uint8_t>(data->args[2]);
591591
moveHueCommand.optionsOverride = static_cast<uint8_t>(data->args[3]);
592592
Controller::InvokeGroupCommandRequest(&exchangeMgr, binding.fabricIndex, binding.groupId, moveHueCommand);
593593
break;
594594

595595
case Clusters::ColorControl::Commands::StepHue::Id:
596-
stepHueCommand.stepMode = static_cast<HueStepMode>(data->args[0]);
596+
stepHueCommand.stepMode = static_cast<StepModeEnum>(data->args[0]);
597597
stepHueCommand.stepSize = static_cast<uint8_t>(data->args[1]);
598598
stepHueCommand.transitionTime = static_cast<uint8_t>(data->args[2]);
599599
stepHueCommand.optionsMask = static_cast<uint8_t>(data->args[3]);
@@ -610,15 +610,15 @@ void ProcessColorControlGroupBindingCommand(BindingCommandData * data, const Emb
610610
break;
611611

612612
case Clusters::ColorControl::Commands::MoveSaturation::Id:
613-
moveSaturationCommand.moveMode = static_cast<SaturationMoveMode>(data->args[0]);
613+
moveSaturationCommand.moveMode = static_cast<MoveModeEnum>(data->args[0]);
614614
moveSaturationCommand.rate = static_cast<uint8_t>(data->args[1]);
615615
moveSaturationCommand.optionsMask = static_cast<uint8_t>(data->args[2]);
616616
moveSaturationCommand.optionsOverride = static_cast<uint8_t>(data->args[3]);
617617
Controller::InvokeGroupCommandRequest(&exchangeMgr, binding.fabricIndex, binding.groupId, moveSaturationCommand);
618618
break;
619619

620620
case Clusters::ColorControl::Commands::StepSaturation::Id:
621-
stepSaturationCommand.stepMode = static_cast<SaturationStepMode>(data->args[0]);
621+
stepSaturationCommand.stepMode = static_cast<StepModeEnum>(data->args[0]);
622622
stepSaturationCommand.stepSize = static_cast<uint8_t>(data->args[1]);
623623
stepSaturationCommand.transitionTime = static_cast<uint8_t>(data->args[2]);
624624
stepSaturationCommand.optionsMask = static_cast<uint8_t>(data->args[3]);
@@ -671,23 +671,23 @@ void ProcessColorControlGroupBindingCommand(BindingCommandData * data, const Emb
671671

672672
case Clusters::ColorControl::Commands::EnhancedMoveToHue::Id:
673673
enhancedMoveToHueCommand.enhancedHue = static_cast<uint16_t>(data->args[0]);
674-
enhancedMoveToHueCommand.direction = static_cast<HueDirection>(data->args[1]);
674+
enhancedMoveToHueCommand.direction = static_cast<DirectionEnum>(data->args[1]);
675675
enhancedMoveToHueCommand.transitionTime = static_cast<uint16_t>(data->args[2]);
676676
enhancedMoveToHueCommand.optionsMask = static_cast<uint8_t>(data->args[3]);
677677
enhancedMoveToHueCommand.optionsOverride = static_cast<uint8_t>(data->args[4]);
678678
Controller::InvokeGroupCommandRequest(&exchangeMgr, binding.fabricIndex, binding.groupId, enhancedMoveToHueCommand);
679679
break;
680680

681681
case Clusters::ColorControl::Commands::EnhancedMoveHue::Id:
682-
enhancedMoveHueCommand.moveMode = static_cast<HueMoveMode>(data->args[0]);
682+
enhancedMoveHueCommand.moveMode = static_cast<MoveModeEnum>(data->args[0]);
683683
enhancedMoveHueCommand.rate = static_cast<uint16_t>(data->args[1]);
684684
enhancedMoveHueCommand.optionsMask = static_cast<uint8_t>(data->args[2]);
685685
enhancedMoveHueCommand.optionsOverride = static_cast<uint8_t>(data->args[3]);
686686
Controller::InvokeGroupCommandRequest(&exchangeMgr, binding.fabricIndex, binding.groupId, enhancedMoveHueCommand);
687687
break;
688688

689689
case Clusters::ColorControl::Commands::EnhancedStepHue::Id:
690-
enhancedStepHueCommand.stepMode = static_cast<HueStepMode>(data->args[0]);
690+
enhancedStepHueCommand.stepMode = static_cast<StepModeEnum>(data->args[0]);
691691
enhancedStepHueCommand.stepSize = static_cast<uint16_t>(data->args[1]);
692692
enhancedStepHueCommand.transitionTime = static_cast<uint16_t>(data->args[2]);
693693
enhancedStepHueCommand.optionsMask = static_cast<uint8_t>(data->args[3]);
@@ -707,9 +707,9 @@ void ProcessColorControlGroupBindingCommand(BindingCommandData * data, const Emb
707707

708708
case Clusters::ColorControl::Commands::ColorLoopSet::Id:
709709
colorLoopSetCommand.updateFlags =
710-
static_cast<chip::BitMask<chip::app::Clusters::ColorControl::ColorLoopUpdateFlags>>(data->args[0]);
711-
colorLoopSetCommand.action = static_cast<ColorLoopAction>(data->args[1]);
712-
colorLoopSetCommand.direction = static_cast<ColorLoopDirection>(data->args[2]);
710+
static_cast<chip::BitMask<chip::app::Clusters::ColorControl::UpdateFlagsBitmap>>(data->args[0]);
711+
colorLoopSetCommand.action = static_cast<ColorLoopActionEnum>(data->args[1]);
712+
colorLoopSetCommand.direction = static_cast<ColorLoopDirectionEnum>(data->args[2]);
713713
colorLoopSetCommand.time = static_cast<uint16_t>(data->args[3]);
714714
colorLoopSetCommand.startHue = static_cast<uint16_t>(data->args[4]);
715715
colorLoopSetCommand.optionsMask = static_cast<uint8_t>(data->args[5]);
@@ -724,7 +724,7 @@ void ProcessColorControlGroupBindingCommand(BindingCommandData * data, const Emb
724724
break;
725725

726726
case Clusters::ColorControl::Commands::MoveColorTemperature::Id:
727-
moveColorTemperatureCommand.moveMode = static_cast<HueMoveMode>(data->args[0]);
727+
moveColorTemperatureCommand.moveMode = static_cast<MoveModeEnum>(data->args[0]);
728728
moveColorTemperatureCommand.rate = static_cast<uint16_t>(data->args[1]);
729729
moveColorTemperatureCommand.colorTemperatureMinimumMireds = static_cast<uint16_t>(data->args[2]);
730730
moveColorTemperatureCommand.colorTemperatureMaximumMireds = static_cast<uint16_t>(data->args[3]);
@@ -734,7 +734,7 @@ void ProcessColorControlGroupBindingCommand(BindingCommandData * data, const Emb
734734
break;
735735

736736
case Clusters::ColorControl::Commands::StepColorTemperature::Id:
737-
stepColorTemperatureCommand.stepMode = static_cast<HueStepMode>(data->args[0]);
737+
stepColorTemperatureCommand.stepMode = static_cast<StepModeEnum>(data->args[0]);
738738
stepColorTemperatureCommand.stepSize = static_cast<uint16_t>(data->args[1]);
739739
stepColorTemperatureCommand.transitionTime = static_cast<uint16_t>(data->args[2]);
740740
stepColorTemperatureCommand.colorTemperatureMinimumMireds = static_cast<uint16_t>(data->args[3]);

‎examples/common/imgui_ui/windows/light.cpp

+6-6
Original file line numberDiff line numberDiff line change
@@ -155,14 +155,14 @@ void Light::Render()
155155
ImGui::Text("Color Control:");
156156
ImGui::Indent();
157157
const char * mode = // based on ColorMode attribute: spec 3.2.7.9
158-
(mColorMode == kColorModeCurrentHueAndCurrentSaturation) ? "Hue/Saturation"
159-
: (mColorMode == kColorModeCurrentXAndCurrentY) ? "X/Y"
160-
: (mColorMode == kColorModeColorTemperature) ? "Temperature/Mireds"
158+
(mColorMode == chip::app::Clusters::ColorControl::ColorModeEnum::kCurrentHueAndCurrentSaturation) ? "Hue/Saturation"
159+
: (mColorMode == chip::app::Clusters::ColorControl::ColorModeEnum::kCurrentXAndCurrentY) ? "X/Y"
160+
: (mColorMode == chip::app::Clusters::ColorControl::ColorModeEnum::kColorTemperature) ? "Temperature/Mireds"
161161
: "UNKNOWN";
162162

163163
ImGui::Text("Mode: %s", mode);
164164

165-
if (mColorMode == kColorModeCurrentHueAndCurrentSaturation)
165+
if (mColorMode == chip::app::Clusters::ColorControl::ColorModeEnum::kCurrentHueAndCurrentSaturation)
166166
{
167167
const float hueDegrees = (mColorHue * 360.0f) / 254.0f;
168168
const float saturationPercent = 100.0f * (mColorSaturation / 254.0f);
@@ -173,12 +173,12 @@ void Light::Render()
173173
ImGui::ColorButton("LightColor", HueSaturationToColor(hueDegrees, saturationPercent), 0 /* ImGuiColorEditFlags_* */,
174174
ImVec2(80, 80));
175175
}
176-
else if (mColorMode == kColorModeCurrentXAndCurrentY)
176+
else if (mColorMode == chip::app::Clusters::ColorControl::ColorModeEnum::kCurrentXAndCurrentY)
177177
{
178178
ImGui::Text("Current X: %d", mColorX);
179179
ImGui::Text("Current Y: %d", mColorY);
180180
}
181-
else if (mColorMode == kColorModeColorTemperature)
181+
else if (mColorMode == chip::app::Clusters::ColorControl::ColorModeEnum::kColorTemperature)
182182
{
183183
ImGui::Text("Color Temperature Mireds: %d", mColorTemperatureMireds);
184184
}

0 commit comments

Comments
 (0)