Addressed review comments

project-chip · Apr 20, 2022 · 71f7795 · 71f7795
1 parent 4158c45
commit 71f7795
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 15 deletions.
diff --git a/examples/all-clusters-app/esp32/main/main.cpp b/examples/all-clusters-app/esp32/main/main.cpp
@@ -70,8 +70,8 @@ using namespace ::chip::DeviceLayer;
 // Used to indicate that an IP address has been added to the QRCode
 #define EXAMPLE_VENDOR_TAG_IP 1
 
-const char * TAG                  = "all-clusters-app";
-const uint32_t delayNotifySeconds = 10;
+const char * TAG                    = "all-clusters-app";
+const uint32_t delayConfirmImageSec = 10;
 
 static DeviceCallbacks EchoCallbacks;
 
@@ -115,7 +115,7 @@ static void InitOTARequestor(void)
     gRequestorCore.Init(Server::GetInstance(), gRequestorStorage, gRequestorUser, gDownloader);
     gImageProcessor.SetOTADownloader(&gDownloader);
     gDownloader.SetImageProcessorDelegate(&gImageProcessor);
-    gRequestorUser.DelayNotifyUpdateAppliedAction(delayNotifySeconds);
+    gRequestorUser.SetDelayConfirmCurrentImageSec(delayConfirmImageSec);
     gRequestorUser.Init(&gRequestorCore, &gImageProcessor);
 #endif
 }

diff --git a/examples/lighting-app/esp32/main/main.cpp b/examples/lighting-app/esp32/main/main.cpp
@@ -58,8 +58,8 @@ OTAImageProcessorImpl gImageProcessor;
 
 LEDWidget AppLED;
 
-static const char * TAG           = "light-app";
-const uint32_t delayNotifySeconds = 10;
+static const char * TAG             = "light-app";
+const uint32_t delayConfirmImageSec = 10;
 
 static DeviceCallbacks EchoCallbacks;
 namespace {
@@ -81,7 +81,7 @@ static void InitOTARequestor(void)
     gRequestorCore.Init(Server::GetInstance(), gRequestorStorage, gRequestorUser, gDownloader);
     gImageProcessor.SetOTADownloader(&gDownloader);
     gDownloader.SetImageProcessorDelegate(&gImageProcessor);
-    gRequestorUser.DelayNotifyUpdateAppliedAction(delayNotifySeconds);
+    gRequestorUser.SetDelayConfirmCurrentImageSec(delayConfirmImageSec);
     gRequestorUser.Init(&gRequestorCore, &gImageProcessor);
 #endif
 }

diff --git a/examples/ota-requestor-app/esp32/main/main.cpp b/examples/ota-requestor-app/esp32/main/main.cpp
@@ -50,8 +50,8 @@ using namespace ::chip::DeviceManager;
 using namespace ::chip::DeviceLayer;
 
 namespace {
-const char * TAG                  = "ota-requester-app";
-const uint32_t delayNotifySeconds = 10;
+const char * TAG                    = "ota-requester-app";
+const uint32_t delayConfirmImageSec = 10;
 static DeviceCallbacks EchoCallbacks;
 
 DefaultOTARequestor gRequestorCore;
@@ -79,7 +79,7 @@ static void InitServer(intptr_t context)
     gRequestorCore.Init(Server::GetInstance(), gRequestorStorage, gRequestorUser, gDownloader);
     gImageProcessor.SetOTADownloader(&gDownloader);
     gDownloader.SetImageProcessorDelegate(&gImageProcessor);
-    gRequestorUser.DelayNotifyUpdateAppliedAction(delayNotifySeconds);
+    gRequestorUser.SetDelayConfirmCurrentImageSec(delayConfirmImageSec);
     gRequestorUser.Init(&gRequestorCore, &gImageProcessor);
 }
 

diff --git a/src/app/clusters/ota-requestor/DefaultOTARequestorDriver.cpp b/src/app/clusters/ota-requestor/DefaultOTARequestorDriver.cpp
@@ -48,8 +48,8 @@ using namespace app::Clusters::OtaSoftwareUpdateRequestor::Structs;
 constexpr uint32_t kDelayQueryUponCommissioningSec = 30; // Delay before sending the initial image query after commissioning
 constexpr uint32_t kImmediateStartDelaySec         = 1;  // Delay before sending a query in response to UrgentUpdateAvailable
 constexpr System::Clock::Seconds32 kDefaultDelayedActionTime = System::Clock::Seconds32(120);
-System::Clock::Seconds32 mDelayNotifyUpdateAppliedSeconds =
-    System::Clock::Seconds32(0); // Delay before sending notify update applied command
+System::Clock::Seconds32 mDelayConfirmCurrentImageSec =
+    System::Clock::Seconds32(0); // Delay before confirming current image (in seconds)
 
 DefaultOTARequestorDriver * ToDriver(void * context)
 {
@@ -58,9 +58,9 @@ DefaultOTARequestorDriver * ToDriver(void * context)
 
 } // namespace
 
-void GenericOTARequestorDriver::DelayNotifyUpdateAppliedAction(uint32_t seconds)
+void GenericOTARequestorDriver::SetDelayConfirmCurrentImageSec(uint32_t seconds)
 {
-    mDelayNotifyUpdateAppliedSeconds = System::Clock::Seconds32(seconds);
+    mDelayConfirmCurrentImageSec = System::Clock::Seconds32(seconds);
 }
 
 void GenericOTARequestorDriver::Init(OTARequestorInterface * requestor, OTAImageProcessorInterface * processor)
@@ -72,7 +72,7 @@ void GenericOTARequestorDriver::Init(OTARequestorInterface * requestor, OTAImage
     if (mImageProcessor->IsFirstImageRun())
     {
         ScheduleDelayedAction(
-            mDelayNotifyUpdateAppliedSeconds,
+            mDelayConfirmCurrentImageSec,
             [](System::Layer *, void * context) {
                 CHIP_ERROR error = ToDriver(context)->mImageProcessor->ConfirmCurrentImage();
                 if (error != CHIP_NO_ERROR)

diff --git a/src/app/clusters/ota-requestor/DefaultOTARequestorDriver.h b/src/app/clusters/ota-requestor/DefaultOTARequestorDriver.h
@@ -80,7 +80,7 @@ class DefaultOTARequestorDriver : public OTARequestorDriver
                                      app::Clusters::OtaSoftwareUpdateRequestor::OTAAnnouncementReason announcementReason) override;
     void SendQueryImage() override;
     bool GetNextProviderLocation(ProviderLocationType & providerLocation, bool & listExhausted) override;
-    void DelayNotifyUpdateAppliedAction(uint32_t seconds);
+    void SetDelayConfirmCurrentImageSec(uint32_t seconds);
 
 protected:
     void StartPeriodicQueryTimer();