[SL-ONLY] BaseApplication Init refactor

examples/air-quality-sensor-app/silabs/include/AppTask.h

@@ -89,11 +89,11 @@ class AppTask : public BaseApplication
     static AppTask sAppTask;
 
     /**
-     * @brief AppTask initialisation function
+     * @brief Override of BaseApplication::AppInit() virtual method, called by BaseApplication::Init()
      *
      * @return CHIP_ERROR
      */
-    CHIP_ERROR Init();
+    CHIP_ERROR AppInit() override;
 
     /**
      * @brief PB0 Button event processing function

examples/air-quality-sensor-app/silabs/src/AppTask.cpp

@@ -68,7 +68,7 @@ using namespace chip::app::Clusters;
 
 AppTask AppTask::sAppTask;
 
-CHIP_ERROR AppTask::Init()
+CHIP_ERROR AppTask::AppInit()
 {
     CHIP_ERROR err = CHIP_NO_ERROR;
     chip::DeviceLayer::Silabs::GetPlatform().SetButtonsCb(AppTask::ButtonEventHandler);
@@ -77,12 +77,6 @@ CHIP_ERROR AppTask::Init()
     GetLCD().SetCustomUI(AirQualitySensorUI::DrawUI);
 #endif
 
-    err = BaseApplication::Init();
-    if (err != CHIP_NO_ERROR)
-    {
-        ChipLogDetail(AppServer, "BaseApplication::Init() failed");
-        appError(err);
-    }
     err = SensorManager::SensorMgr().Init();
     if (err != CHIP_NO_ERROR)
     {

examples/chef/silabs/include/AppTask.h

@@ -80,11 +80,11 @@ class AppTask : public BaseApplication
     static AppTask sAppTask;
 
     /**
-     * @brief AppTask initialisation function
+     * @brief Override of BaseApplication::AppInit() virtual method, called by BaseApplication::Init()
      *
      * @return CHIP_ERROR
      */
-    CHIP_ERROR Init();
+    CHIP_ERROR AppInit() override;
 
     /**
      * @brief PB0 Button event processing function

examples/chef/silabs/src/AppTask.cpp

@@ -58,18 +58,11 @@ using namespace ::chip::DeviceLayer;
 
 AppTask AppTask::sAppTask;
 
-CHIP_ERROR AppTask::Init()
+CHIP_ERROR AppTask::AppInit()
 {
     CHIP_ERROR err = CHIP_NO_ERROR;
     chip::DeviceLayer::Silabs::GetPlatform().SetButtonsCb(AppTask::ButtonEventHandler);
 
-    err = BaseApplication::Init();
-    if (err != CHIP_NO_ERROR)
-    {
-        SILABS_LOG("BaseApplication::Init() failed");
-        appError(err);
-    }
-
     return err;
 }
 

examples/energy-management-app/silabs/include/AppTask.h

@@ -85,11 +85,11 @@ class AppTask : public BaseApplication
     static void UpdateClusterState(intptr_t context);
 
     /**
-     * @brief AppTask initialisation function
+     * @brief Override of BaseApplication::AppInit() virtual method, called by BaseApplication::Init()
      *
      * @return CHIP_ERROR
      */
-    CHIP_ERROR Init();
+    CHIP_ERROR AppInit() override;
 
     /**
      * @brief PB0 Button event processing function

examples/energy-management-app/silabs/src/AppTask.cpp

@@ -163,7 +163,7 @@ void ApplicationShutdown()
     chip::DeviceLayer::PlatformMgr().UnlockChipStack();
 }
 
-CHIP_ERROR AppTask::Init()
+CHIP_ERROR AppTask::AppInit()
 {
     CHIP_ERROR err = CHIP_NO_ERROR;
     chip::DeviceLayer::Silabs::GetPlatform().SetButtonsCb(AppTask::ButtonEventHandler);
@@ -176,13 +176,6 @@ CHIP_ERROR AppTask::Init()
 #endif
 #endif
 
-    err = BaseApplication::Init();
-    if (err != CHIP_NO_ERROR)
-    {
-        SILABS_LOG("BaseApplication::Init() failed");
-        appError(err);
-    }
-
     ApplicationInit();
 
 #ifdef SL_MATTER_TEST_EVENT_TRIGGER_ENABLED

examples/light-switch-app/silabs/include/AppTask.h

@@ -70,9 +70,9 @@ class AppTask : public BaseApplication
     static AppTask sAppTask;
 
     /**
-     * @brief AppTask initialisation function
+     * @brief Override of BaseApplication::AppInit() virtual method, called by BaseApplication::Init()
      *
      * @return CHIP_ERROR
      */
-    CHIP_ERROR Init();
+    CHIP_ERROR AppInit() override;
 };

examples/light-switch-app/silabs/src/AppTask.cpp

@@ -68,7 +68,7 @@ using namespace ::chip::DeviceLayer;
 
 AppTask AppTask::sAppTask;
 
-CHIP_ERROR AppTask::Init()
+CHIP_ERROR AppTask::AppInit()
 {
     CHIP_ERROR err = CHIP_NO_ERROR;
     chip::DeviceLayer::Silabs::GetPlatform().SetButtonsCb(LightSwitchMgr::ButtonEventHandler);
@@ -77,13 +77,6 @@ CHIP_ERROR AppTask::Init()
     GetLCD().Init((uint8_t *) "Light Switch");
 #endif
 
-    err = BaseApplication::Init();
-    if (err != CHIP_NO_ERROR)
-    {
-        SILABS_LOG("BaseApplication::Init() failed");
-        appError(err);
-    }
-
     err = LightSwitchMgr::GetInstance().Init(kLightSwitchEndpoint, kGenericSwitchEndpoint);
     if (err != CHIP_NO_ERROR)
     {

examples/lighting-app/silabs/include/AppTask.h

@@ -88,11 +88,11 @@ class AppTask : public BaseApplication
     static void UpdateClusterState(intptr_t context);
 
     /**
-     * @brief AppTask initialisation function
+     * @brief Override of BaseApplication::AppInit() virtual method, called by BaseApplication::Init()
      *
      * @return CHIP_ERROR
      */
-    CHIP_ERROR Init();
+    CHIP_ERROR AppInit() override;
 
     /**
      * @brief PB0 Button event processing function

examples/lighting-app/silabs/src/AppTask.cpp

@@ -64,7 +64,7 @@ using namespace ::chip::DeviceLayer;
 
 AppTask AppTask::sAppTask;
 
-CHIP_ERROR AppTask::Init()
+CHIP_ERROR AppTask::AppInit()
 {
     CHIP_ERROR err = CHIP_NO_ERROR;
     chip::DeviceLayer::Silabs::GetPlatform().SetButtonsCb(AppTask::ButtonEventHandler);
@@ -75,13 +75,6 @@ CHIP_ERROR AppTask::Init()
     GetLCD().Init((uint8_t *) "Lighting-App");
 #endif
 
-    err = BaseApplication::Init();
-    if (err != CHIP_NO_ERROR)
-    {
-        SILABS_LOG("BaseApplication::Init() failed");
-        appError(err);
-    }
-
     err = LightMgr().Init();
     if (err != CHIP_NO_ERROR)
     {
@@ -110,7 +103,6 @@ CHIP_ERROR AppTask::Init()
 #endif // QR_CODE_ENABLED
 #endif
 
-    BaseApplication::InitCompleteCallback(err);
     return err;
 }
 

examples/lit-icd-app/silabs/include/AppTask.h

@@ -104,11 +104,11 @@ class AppTask : public BaseApplication, public chip::app::ICDStateObserver
     static AppTask sAppTask;
 
     /**
-     * @brief AppTask initialisation function
+     * @brief Override of BaseApplication::AppInit() virtual method, called by BaseApplication::Init()
      *
      * @return CHIP_ERROR
      */
-    CHIP_ERROR Init();
+    CHIP_ERROR AppInit() override;
 
     /**
      * @brief PB0 Button event processing function

examples/lit-icd-app/silabs/src/AppTask.cpp

@@ -68,7 +68,7 @@ using namespace ::chip::DeviceLayer;
 
 AppTask AppTask::sAppTask;
 
-CHIP_ERROR AppTask::Init()
+CHIP_ERROR AppTask::AppInit()
 {
     CHIP_ERROR err = CHIP_NO_ERROR;
     chip::DeviceLayer::Silabs::GetPlatform().SetButtonsCb(AppTask::ButtonEventHandler);
@@ -77,13 +77,6 @@ CHIP_ERROR AppTask::Init()
     GetLCD().Init((uint8_t *) "LIT ICD");
 #endif
 
-    err = BaseApplication::Init();
-    if (err != CHIP_NO_ERROR)
-    {
-        SILABS_LOG("BaseApplication::Init() failed");
-        appError(err);
-    }
-
     return err;
 }
 

examples/lock-app/silabs/include/AppTask.h

@@ -89,11 +89,11 @@ class AppTask : public BaseApplication
     static AppTask sAppTask;
 
     /**
-     * @brief AppTask initialisation function
+     * @brief Override of BaseApplication::AppInit() virtual method, called by BaseApplication::Init()
      *
      * @return CHIP_ERROR
      */
-    CHIP_ERROR Init();
+    CHIP_ERROR AppInit() override;
 
     /**
      * @brief PB0 Button event processing function

examples/lock-app/silabs/src/AppTask.cpp

@@ -116,7 +116,7 @@ using namespace ::chip::DeviceLayer;
 
 AppTask AppTask::sAppTask;
 
-CHIP_ERROR AppTask::Init()
+CHIP_ERROR AppTask::AppInit()
 {
     CHIP_ERROR err = CHIP_NO_ERROR;
 
@@ -126,13 +126,6 @@ CHIP_ERROR AppTask::Init()
     GetLCD().Init((uint8_t *) "Lock-App", true);
 #endif
 
-    err = BaseApplication::Init();
-    if (err != CHIP_NO_ERROR)
-    {
-        SILABS_LOG("BaseApplication::Init() failed");
-        appError(err);
-    }
-
 #if defined(ENABLE_CHIP_SHELL)
     err = RegisterLockEvents();
     if (err != CHIP_NO_ERROR)

examples/platform/silabs/BaseApplication.cpp

@@ -300,6 +300,29 @@ CHIP_ERROR BaseApplication::StartAppTask(osThreadFunc_t taskFunction)
 }
 
 CHIP_ERROR BaseApplication::Init()
+{
+    CHIP_ERROR err = BaseInit();
+    if (err != CHIP_NO_ERROR)
+    {
+        SILABS_LOG("BaseInit() failed");
+        appError(err);
+        return err;
+    }
+
+    err = AppInit();
+    if (err != CHIP_NO_ERROR)
+    {
+        SILABS_LOG("AppInit() failed");
+        appError(err);
+        return err;
+    }
+
+    SILABS_TRACE_END_ERROR(TimeTraceOperation::kAppInit, err);
+    SILABS_TRACE_END_ERROR(TimeTraceOperation::kBootup, err);
+    return err;
+}
+
+CHIP_ERROR BaseApplication::BaseInit()
 {
     CHIP_ERROR err = CHIP_NO_ERROR;
 
@@ -381,12 +404,6 @@ CHIP_ERROR BaseApplication::Init()
     return err;
 }
 
-void BaseApplication::InitCompleteCallback(CHIP_ERROR err)
-{
-    SILABS_TRACE_END(TimeTraceOperation::kAppInit);
-    SILABS_TRACE_END(TimeTraceOperation::kBootup);
-}
-
 void BaseApplication::FunctionTimerEventHandler(void * timerCbArg)
 {
     AppEvent event;

examples/platform/silabs/BaseApplication.h

@@ -178,14 +178,11 @@ class BaseApplication
 
 protected:
     CHIP_ERROR Init();
-
-    /** @brief
-     * Function to be called at the end of Init to indicate that the application has completed its initialization.
-     * Currently only used for tracing, might want to move logging here as well in the future
-     * @param err CHIP_NO_ERROR on success, corresponding error code on Init failure, note that Init failure leads to an app error
-     * so this is purely to have a trace logged with the error code
+    CHIP_ERROR BaseInit();
+    /** @brief Template for to implement a Application specific init.
+     *              Function is called after the BaseApplication::Init function.
      */
-    void InitCompleteCallback(CHIP_ERROR err);
+    virtual CHIP_ERROR AppInit() = 0;
 
     /**
      * @brief Function called to start the function timer

examples/pump-app/silabs/include/AppTask.h

@@ -75,11 +75,11 @@ class AppTask : public BaseApplication
     static void UpdateClusterState(intptr_t context);
 
     /**
-     * @brief AppTask initialisation function
+     * @brief Override of BaseApplication::AppInit() virtual method, called by BaseApplication::Init()
      *
      * @return CHIP_ERROR
      */
-    CHIP_ERROR Init();
+    CHIP_ERROR AppInit() override;
 
     /**
      * @brief PB0 Button event processing function

examples/pump-app/silabs/src/AppTask.cpp

@@ -71,7 +71,7 @@ using namespace ::chip::DeviceLayer;
 
 AppTask AppTask::sAppTask;
 
-CHIP_ERROR AppTask::Init()
+CHIP_ERROR AppTask::AppInit()
 {
     CHIP_ERROR err = CHIP_NO_ERROR;
     chip::DeviceLayer::Silabs::GetPlatform().SetButtonsCb(AppTask::ButtonEventHandler);
@@ -80,13 +80,6 @@ CHIP_ERROR AppTask::Init()
     GetLCD().Init((uint8_t *) "Pump-App");
 #endif
 
-    err = BaseApplication::Init();
-    if (err != CHIP_NO_ERROR)
-    {
-        SILABS_LOG("BaseApplication::Init() failed");
-        appError(err);
-    }
-
     err = PumpMgr().Init();
     if (err != CHIP_NO_ERROR)
     {

examples/refrigerator-app/silabs/include/AppTask.h

@@ -84,11 +84,11 @@ class AppTask : public BaseApplication
     static AppTask sAppTask;
 
     /**
-     * @brief AppTask initialisation function
+     * @brief Override of BaseApplication::AppInit() virtual method, called by BaseApplication::Init()
      *
      * @return CHIP_ERROR
      */
-    CHIP_ERROR Init();
+    CHIP_ERROR AppInit() override;
 
     /**
      * @brief PB0 Button event processing function

examples/refrigerator-app/silabs/src/AppTask.cpp

@@ -75,7 +75,7 @@ using namespace ::chip::DeviceLayer;
 
 AppTask AppTask::sAppTask;
 
-CHIP_ERROR AppTask::Init()
+CHIP_ERROR AppTask::AppInit()
 {
     CHIP_ERROR err = CHIP_NO_ERROR;
     chip::DeviceLayer::Silabs::GetPlatform().SetButtonsCb(AppTask::ButtonEventHandler);
@@ -84,12 +84,6 @@ CHIP_ERROR AppTask::Init()
     GetLCD().Init((uint8_t *) "Refrigrator-App");
 #endif
 
-    err = BaseApplication::Init();
-    if (err != CHIP_NO_ERROR)
-    {
-        ChipLogError(AppServer, "BaseApplication::Init() failed");
-        appError(err);
-    }
     err = RefrigeratorMgr().Init();
     if (err != CHIP_NO_ERROR)
     {