Skip to content

Commit 7556318

Browse files
restyled-commitsThirsrin
restyled-commits
authored and
Thirsrin
committed
Restyled by clang-format
1 parent 7ee92c7 commit 7556318

File tree

3 files changed

+59
-64
lines changed

3 files changed

+59
-64
lines changed

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ void Light::Render()
158158
(mColorMode == ColorControl::ColorModeEnum::kCurrentHueAndCurrentSaturation) ? "Hue/Saturation"
159159
: (mColorMode == ColorControl::ColorModeEnum::kCurrentXAndCurrentY) ? "X/Y"
160160
: (mColorMode == ColorControl::ColorModeEnum::kColorTemperatureMireds) ? "Temperature/Mireds"
161-
: "UNKNOWN";
161+
: "UNKNOWN";
162162

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

‎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 = 0;
220+
auto value = 0;
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

+57-62
Original file line numberDiff line numberDiff line change
@@ -462,8 +462,7 @@ Status ColorControlServer::stopAllColorTransitions(EndpointId endpoint)
462462
}
463463

464464
bool ColorControlServer::stopMoveStepCommand(app::CommandHandler * commandObj, const app::ConcreteCommandPath & commandPath,
465-
chip::BitMask<OptionsBitmap> optionsMask,
466-
chip::BitMask<OptionsBitmap> optionsOverride)
465+
chip::BitMask<OptionsBitmap> optionsMask, chip::BitMask<OptionsBitmap> optionsOverride)
467466
{
468467
EndpointId endpoint = commandPath.mEndpointId;
469468
Status status = Status::Success;
@@ -490,8 +489,7 @@ bool ColorControlServer::stopMoveStepCommand(app::CommandHandler * commandObj, c
490489
return true;
491490
}
492491

493-
bool ColorControlServer::shouldExecuteIfOff(EndpointId endpoint,
494-
chip::BitMask<OptionsBitmap> optionMask,
492+
bool ColorControlServer::shouldExecuteIfOff(EndpointId endpoint, chip::BitMask<OptionsBitmap> optionMask,
495493
chip::BitMask<OptionsBitmap> optionOverride)
496494
{
497495
// From 5.2.2.2.1.10 of ZCL7 document 14-0129-15f-zcl-ch-5-lighting.docx:
@@ -1357,10 +1355,8 @@ Status ColorControlServer::moveToHueAndSaturation(uint16_t hue, uint8_t saturati
13571355
* @return false Failed
13581356
*/
13591357
bool ColorControlServer::moveHueCommand(app::CommandHandler * commandObj, const app::ConcreteCommandPath & commandPath,
1360-
MoveModeEnum moveMode, uint16_t rate,
1361-
chip::BitMask<OptionsBitmap> optionsMask,
1362-
chip::BitMask<OptionsBitmap> optionsOverride,
1363-
bool isEnhanced)
1358+
MoveModeEnum moveMode, uint16_t rate, chip::BitMask<OptionsBitmap> optionsMask,
1359+
chip::BitMask<OptionsBitmap> optionsOverride, bool isEnhanced)
13641360
{
13651361
MATTER_TRACE_SCOPE("moveHue", "ColorControl");
13661362
EndpointId endpoint = commandPath.mEndpointId;
@@ -1466,8 +1462,7 @@ bool ColorControlServer::moveHueCommand(app::CommandHandler * commandObj, const
14661462
*/
14671463
bool ColorControlServer::moveToHueCommand(app::CommandHandler * commandObj, const app::ConcreteCommandPath & commandPath,
14681464
uint16_t hue, DirectionEnum moveDirection, uint16_t transitionTime,
1469-
chip::BitMask<OptionsBitmap> optionsMask,
1470-
chip::BitMask<OptionsBitmap> optionsOverride,
1465+
chip::BitMask<OptionsBitmap> optionsMask, chip::BitMask<OptionsBitmap> optionsOverride,
14711466
bool isEnhanced)
14721467
{
14731468
MATTER_TRACE_SCOPE("moveToHue", "ColorControl");
@@ -1600,10 +1595,11 @@ bool ColorControlServer::moveToHueCommand(app::CommandHandler * commandObj, cons
16001595
* @return true Success
16011596
* @return false Failed
16021597
*/
1603-
bool ColorControlServer::moveToHueAndSaturationCommand(
1604-
app::CommandHandler * commandObj, const app::ConcreteCommandPath & commandPath, uint16_t hue, uint8_t saturation,
1605-
uint16_t transitionTime, chip::BitMask<OptionsBitmap> optionsMask,
1606-
chip::BitMask<OptionsBitmap> optionsOverride, bool isEnhanced)
1598+
bool ColorControlServer::moveToHueAndSaturationCommand(app::CommandHandler * commandObj,
1599+
const app::ConcreteCommandPath & commandPath, uint16_t hue,
1600+
uint8_t saturation, uint16_t transitionTime,
1601+
chip::BitMask<OptionsBitmap> optionsMask,
1602+
chip::BitMask<OptionsBitmap> optionsOverride, bool isEnhanced)
16071603
{
16081604
MATTER_TRACE_SCOPE("moveToHueAndSaturation", "ColorControl");
16091605
// limit checking: hue and saturation are 0..254. Spec dictates we ignore
@@ -1643,8 +1639,7 @@ bool ColorControlServer::moveToHueAndSaturationCommand(
16431639
*/
16441640
bool ColorControlServer::stepHueCommand(app::CommandHandler * commandObj, const app::ConcreteCommandPath & commandPath,
16451641
StepModeEnum stepMode, uint16_t stepSize, uint16_t transitionTime,
1646-
chip::BitMask<OptionsBitmap> optionsMask,
1647-
chip::BitMask<OptionsBitmap> optionsOverride,
1642+
chip::BitMask<OptionsBitmap> optionsMask, chip::BitMask<OptionsBitmap> optionsOverride,
16481643
bool isEnhanced)
16491644
{
16501645
MATTER_TRACE_SCOPE("stepHue", "ColorControl");
@@ -1841,14 +1836,14 @@ bool ColorControlServer::stepSaturationCommand(app::CommandHandler * commandObj,
18411836
const Commands::StepSaturation::DecodableType & commandData)
18421837
{
18431838
MATTER_TRACE_SCOPE("stepSaturation", "ColorControl");
1844-
auto stepMode = commandData.stepMode;
1845-
uint8_t stepSize = commandData.stepSize;
1846-
uint8_t transitionTime = commandData.transitionTime;
1847-
chip::BitMask<OptionsBitmap> optionsMask = commandData.optionsMask;
1848-
chip::BitMask<OptionsBitmap> optionsOverride = commandData.optionsOverride;
1849-
EndpointId endpoint = commandPath.mEndpointId;
1850-
Status status = Status::Success;
1851-
uint8_t currentSaturation = 0;
1839+
auto stepMode = commandData.stepMode;
1840+
uint8_t stepSize = commandData.stepSize;
1841+
uint8_t transitionTime = commandData.transitionTime;
1842+
chip::BitMask<OptionsBitmap> optionsMask = commandData.optionsMask;
1843+
chip::BitMask<OptionsBitmap> optionsOverride = commandData.optionsOverride;
1844+
EndpointId endpoint = commandPath.mEndpointId;
1845+
Status status = Status::Success;
1846+
uint8_t currentSaturation = 0;
18521847

18531848
Color16uTransitionState * colorSaturationTransitionState = getSaturationTransitionState(endpoint);
18541849
VerifyOrExit(colorSaturationTransitionState != nullptr, status = Status::UnsupportedEndpoint);
@@ -1905,17 +1900,17 @@ bool ColorControlServer::colorLoopCommand(app::CommandHandler * commandObj, cons
19051900
const Commands::ColorLoopSet::DecodableType & commandData)
19061901
{
19071902
MATTER_TRACE_SCOPE("colorLoop", "ColorControl");
1908-
auto updateFlags = commandData.updateFlags;
1909-
auto action = commandData.action;
1910-
auto direction = commandData.direction;
1911-
uint16_t time = commandData.time;
1912-
uint16_t startHue = commandData.startHue;
1903+
auto updateFlags = commandData.updateFlags;
1904+
auto action = commandData.action;
1905+
auto direction = commandData.direction;
1906+
uint16_t time = commandData.time;
1907+
uint16_t startHue = commandData.startHue;
19131908
chip::BitMask<OptionsBitmap> optionsMask = commandData.optionsMask;
19141909
chip::BitMask<OptionsBitmap> optionsOverride = commandData.optionsOverride;
1915-
EndpointId endpoint = commandPath.mEndpointId;
1916-
Status status = Status::Success;
1917-
uint8_t isColorLoopActive = 0;
1918-
uint8_t deactiveColorLoop = 0;
1910+
EndpointId endpoint = commandPath.mEndpointId;
1911+
Status status = Status::Success;
1912+
uint8_t isColorLoopActive = 0;
1913+
uint8_t deactiveColorLoop = 0;
19191914

19201915
ColorHueTransitionState * colorHueTransitionState = getColorHueTransitionState(endpoint);
19211916
VerifyOrExit(colorHueTransitionState != nullptr, status = Status::UnsupportedEndpoint);
@@ -2236,12 +2231,12 @@ bool ColorControlServer::moveToColorCommand(app::CommandHandler * commandObj, co
22362231
bool ColorControlServer::moveColorCommand(app::CommandHandler * commandObj, const app::ConcreteCommandPath & commandPath,
22372232
const Commands::MoveColor::DecodableType & commandData)
22382233
{
2239-
int16_t rateX = commandData.rateX;
2240-
int16_t rateY = commandData.rateY;
2234+
int16_t rateX = commandData.rateX;
2235+
int16_t rateY = commandData.rateY;
22412236
chip::BitMask<OptionsBitmap> optionsMask = commandData.optionsMask;
22422237
chip::BitMask<OptionsBitmap> optionsOverride = commandData.optionsOverride;
2243-
EndpointId endpoint = commandPath.mEndpointId;
2244-
Status status = Status::Success;
2238+
EndpointId endpoint = commandPath.mEndpointId;
2239+
Status status = Status::Success;
22452240

22462241
Color16uTransitionState * colorXTransitionState = getXTransitionState(endpoint);
22472242
Color16uTransitionState * colorYTransitionState = getYTransitionState(endpoint);
@@ -2331,16 +2326,16 @@ bool ColorControlServer::moveColorCommand(app::CommandHandler * commandObj, cons
23312326
bool ColorControlServer::stepColorCommand(app::CommandHandler * commandObj, const app::ConcreteCommandPath & commandPath,
23322327
const Commands::StepColor::DecodableType & commandData)
23332328
{
2334-
int16_t stepX = commandData.stepX;
2335-
int16_t stepY = commandData.stepY;
2336-
uint16_t transitionTime = commandData.transitionTime;
2329+
int16_t stepX = commandData.stepX;
2330+
int16_t stepY = commandData.stepY;
2331+
uint16_t transitionTime = commandData.transitionTime;
23372332
chip::BitMask<OptionsBitmap> optionsMask = commandData.optionsMask;
23382333
chip::BitMask<OptionsBitmap> optionsOverride = commandData.optionsOverride;
2339-
EndpointId endpoint = commandPath.mEndpointId;
2340-
uint16_t currentColorX = 0;
2341-
uint16_t currentColorY = 0;
2342-
uint16_t colorX = 0;
2343-
uint16_t colorY = 0;
2334+
EndpointId endpoint = commandPath.mEndpointId;
2335+
uint16_t currentColorX = 0;
2336+
uint16_t currentColorY = 0;
2337+
uint16_t colorX = 0;
2338+
uint16_t colorY = 0;
23442339

23452340
Status status = Status::Success;
23462341

@@ -2663,16 +2658,16 @@ void ColorControlServer::updateTempCommand(EndpointId endpoint)
26632658
bool ColorControlServer::moveColorTempCommand(app::CommandHandler * commandObj, const app::ConcreteCommandPath & commandPath,
26642659
const Commands::MoveColorTemperature::DecodableType & commandData)
26652660
{
2666-
auto moveMode = commandData.moveMode;
2667-
uint16_t rate = commandData.rate;
2668-
uint16_t colorTemperatureMinimum = commandData.colorTemperatureMinimumMireds;
2669-
uint16_t colorTemperatureMaximum = commandData.colorTemperatureMaximumMireds;
2661+
auto moveMode = commandData.moveMode;
2662+
uint16_t rate = commandData.rate;
2663+
uint16_t colorTemperatureMinimum = commandData.colorTemperatureMinimumMireds;
2664+
uint16_t colorTemperatureMaximum = commandData.colorTemperatureMaximumMireds;
26702665
chip::BitMask<OptionsBitmap> optionsMask = commandData.optionsMask;
26712666
chip::BitMask<OptionsBitmap> optionsOverride = commandData.optionsOverride;
2672-
EndpointId endpoint = commandPath.mEndpointId;
2673-
Status status = Status::Success;
2674-
uint16_t tempPhysicalMin = MIN_TEMPERATURE_VALUE;
2675-
uint16_t tempPhysicalMax = MAX_TEMPERATURE_VALUE;
2667+
EndpointId endpoint = commandPath.mEndpointId;
2668+
Status status = Status::Success;
2669+
uint16_t tempPhysicalMin = MIN_TEMPERATURE_VALUE;
2670+
uint16_t tempPhysicalMax = MAX_TEMPERATURE_VALUE;
26762671
uint16_t transitionTime;
26772672

26782673
Color16uTransitionState * colorTempTransitionState = getTempTransitionState(endpoint);
@@ -2785,17 +2780,17 @@ bool ColorControlServer::moveToColorTempCommand(app::CommandHandler * commandObj
27852780
bool ColorControlServer::stepColorTempCommand(app::CommandHandler * commandObj, const app::ConcreteCommandPath & commandPath,
27862781
const Commands::StepColorTemperature::DecodableType & commandData)
27872782
{
2788-
auto stepMode = commandData.stepMode;
2789-
uint16_t stepSize = commandData.stepSize;
2790-
uint16_t transitionTime = commandData.transitionTime;
2791-
uint16_t colorTemperatureMinimum = commandData.colorTemperatureMinimumMireds;
2792-
uint16_t colorTemperatureMaximum = commandData.colorTemperatureMaximumMireds;
2783+
auto stepMode = commandData.stepMode;
2784+
uint16_t stepSize = commandData.stepSize;
2785+
uint16_t transitionTime = commandData.transitionTime;
2786+
uint16_t colorTemperatureMinimum = commandData.colorTemperatureMinimumMireds;
2787+
uint16_t colorTemperatureMaximum = commandData.colorTemperatureMaximumMireds;
27932788
chip::BitMask<OptionsBitmap> optionsMask = commandData.optionsMask;
27942789
chip::BitMask<OptionsBitmap> optionsOverride = commandData.optionsOverride;
2795-
EndpointId endpoint = commandPath.mEndpointId;
2796-
Status status = Status::Success;
2797-
uint16_t tempPhysicalMin = MIN_TEMPERATURE_VALUE;
2798-
uint16_t tempPhysicalMax = MAX_TEMPERATURE_VALUE;
2790+
EndpointId endpoint = commandPath.mEndpointId;
2791+
Status status = Status::Success;
2792+
uint16_t tempPhysicalMin = MIN_TEMPERATURE_VALUE;
2793+
uint16_t tempPhysicalMax = MAX_TEMPERATURE_VALUE;
27992794

28002795
Color16uTransitionState * colorTempTransitionState = getTempTransitionState(endpoint);
28012796
VerifyOrExit(colorTempTransitionState != nullptr, status = Status::UnsupportedEndpoint);

0 commit comments

Comments
 (0)