[SL-ONLY] Update sl_apps Apptask Init to AppInit post change in baseApplication (#345)

Author: jmartinez-silabs

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

@@ -75,11 +75,11 @@ class AppTask : public BaseApplication
 private:
     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/dishwasher-app/silabs/src/AppTask.cpp

@@ -60,7 +60,7 @@ static EnergyReportingTestEventTriggerHandler sEnergyReportingTestEventTriggerHa
 static DeviceEnergyManagementTestEventTriggerHandler sDeviceEnergyManagementTestEventTriggerHandler;
 #endif
 
-CHIP_ERROR AppTask::Init()
+CHIP_ERROR AppTask::AppInit()
 {
     CHIP_ERROR err = CHIP_NO_ERROR;
     chip::DeviceLayer::Silabs::GetPlatform().SetButtonsCb(AppTask::ButtonEventHandler);
@@ -69,13 +69,6 @@ CHIP_ERROR AppTask::Init()
     GetLCD().Init((uint8_t *) "Dishwasher-App");
 #endif
 
-    err = BaseApplication::Init();
-    if (err != CHIP_NO_ERROR)
-    {
-        SILABS_LOG("BaseApplication::Init() failed");
-        appError(err);
-    }
-
     PlatformMgr().LockChipStack();
     err = DeviceEnergyManager::Instance().Init();
     PlatformMgr().UnlockChipStack();

examples/fan-control-app/silabs/include/AppTask.h

@@ -81,11 +81,11 @@ class AppTask : public BaseApplication
 
 private:
     /**
-     * @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;
 
     static AppTask sAppTask;
 

examples/fan-control-app/silabs/src/AppTask.cpp

@@ -65,7 +65,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);
@@ -75,13 +75,6 @@ CHIP_ERROR AppTask::Init()
     GetLCD().SetCustomUI(FanControlUI::DrawUI);
 #endif
 
-    err = BaseApplication::Init();
-    if (err != CHIP_NO_ERROR)
-    {
-        ChipLogError(AppServer, "BaseApplication::Init() failed");
-        appError(err);
-    }
-
     err = FanControlMgr().Init();
     if (err != CHIP_NO_ERROR)
     {

examples/multi-sensor-app/silabs/include/AppTask.h

@@ -121,11 +121,11 @@ class AppTask : public BaseApplication
     };
 
     /**
-     * @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;
 
 #ifdef DISPLAY_ENABLED
     /**

examples/multi-sensor-app/silabs/src/AppTask.cpp

@@ -58,21 +58,14 @@ constexpr uint8_t kOccupancyLedId = 0;
 
 AppTask AppTask::sAppTask;
 
-CHIP_ERROR AppTask::Init()
+CHIP_ERROR AppTask::AppInit()
 {
     CHIP_ERROR err = CHIP_NO_ERROR;
     GetPlatform().SetButtonsCb(AppTask::ButtonEventHandler);
 #ifdef DISPLAY_ENABLED
     GetLCD().Init((uint8_t *) SENSOR_NAME);
 #endif
 
-    err = BaseApplication::Init();
-    if (err != CHIP_NO_ERROR)
-    {
-        ChipLogError(AppServer, "BaseApplication::Init() failed");
-        appError(err);
-    }
-
     sOccupancyLed.Init(kOccupancyLedId);
     sOccupancyLed.Set(false);
 

examples/onoff-plug-app/silabs/include/AppTask.h

@@ -84,11 +84,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;
 
     static void TimerEventHandler(TimerHandle_t xTimer);
 };

examples/onoff-plug-app/silabs/src/AppTask.cpp

@@ -62,7 +62,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);
@@ -71,13 +71,6 @@ CHIP_ERROR AppTask::Init()
     GetLCD().Init((uint8_t *) "onoffPlug-App");
 #endif
 
-    err = BaseApplication::Init();
-    if (err != CHIP_NO_ERROR)
-    {
-        SILABS_LOG("BaseApplication::Init() failed");
-        appError(err);
-    }
-
     err = PlugMgr().Init();
     if (err != CHIP_NO_ERROR)
     {

examples/template/silabs/include/AppTask.h

@@ -52,7 +52,12 @@ class AppTask : public BaseApplication
 private:
     friend AppTask & GetAppTask(void);
 
-    CHIP_ERROR Init();
+    /**
+     * @brief Override of BaseApplication::AppInit() virtual method, called by BaseApplication::Init()
+     *
+     * @return CHIP_ERROR
+     */
+    CHIP_ERROR AppInit() override;
     static AppTask sAppTask;
     /**
      * @brief PB0 Button event processing function

examples/template/silabs/src/AppTask.cpp

@@ -48,18 +48,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/zigbee-matter-light/silabs/include/AppTask.h

@@ -92,11 +92,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/zigbee-matter-light/silabs/src/AppTask.cpp

@@ -94,7 +94,7 @@ using namespace ::chip::DeviceLayer;
 
 AppTask AppTask::sAppTask;
 
-CHIP_ERROR AppTask::Init()
+CHIP_ERROR AppTask::AppInit()
 {
     CHIP_ERROR err = CHIP_NO_ERROR;
     app::SetAttributePersistenceProvider(&gDeferredAttributePersister);
@@ -113,13 +113,6 @@ CHIP_ERROR AppTask::Init()
     ChipLogProgress(AppServer, "Sequential CMP 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)
     {