scripts/helpers/restyle-diff.sh

project-chip · Mar 24, 2022 · ed10ed6 · ed10ed6
1 parent 19363b4
commit ed10ed6
Show file tree

Hide file tree

Showing 4 changed files with 45 additions and 46 deletions.
diff --git a/src/app/clusters/ota-requestor/GenericOTARequestorDriver.cpp b/src/app/clusters/ota-requestor/GenericOTARequestorDriver.cpp
@@ -395,36 +395,35 @@ void GenericOTARequestorDriver::WatchdogTimerHandler(System::Layer * systemLayer
     ChipLogProgress(SoftwareUpdate, "Watchdog timer handler is invoked");
 
     OTAUpdateStateEnum currentState = mRequestor->GetCurrentUpdateState();
-    
-    switch(currentState)
+
+    switch (currentState)
     {
-        case OTAUpdateStateEnum::kIdle:
-        case OTAUpdateStateEnum::kUnknown:
-            // OTA Requestor is not stuck in non-idle state.  Restart watchdog timer.
-            StartWatchdogTimer();
-            break;
-        case OTAUpdateStateEnum::kQuerying:
-        case OTAUpdateStateEnum::kDelayedOnQuery:
-        case OTAUpdateStateEnum::kDownloading:
-        case OTAUpdateStateEnum::kApplying:
-        case OTAUpdateStateEnum::kDelayedOnApply:
-            UpdateDiscontinued();
-            mRequestor->CancelImageUpdate();
-            mRequestor->Reset();
-            StartPeriodicQueryTimer();
-            break;
-        case OTAUpdateStateEnum::kRollingBack:
-        case OTAUpdateStateEnum::kDelayedOnUserConsent:
-            mRequestor->Reset();
-            StartPeriodicQueryTimer();
-            break;
+    case OTAUpdateStateEnum::kIdle:
+    case OTAUpdateStateEnum::kUnknown:
+        // OTA Requestor is not stuck in non-idle state.  Restart watchdog timer.
+        StartWatchdogTimer();
+        break;
+    case OTAUpdateStateEnum::kQuerying:
+    case OTAUpdateStateEnum::kDelayedOnQuery:
+    case OTAUpdateStateEnum::kDownloading:
+    case OTAUpdateStateEnum::kApplying:
+    case OTAUpdateStateEnum::kDelayedOnApply:
+        UpdateDiscontinued();
+        mRequestor->CancelImageUpdate();
+        mRequestor->Reset();
+        StartPeriodicQueryTimer();
+        break;
+    case OTAUpdateStateEnum::kRollingBack:
+    case OTAUpdateStateEnum::kDelayedOnUserConsent:
+        mRequestor->Reset();
+        StartPeriodicQueryTimer();
+        break;
     }
 }
 
 void GenericOTARequestorDriver::StartWatchdogTimer()
 {
-    ChipLogProgress(SoftwareUpdate, "Starting the watchdog timer, timeout: %u seconds",
-                    (unsigned int) mWatchdogTimeInterval);
+    ChipLogProgress(SoftwareUpdate, "Starting the watchdog timer, timeout: %u seconds", (unsigned int) mWatchdogTimeInterval);
     ScheduleDelayedAction(
         System::Clock::Seconds32(mWatchdogTimeInterval),
         [](System::Layer *, void * context) {
@@ -447,29 +446,29 @@ void GenericOTARequestorDriver::StartSelectedTimer(SelectedTimer timer)
 {
     switch (timer)
     {
-        case SelectedTimer::kPeriodicQueryTimer:
-            StopWatchdogTimer();
-            StartPeriodicQueryTimer();
-            break;
-        case SelectedTimer::kWatchdogTimer:
-            StopPeriodicQueryTimer();
-            StartWatchdogTimer();
-            break;
+    case SelectedTimer::kPeriodicQueryTimer:
+        StopWatchdogTimer();
+        StartPeriodicQueryTimer();
+        break;
+    case SelectedTimer::kWatchdogTimer:
+        StopPeriodicQueryTimer();
+        StartWatchdogTimer();
+        break;
     }
 }
 
 void GenericOTARequestorDriver::StopSelectedTimer(SelectedTimer timer)
 {
     switch (timer)
     {
-        case SelectedTimer::kPeriodicQueryTimer:
-            StopPeriodicQueryTimer();
-            StartWatchdogTimer();
-            break;
-        case SelectedTimer::kWatchdogTimer:
-            StopWatchdogTimer();
-            StartPeriodicQueryTimer();
-            break;
+    case SelectedTimer::kPeriodicQueryTimer:
+        StopPeriodicQueryTimer();
+        StartWatchdogTimer();
+        break;
+    case SelectedTimer::kWatchdogTimer:
+        StopWatchdogTimer();
+        StartPeriodicQueryTimer();
+        break;
     }
 }
 

diff --git a/src/app/clusters/ota-requestor/OTARequestor.cpp b/src/app/clusters/ota-requestor/OTARequestor.cpp
@@ -663,12 +663,12 @@ void OTARequestor::RecordNewUpdateState(OTAUpdateStateEnum newState, OTAChangeRe
         IdleStateReason idleStateReason = MapErrorToIdleStateReason(error);
 
         // Inform the driver that the OTARequestor has entered the Idle state
-        mOtaRequestorDriver->HandleIdleState(idleStateReason); 
+        mOtaRequestorDriver->HandleIdleState(idleStateReason);
     }
-    else if(((mCurrentUpdateState == OTAUpdateStateEnum::kIdle) || (mCurrentUpdateState == OTAUpdateStateEnum::kUnknown)) &&
-            (newState != OTAUpdateStateEnum::kIdle))
+    else if (((mCurrentUpdateState == OTAUpdateStateEnum::kIdle) || (mCurrentUpdateState == OTAUpdateStateEnum::kUnknown)) &&
+             (newState != OTAUpdateStateEnum::kIdle))
     {
-        mOtaRequestorDriver->HandleIdleStateExit(); 
+        mOtaRequestorDriver->HandleIdleStateExit();
     }
 
     mCurrentUpdateState = newState;

diff --git a/src/app/clusters/ota-requestor/OTARequestor.h b/src/app/clusters/ota-requestor/OTARequestor.h
@@ -187,7 +187,7 @@ class OTARequestor : public OTARequestorInterface, public BDXDownloader::StateDe
      * Callback to initialize states and server attributes in the CHIP context
      */
     static void InitState(intptr_t context);
-    
+
     /**
      * Map a CHIP_ERROR to an IdleStateReason enum type
      */

diff --git a/src/app/clusters/ota-requestor/OTARequestorDriver.h b/src/app/clusters/ota-requestor/OTARequestorDriver.h
@@ -81,7 +81,7 @@ enum class SelectedTimer
 class OTARequestorDriver
 {
 public:
-    using OTAUpdateStateEnum   = app::Clusters::OtaSoftwareUpdateRequestor::OTAUpdateStateEnum;
+    using OTAUpdateStateEnum  = app::Clusters::OtaSoftwareUpdateRequestor::OTAUpdateStateEnum;
     using OTAChangeReasonEnum = app::Clusters::OtaSoftwareUpdateRequestor::OTAChangeReasonEnum;
 
     using ProviderLocationType = app::Clusters::OtaSoftwareUpdateRequestor::Structs::ProviderLocation::Type;
-Original file line number
+Diff line change
@@ Expand Up @@
          * Callback to initialize states and server attributes in the CHIP context
          */
         static void InitState(intptr_t context);
         /**
          * Map a CHIP_ERROR to an IdleStateReason enum type
          */
@@ Expand Down @@