Skip to content

Commit 8341883

Browse files
restyled-commitsThirsrin
restyled-commits
authored and
Thirsrin
committed
Restyled by clang-format
1 parent f8f1d2d commit 8341883

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
@@ -438,8 +438,7 @@ Status ColorControlServer::stopAllColorTransitions(EndpointId endpoint)
438438
}
439439

440440
bool ColorControlServer::stopMoveStepCommand(app::CommandHandler * commandObj, const app::ConcreteCommandPath & commandPath,
441-
chip::BitMask<OptionsBitmap> optionsMask,
442-
chip::BitMask<OptionsBitmap> optionsOverride)
441+
chip::BitMask<OptionsBitmap> optionsMask, chip::BitMask<OptionsBitmap> optionsOverride)
443442
{
444443
EndpointId endpoint = commandPath.mEndpointId;
445444
Status status = Status::Success;
@@ -466,8 +465,7 @@ bool ColorControlServer::stopMoveStepCommand(app::CommandHandler * commandObj, c
466465
return true;
467466
}
468467

469-
bool ColorControlServer::shouldExecuteIfOff(EndpointId endpoint,
470-
chip::BitMask<OptionsBitmap> optionMask,
468+
bool ColorControlServer::shouldExecuteIfOff(EndpointId endpoint, chip::BitMask<OptionsBitmap> optionMask,
471469
chip::BitMask<OptionsBitmap> optionOverride)
472470
{
473471
// From 5.2.2.2.1.10 of ZCL7 document 14-0129-15f-zcl-ch-5-lighting.docx:
@@ -1333,10 +1331,8 @@ Status ColorControlServer::moveToHueAndSaturation(uint16_t hue, uint8_t saturati
13331331
* @return false Failed
13341332
*/
13351333
bool ColorControlServer::moveHueCommand(app::CommandHandler * commandObj, const app::ConcreteCommandPath & commandPath,
1336-
MoveModeEnum moveMode, uint16_t rate,
1337-
chip::BitMask<OptionsBitmap> optionsMask,
1338-
chip::BitMask<OptionsBitmap> optionsOverride,
1339-
bool isEnhanced)
1334+
MoveModeEnum moveMode, uint16_t rate, chip::BitMask<OptionsBitmap> optionsMask,
1335+
chip::BitMask<OptionsBitmap> optionsOverride, bool isEnhanced)
13401336
{
13411337
MATTER_TRACE_SCOPE("moveHue", "ColorControl");
13421338
EndpointId endpoint = commandPath.mEndpointId;
@@ -1442,8 +1438,7 @@ bool ColorControlServer::moveHueCommand(app::CommandHandler * commandObj, const
14421438
*/
14431439
bool ColorControlServer::moveToHueCommand(app::CommandHandler * commandObj, const app::ConcreteCommandPath & commandPath,
14441440
uint16_t hue, DirectionEnum moveDirection, uint16_t transitionTime,
1445-
chip::BitMask<OptionsBitmap> optionsMask,
1446-
chip::BitMask<OptionsBitmap> optionsOverride,
1441+
chip::BitMask<OptionsBitmap> optionsMask, chip::BitMask<OptionsBitmap> optionsOverride,
14471442
bool isEnhanced)
14481443
{
14491444
MATTER_TRACE_SCOPE("moveToHue", "ColorControl");
@@ -1576,10 +1571,11 @@ bool ColorControlServer::moveToHueCommand(app::CommandHandler * commandObj, cons
15761571
* @return true Success
15771572
* @return false Failed
15781573
*/
1579-
bool ColorControlServer::moveToHueAndSaturationCommand(
1580-
app::CommandHandler * commandObj, const app::ConcreteCommandPath & commandPath, uint16_t hue, uint8_t saturation,
1581-
uint16_t transitionTime, chip::BitMask<OptionsBitmap> optionsMask,
1582-
chip::BitMask<OptionsBitmap> optionsOverride, bool isEnhanced)
1574+
bool ColorControlServer::moveToHueAndSaturationCommand(app::CommandHandler * commandObj,
1575+
const app::ConcreteCommandPath & commandPath, uint16_t hue,
1576+
uint8_t saturation, uint16_t transitionTime,
1577+
chip::BitMask<OptionsBitmap> optionsMask,
1578+
chip::BitMask<OptionsBitmap> optionsOverride, bool isEnhanced)
15831579
{
15841580
MATTER_TRACE_SCOPE("moveToHueAndSaturation", "ColorControl");
15851581
// limit checking: hue and saturation are 0..254. Spec dictates we ignore
@@ -1619,8 +1615,7 @@ bool ColorControlServer::moveToHueAndSaturationCommand(
16191615
*/
16201616
bool ColorControlServer::stepHueCommand(app::CommandHandler * commandObj, const app::ConcreteCommandPath & commandPath,
16211617
StepModeEnum stepMode, uint16_t stepSize, uint16_t transitionTime,
1622-
chip::BitMask<OptionsBitmap> optionsMask,
1623-
chip::BitMask<OptionsBitmap> optionsOverride,
1618+
chip::BitMask<OptionsBitmap> optionsMask, chip::BitMask<OptionsBitmap> optionsOverride,
16241619
bool isEnhanced)
16251620
{
16261621
MATTER_TRACE_SCOPE("stepHue", "ColorControl");
@@ -1817,14 +1812,14 @@ bool ColorControlServer::stepSaturationCommand(app::CommandHandler * commandObj,
18171812
const Commands::StepSaturation::DecodableType & commandData)
18181813
{
18191814
MATTER_TRACE_SCOPE("stepSaturation", "ColorControl");
1820-
auto stepMode = commandData.stepMode;
1821-
uint8_t stepSize = commandData.stepSize;
1822-
uint8_t transitionTime = commandData.transitionTime;
1823-
chip::BitMask<OptionsBitmap> optionsMask = commandData.optionsMask;
1824-
chip::BitMask<OptionsBitmap> optionsOverride = commandData.optionsOverride;
1825-
EndpointId endpoint = commandPath.mEndpointId;
1826-
Status status = Status::Success;
1827-
uint8_t currentSaturation = 0;
1815+
auto stepMode = commandData.stepMode;
1816+
uint8_t stepSize = commandData.stepSize;
1817+
uint8_t transitionTime = commandData.transitionTime;
1818+
chip::BitMask<OptionsBitmap> optionsMask = commandData.optionsMask;
1819+
chip::BitMask<OptionsBitmap> optionsOverride = commandData.optionsOverride;
1820+
EndpointId endpoint = commandPath.mEndpointId;
1821+
Status status = Status::Success;
1822+
uint8_t currentSaturation = 0;
18281823

18291824
Color16uTransitionState * colorSaturationTransitionState = getSaturationTransitionState(endpoint);
18301825
VerifyOrExit(colorSaturationTransitionState != nullptr, status = Status::UnsupportedEndpoint);
@@ -1881,17 +1876,17 @@ bool ColorControlServer::colorLoopCommand(app::CommandHandler * commandObj, cons
18811876
const Commands::ColorLoopSet::DecodableType & commandData)
18821877
{
18831878
MATTER_TRACE_SCOPE("colorLoop", "ColorControl");
1884-
auto updateFlags = commandData.updateFlags;
1885-
auto action = commandData.action;
1886-
auto direction = commandData.direction;
1887-
uint16_t time = commandData.time;
1888-
uint16_t startHue = commandData.startHue;
1879+
auto updateFlags = commandData.updateFlags;
1880+
auto action = commandData.action;
1881+
auto direction = commandData.direction;
1882+
uint16_t time = commandData.time;
1883+
uint16_t startHue = commandData.startHue;
18891884
chip::BitMask<OptionsBitmap> optionsMask = commandData.optionsMask;
18901885
chip::BitMask<OptionsBitmap> optionsOverride = commandData.optionsOverride;
1891-
EndpointId endpoint = commandPath.mEndpointId;
1892-
Status status = Status::Success;
1893-
uint8_t isColorLoopActive = 0;
1894-
uint8_t deactiveColorLoop = 0;
1886+
EndpointId endpoint = commandPath.mEndpointId;
1887+
Status status = Status::Success;
1888+
uint8_t isColorLoopActive = 0;
1889+
uint8_t deactiveColorLoop = 0;
18951890

18961891
ColorHueTransitionState * colorHueTransitionState = getColorHueTransitionState(endpoint);
18971892
VerifyOrExit(colorHueTransitionState != nullptr, status = Status::UnsupportedEndpoint);
@@ -2212,12 +2207,12 @@ bool ColorControlServer::moveToColorCommand(app::CommandHandler * commandObj, co
22122207
bool ColorControlServer::moveColorCommand(app::CommandHandler * commandObj, const app::ConcreteCommandPath & commandPath,
22132208
const Commands::MoveColor::DecodableType & commandData)
22142209
{
2215-
int16_t rateX = commandData.rateX;
2216-
int16_t rateY = commandData.rateY;
2210+
int16_t rateX = commandData.rateX;
2211+
int16_t rateY = commandData.rateY;
22172212
chip::BitMask<OptionsBitmap> optionsMask = commandData.optionsMask;
22182213
chip::BitMask<OptionsBitmap> optionsOverride = commandData.optionsOverride;
2219-
EndpointId endpoint = commandPath.mEndpointId;
2220-
Status status = Status::Success;
2214+
EndpointId endpoint = commandPath.mEndpointId;
2215+
Status status = Status::Success;
22212216

22222217
Color16uTransitionState * colorXTransitionState = getXTransitionState(endpoint);
22232218
Color16uTransitionState * colorYTransitionState = getYTransitionState(endpoint);
@@ -2307,16 +2302,16 @@ bool ColorControlServer::moveColorCommand(app::CommandHandler * commandObj, cons
23072302
bool ColorControlServer::stepColorCommand(app::CommandHandler * commandObj, const app::ConcreteCommandPath & commandPath,
23082303
const Commands::StepColor::DecodableType & commandData)
23092304
{
2310-
int16_t stepX = commandData.stepX;
2311-
int16_t stepY = commandData.stepY;
2312-
uint16_t transitionTime = commandData.transitionTime;
2305+
int16_t stepX = commandData.stepX;
2306+
int16_t stepY = commandData.stepY;
2307+
uint16_t transitionTime = commandData.transitionTime;
23132308
chip::BitMask<OptionsBitmap> optionsMask = commandData.optionsMask;
23142309
chip::BitMask<OptionsBitmap> optionsOverride = commandData.optionsOverride;
2315-
EndpointId endpoint = commandPath.mEndpointId;
2316-
uint16_t currentColorX = 0;
2317-
uint16_t currentColorY = 0;
2318-
uint16_t colorX = 0;
2319-
uint16_t colorY = 0;
2310+
EndpointId endpoint = commandPath.mEndpointId;
2311+
uint16_t currentColorX = 0;
2312+
uint16_t currentColorY = 0;
2313+
uint16_t colorX = 0;
2314+
uint16_t colorY = 0;
23202315

23212316
Status status = Status::Success;
23222317

@@ -2639,16 +2634,16 @@ void ColorControlServer::updateTempCommand(EndpointId endpoint)
26392634
bool ColorControlServer::moveColorTempCommand(app::CommandHandler * commandObj, const app::ConcreteCommandPath & commandPath,
26402635
const Commands::MoveColorTemperature::DecodableType & commandData)
26412636
{
2642-
auto moveMode = commandData.moveMode;
2643-
uint16_t rate = commandData.rate;
2644-
uint16_t colorTemperatureMinimum = commandData.colorTemperatureMinimumMireds;
2645-
uint16_t colorTemperatureMaximum = commandData.colorTemperatureMaximumMireds;
2637+
auto moveMode = commandData.moveMode;
2638+
uint16_t rate = commandData.rate;
2639+
uint16_t colorTemperatureMinimum = commandData.colorTemperatureMinimumMireds;
2640+
uint16_t colorTemperatureMaximum = commandData.colorTemperatureMaximumMireds;
26462641
chip::BitMask<OptionsBitmap> optionsMask = commandData.optionsMask;
26472642
chip::BitMask<OptionsBitmap> optionsOverride = commandData.optionsOverride;
2648-
EndpointId endpoint = commandPath.mEndpointId;
2649-
Status status = Status::Success;
2650-
uint16_t tempPhysicalMin = MIN_TEMPERATURE_VALUE;
2651-
uint16_t tempPhysicalMax = MAX_TEMPERATURE_VALUE;
2643+
EndpointId endpoint = commandPath.mEndpointId;
2644+
Status status = Status::Success;
2645+
uint16_t tempPhysicalMin = MIN_TEMPERATURE_VALUE;
2646+
uint16_t tempPhysicalMax = MAX_TEMPERATURE_VALUE;
26522647
uint16_t transitionTime;
26532648

26542649
Color16uTransitionState * colorTempTransitionState = getTempTransitionState(endpoint);
@@ -2761,17 +2756,17 @@ bool ColorControlServer::moveToColorTempCommand(app::CommandHandler * commandObj
27612756
bool ColorControlServer::stepColorTempCommand(app::CommandHandler * commandObj, const app::ConcreteCommandPath & commandPath,
27622757
const Commands::StepColorTemperature::DecodableType & commandData)
27632758
{
2764-
auto stepMode = commandData.stepMode;
2765-
uint16_t stepSize = commandData.stepSize;
2766-
uint16_t transitionTime = commandData.transitionTime;
2767-
uint16_t colorTemperatureMinimum = commandData.colorTemperatureMinimumMireds;
2768-
uint16_t colorTemperatureMaximum = commandData.colorTemperatureMaximumMireds;
2759+
auto stepMode = commandData.stepMode;
2760+
uint16_t stepSize = commandData.stepSize;
2761+
uint16_t transitionTime = commandData.transitionTime;
2762+
uint16_t colorTemperatureMinimum = commandData.colorTemperatureMinimumMireds;
2763+
uint16_t colorTemperatureMaximum = commandData.colorTemperatureMaximumMireds;
27692764
chip::BitMask<OptionsBitmap> optionsMask = commandData.optionsMask;
27702765
chip::BitMask<OptionsBitmap> optionsOverride = commandData.optionsOverride;
2771-
EndpointId endpoint = commandPath.mEndpointId;
2772-
Status status = Status::Success;
2773-
uint16_t tempPhysicalMin = MIN_TEMPERATURE_VALUE;
2774-
uint16_t tempPhysicalMax = MAX_TEMPERATURE_VALUE;
2766+
EndpointId endpoint = commandPath.mEndpointId;
2767+
Status status = Status::Success;
2768+
uint16_t tempPhysicalMin = MIN_TEMPERATURE_VALUE;
2769+
uint16_t tempPhysicalMax = MAX_TEMPERATURE_VALUE;
27752770

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

0 commit comments

Comments
 (0)