Restyled by clang-format

fengdx4 · Nov 30, 2023 · ad5668d · ad5668d
1 parent 764c467
commit ad5668d
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 21 deletions.
diff --git a/examples/microwave-oven-app/microwave-oven-common/include/microwave-oven-device.h b/examples/microwave-oven-app/microwave-oven-common/include/microwave-oven-device.h
@@ -95,7 +95,7 @@ class ExampleMicrowaveOvenDevice : public MicrowaveOvenControl::Delegate,
         mMicrowaveOvenControlInstance(this, aClustersEndpoint, MicrowaveOvenControl::Id, &mOperationalStateInstance,
                                       &mMicrowaveOvenModeInstance),
         mOperationalStateInstance(this, aClustersEndpoint, OperationalState::Id),
-        mMicrowaveOvenModeInstance(this, aClustersEndpoint, MicrowaveOvenMode::Id,0)
+        mMicrowaveOvenModeInstance(this, aClustersEndpoint, MicrowaveOvenMode::Id, 0)
     {}
 
     /**

diff --git a/src/app/clusters/microwave-oven-control-server/microwave-oven-control-server.cpp b/src/app/clusters/microwave-oven-control-server/microwave-oven-control-server.cpp
@@ -173,25 +173,23 @@ void Instance::HandleSetCookingParameters(HandlerContext & ctx, const Commands::
     auto & cookTime     = req.cookTime;
     auto & powerSetting = req.powerSetting;
 
-    VerifyOrExit((cookMode.HasValue() || cookTime.HasValue() || powerSetting.HasValue()),
-                status = Status::InvalidCommand;
-                ChipLogError(Zcl, "Microwave Oven Control: Failed to set cooking parameters, command fields are null "));
+    VerifyOrExit((cookMode.HasValue() || cookTime.HasValue() || powerSetting.HasValue()), status = Status::InvalidCommand;
+                 ChipLogError(Zcl, "Microwave Oven Control: Failed to set cooking parameters, command fields are null "));
 
     VerifyOrExit(!(cookMode.HasValue() && (!mMicrowaveOvenModeInstance->IsSupportedMode(cookMode.Value()))),
-                status = Status::InvalidCommand;
-                ChipLogError(Zcl, "Microwave Oven Control: Failed to set cookMode, cookMode is not supported"));
+                 status = Status::InvalidCommand;
+                 ChipLogError(Zcl, "Microwave Oven Control: Failed to set cookMode, cookMode is not supported"));
 
-    VerifyOrExit(!(cookTime.HasValue() && (!IsCookTimeInRange(cookTime.Value()))),
-                status = Status::InvalidCommand;
-                ChipLogError(Zcl, "Microwave Oven Control: Failed to set cookTime, cookTime value is out of range"));
+    VerifyOrExit(!(cookTime.HasValue() && (!IsCookTimeInRange(cookTime.Value()))), status = Status::InvalidCommand;
+                 ChipLogError(Zcl, "Microwave Oven Control: Failed to set cookTime, cookTime value is out of range"));
 
-    VerifyOrExit(!(powerSetting.HasValue() && (!IsPowerSettingInRange(powerSetting.Value(), mDelegate->GetMinPower(), mDelegate->GetMaxPower()))),
-                status = Status::InvalidCommand;
-                ChipLogError(Zcl, "Microwave Oven Control: Failed to set cookPower, cookPower value is out of range"));
+    VerifyOrExit(!(powerSetting.HasValue() &&
+                   (!IsPowerSettingInRange(powerSetting.Value(), mDelegate->GetMinPower(), mDelegate->GetMaxPower()))),
+                 status = Status::InvalidCommand;
+                 ChipLogError(Zcl, "Microwave Oven Control: Failed to set cookPower, cookPower value is out of range"));
 
     opState = mOpStateInstance->GetCurrentOperationalState();
-    VerifyOrExit(opState == to_underlying(OperationalStateEnum::kStopped),
-                status = Status::InvalidInState);
+    VerifyOrExit(opState == to_underlying(OperationalStateEnum::kStopped), status = Status::InvalidInState);
 
     if (cookTime.HasValue())
     {
@@ -214,7 +212,6 @@ void Instance::HandleSetCookingParameters(HandlerContext & ctx, const Commands::
     }
     status = mDelegate->HandleSetCookingParametersCallback(cookMode, reqCookTime, reqPowerSetting);
 
-
 exit:
     ctx.mCommandHandler.AddStatus(ctx.mRequestPath, status);
 }
@@ -227,14 +224,12 @@ void Instance::HandleAddMoreTime(HandlerContext & ctx, const Commands::AddMoreTi
     uint32_t finalCookTime;
 
     opState = mOpStateInstance->GetCurrentOperationalState();
-    VerifyOrExit(opState != to_underlying(OperationalStateEnum::kError),
-                status = Status::InvalidInState);
+    VerifyOrExit(opState != to_underlying(OperationalStateEnum::kError), status = Status::InvalidInState);
 
     finalCookTime = GetCookTime() + req.timeToAdd;
     // if the added cooking time is greater than the max cooking time, the cooking time stay unchanged.
-    VerifyOrExit(finalCookTime < kMaxCookTime,
-                status = Status::ConstraintError;
-                ChipLogError(Zcl, "Microwave Oven Control: Failed to set cookTime, cookTime value is out of range"));
+    VerifyOrExit(finalCookTime < kMaxCookTime, status = Status::ConstraintError;
+                 ChipLogError(Zcl, "Microwave Oven Control: Failed to set cookTime, cookTime value is out of range"));
 
     status = mDelegate->HandleModifyCookTimeCallback(finalCookTime);
 exit:

diff --git a/src/app/clusters/microwave-oven-control-server/microwave-oven-control-server.h b/src/app/clusters/microwave-oven-control-server/microwave-oven-control-server.h
@@ -79,7 +79,7 @@ class Instance : public CommandHandlerInterface, public AttributeAccessInterface
     Delegate * mDelegate;
     EndpointId mEndpointId;
     ClusterId mClusterId;
-    Clusters::OperationalState::Instance * mOpStateInstance = nullptr;
+    Clusters::OperationalState::Instance * mOpStateInstance   = nullptr;
     Clusters::ModeBase::Instance * mMicrowaveOvenModeInstance = nullptr;
 
     uint32_t mCookTime    = kDefaultCookTime;