From 02933c885bf0cf0933b7489684871068dc68379c Mon Sep 17 00:00:00 2001
From: Junior Martinez <67972863+jmartinez-silabs@users.noreply.github.com>
Date: Fri, 14 Mar 2025 12:41:31 -0400
Subject: [PATCH] Update sl_apps Apptask Init to AppInit post change in
 baseApplication

---
 examples/dishwasher-app/silabs/include/AppTask.h      | 4 ++--
 examples/dishwasher-app/silabs/src/AppTask.cpp        | 9 +--------
 examples/fan-control-app/silabs/include/AppTask.h     | 4 ++--
 examples/fan-control-app/silabs/src/AppTask.cpp       | 9 +--------
 examples/multi-sensor-app/silabs/include/AppTask.h    | 4 ++--
 examples/multi-sensor-app/silabs/src/AppTask.cpp      | 9 +--------
 examples/onoff-plug-app/silabs/include/AppTask.h      | 4 ++--
 examples/onoff-plug-app/silabs/src/AppTask.cpp        | 9 +--------
 examples/template/silabs/include/AppTask.h            | 7 ++++++-
 examples/template/silabs/src/AppTask.cpp              | 9 +--------
 examples/zigbee-matter-light/silabs/include/AppTask.h | 4 ++--
 examples/zigbee-matter-light/silabs/src/AppTask.cpp   | 9 +--------
 12 files changed, 22 insertions(+), 59 deletions(-)

diff --git a/examples/dishwasher-app/silabs/include/AppTask.h b/examples/dishwasher-app/silabs/include/AppTask.h
index 63cc97e849..99ffd2b94e 100644
--- a/examples/dishwasher-app/silabs/include/AppTask.h
+++ b/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
diff --git a/examples/dishwasher-app/silabs/src/AppTask.cpp b/examples/dishwasher-app/silabs/src/AppTask.cpp
index de686f68e9..97ac04f3f4 100644
--- a/examples/dishwasher-app/silabs/src/AppTask.cpp
+++ b/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();
diff --git a/examples/fan-control-app/silabs/include/AppTask.h b/examples/fan-control-app/silabs/include/AppTask.h
index 99170ef5bd..bdda619f2d 100644
--- a/examples/fan-control-app/silabs/include/AppTask.h
+++ b/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;
 
diff --git a/examples/fan-control-app/silabs/src/AppTask.cpp b/examples/fan-control-app/silabs/src/AppTask.cpp
index f681a39d25..4be0412cb3 100644
--- a/examples/fan-control-app/silabs/src/AppTask.cpp
+++ b/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)
     {
diff --git a/examples/multi-sensor-app/silabs/include/AppTask.h b/examples/multi-sensor-app/silabs/include/AppTask.h
index 017d541db5..79f96693ca 100644
--- a/examples/multi-sensor-app/silabs/include/AppTask.h
+++ b/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
     /**
diff --git a/examples/multi-sensor-app/silabs/src/AppTask.cpp b/examples/multi-sensor-app/silabs/src/AppTask.cpp
index 5e5759e9af..36813a674c 100755
--- a/examples/multi-sensor-app/silabs/src/AppTask.cpp
+++ b/examples/multi-sensor-app/silabs/src/AppTask.cpp
@@ -58,7 +58,7 @@ 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);
@@ -66,13 +66,6 @@ CHIP_ERROR AppTask::Init()
     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);
 
diff --git a/examples/onoff-plug-app/silabs/include/AppTask.h b/examples/onoff-plug-app/silabs/include/AppTask.h
index 7bf4f2f389..d89fd519d0 100644
--- a/examples/onoff-plug-app/silabs/include/AppTask.h
+++ b/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);
 };
diff --git a/examples/onoff-plug-app/silabs/src/AppTask.cpp b/examples/onoff-plug-app/silabs/src/AppTask.cpp
index e061eea22c..3e197180e4 100644
--- a/examples/onoff-plug-app/silabs/src/AppTask.cpp
+++ b/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)
     {
diff --git a/examples/template/silabs/include/AppTask.h b/examples/template/silabs/include/AppTask.h
index c41cd839e3..318bfb620f 100644
--- a/examples/template/silabs/include/AppTask.h
+++ b/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
diff --git a/examples/template/silabs/src/AppTask.cpp b/examples/template/silabs/src/AppTask.cpp
index d7fde730fd..2ea15e3203 100644
--- a/examples/template/silabs/src/AppTask.cpp
+++ b/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;
 }
 
diff --git a/examples/zigbee-matter-light/silabs/include/AppTask.h b/examples/zigbee-matter-light/silabs/include/AppTask.h
index 2a8aacb5ed..e32dbb99dc 100644
--- a/examples/zigbee-matter-light/silabs/include/AppTask.h
+++ b/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
diff --git a/examples/zigbee-matter-light/silabs/src/AppTask.cpp b/examples/zigbee-matter-light/silabs/src/AppTask.cpp
index 4e21fa5724..8b0a4769b7 100644
--- a/examples/zigbee-matter-light/silabs/src/AppTask.cpp
+++ b/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)
     {