[Connectivity] Rename OTAHelper to OTAInitializer

project-chip · May 27, 2022 · 9f44742 · 9f44742
1 parent fccb11e
commit 9f44742
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 14 deletions.
diff --git a/examples/all-clusters-app/ameba/chip_main.cmake b/examples/all-clusters-app/ameba/chip_main.cmake
@@ -121,7 +121,7 @@ list(
     ${chip_dir}/src/app/clusters/ota-requestor/DefaultOTARequestorDriver.cpp
     ${chip_dir}/src/app/clusters/ota-requestor/DefaultOTARequestorStorage.cpp
     ${chip_dir}/src/app/clusters/ota-requestor/ota-requestor-server.cpp
-    ${chip_dir}/examples/platform/ameba/ota/OTAHelper.cpp
+    ${chip_dir}/examples/platform/ameba/ota/OTAInitializer.cpp
 )
 endif (matter_enable_ota_requestor)
 

diff --git a/examples/all-clusters-app/ameba/main/DeviceCallbacks.cpp b/examples/all-clusters-app/ameba/main/DeviceCallbacks.cpp
@@ -37,7 +37,7 @@
 #include <support/logging/CHIPLogging.h>
 #include <support/logging/Constants.h>
 #if CHIP_DEVICE_CONFIG_ENABLE_OTA_REQUESTOR
-#include <ota/OTAHelper.h>
+#include <ota/OTAInitializer.h>
 #endif
 
 #include "Globals.h"
@@ -59,7 +59,7 @@ constexpr uint32_t kInitOTARequestorDelaySec = 3;
 #if CHIP_DEVICE_CONFIG_ENABLE_OTA_REQUESTOR
 void InitOTARequestorHandler(System::Layer * systemLayer, void * appState)
 {
-    OTAHelper::Instance().InitOTARequestor();
+    OTAInitializer::Instance().InitOTARequestor();
 }
 #endif
 

diff --git a/examples/lighting-app/ameba/chip_main.cmake b/examples/lighting-app/ameba/chip_main.cmake
@@ -19,7 +19,7 @@ list(
     ${chip_dir}/src/app/clusters/ota-requestor/DefaultOTARequestorDriver.cpp
     ${chip_dir}/src/app/clusters/ota-requestor/DefaultOTARequestorStorage.cpp
     ${chip_dir}/src/app/clusters/ota-requestor/ota-requestor-server.cpp
-    ${chip_dir}/examples/platform/ameba/ota/OTAHelper.cpp
+    ${chip_dir}/examples/platform/ameba/ota/OTAInitializer.cpp
 )
 endif (matter_enable_ota_requestor)
 

diff --git a/examples/lighting-app/ameba/main/DeviceCallbacks.cpp b/examples/lighting-app/ameba/main/DeviceCallbacks.cpp
@@ -38,7 +38,7 @@
 #include <support/logging/Constants.h>
 
 #if CHIP_DEVICE_CONFIG_ENABLE_OTA_REQUESTOR
-#include <ota/OTAHelper.h>
+#include <ota/OTAInitializer.h>
 #endif
 
 static const char * TAG = "app-devicecallbacks";
@@ -57,7 +57,7 @@ constexpr uint32_t kInitOTARequestorDelaySec = 3;
 #if CHIP_DEVICE_CONFIG_ENABLE_OTA_REQUESTOR
 void InitOTARequestorHandler(System::Layer * systemLayer, void * appState)
 {
-    OTAHelper::Instance().InitOTARequestor();
+    OTAInitializer::Instance().InitOTARequestor();
 }
 #endif
 

diff --git a/examples/ota-requestor-app/ameba/chip_main.cmake b/examples/ota-requestor-app/ameba/chip_main.cmake
@@ -27,7 +27,7 @@ list(
     ${chip_dir}/src/app/clusters/ota-requestor/DefaultOTARequestorDriver.cpp
     ${chip_dir}/src/app/clusters/ota-requestor/DefaultOTARequestorStorage.cpp
     ${chip_dir}/src/app/clusters/ota-requestor/ota-requestor-server.cpp
-    ${chip_dir}/examples/platform/ameba/ota/OTAHelper.cpp
+    ${chip_dir}/examples/platform/ameba/ota/OTAInitializer.cpp
 )
 
 add_library(

diff --git a/examples/ota-requestor-app/ameba/main/DeviceCallbacks.cpp b/examples/ota-requestor-app/ameba/main/DeviceCallbacks.cpp
@@ -37,7 +37,7 @@
 #include <support/logging/CHIPLogging.h>
 #include <support/logging/Constants.h>
 #if CHIP_DEVICE_CONFIG_ENABLE_OTA_REQUESTOR
-#include <ota/OTAHelper.h>
+#include <ota/OTAInitializer.h>
 #endif
 
 #include "Globals.h"
@@ -59,7 +59,7 @@ constexpr uint32_t kInitOTARequestorDelaySec = 3;
 #if CHIP_DEVICE_CONFIG_ENABLE_OTA_REQUESTOR
 void InitOTARequestorHandler(System::Layer * systemLayer, void * appState)
 {
-    OTAHelper::Instance().InitOTARequestor();
+    OTAInitializer::Instance().InitOTARequestor();
 }
 #endif
 

diff --git a/examples/platform/ameba/ota/OTAHelper.cpp → ...les/platform/ameba/ota/OTAInitializer.cpp b/examples/platform/ameba/ota/OTAHelper.cpp → ...les/platform/ameba/ota/OTAInitializer.cpp
@@ -15,7 +15,7 @@
  *    limitations under the License.
  */
 
-#include "OTAHelper.h"
+#include "OTAInitializer.h"
 #include "app/clusters/ota-requestor/DefaultOTARequestorStorage.h"
 #include <app/clusters/ota-requestor/BDXDownloader.h>
 #include <app/clusters/ota-requestor/DefaultOTARequestor.h>
@@ -49,7 +49,7 @@ extern "C" void amebaApplyUpdateCmdHandler()
     PlatformMgr().ScheduleWork([](intptr_t) { GetRequestorInstance()->ApplyUpdate(); });
 }
 
-void OTAHelper::InitOTARequestor(void)
+void OTAInitializer::InitOTARequestor(void)
 {
     SetRequestorInstance(&gRequestorCore);
     gRequestorStorage.Init(chip::Server::GetInstance().GetPersistentStorage());

diff --git a/examples/platform/ameba/ota/OTAHelper.h → examples/platform/ameba/ota/OTAInitializer.h b/examples/platform/ameba/ota/OTAHelper.h → examples/platform/ameba/ota/OTAInitializer.h
@@ -15,12 +15,12 @@
  *    limitations under the License.
  */
 
-class OTAHelper
+class OTAInitializer
 {
 public:
-    static OTAHelper & Instance(void)
+    static OTAInitializer & Instance(void)
     {
-        static OTAHelper sInitOTA;
+        static OTAInitializer sInitOTA;
         return sInitOTA;
     }
     void InitOTARequestor(void);