From a9ab8f3ba90fb84c90976806bf935a2417ac4a1f Mon Sep 17 00:00:00 2001 From: lpbeliveau-silabs <112982107+lpbeliveau-silabs@users.noreply.github.com> Date: Thu, 13 Mar 2025 17:24:31 -0400 Subject: [PATCH] [Silabs] BaseApplication Init refactor (#37985) * Refactor of BaseApplication to reduce code copied accross examples * Removed unused method * Update examples/platform/silabs/BaseApplication.h Co-authored-by: Mathieu Kardous <84793247+mkardous-silabs@users.noreply.github.com> * Update examples/platform/silabs/BaseApplication.h * Update examples/platform/silabs/BaseApplication.h * Update examples/platform/silabs/BaseApplication.h --------- Co-authored-by: Mathieu Kardous <84793247+mkardous-silabs@users.noreply.github.com> --- .../silabs/include/AppTask.h | 4 +-- .../silabs/src/AppTask.cpp | 8 +---- examples/chef/silabs/include/AppTask.h | 4 +-- examples/chef/silabs/src/AppTask.cpp | 9 +----- .../silabs/include/AppTask.h | 4 +-- .../silabs/src/AppTask.cpp | 9 +----- .../light-switch-app/silabs/include/AppTask.h | 4 +-- .../light-switch-app/silabs/src/AppTask.cpp | 9 +----- .../lighting-app/silabs/include/AppTask.h | 4 +-- examples/lighting-app/silabs/src/AppTask.cpp | 10 +------ examples/lit-icd-app/silabs/include/AppTask.h | 4 +-- examples/lit-icd-app/silabs/src/AppTask.cpp | 9 +----- examples/lock-app/silabs/include/AppTask.h | 4 +-- examples/lock-app/silabs/src/AppTask.cpp | 9 +----- examples/platform/silabs/BaseApplication.cpp | 29 +++++++++++++++---- examples/platform/silabs/BaseApplication.h | 11 +++---- examples/pump-app/silabs/include/AppTask.h | 4 +-- examples/pump-app/silabs/src/AppTask.cpp | 9 +----- .../refrigerator-app/silabs/include/AppTask.h | 4 +-- .../refrigerator-app/silabs/src/AppTask.cpp | 8 +---- .../silabs/include/AppTask.h | 4 +-- .../smoke-co-alarm-app/silabs/src/AppTask.cpp | 9 +----- examples/thermostat/silabs/include/AppTask.h | 4 +-- examples/thermostat/silabs/src/AppTask.cpp | 8 +---- examples/window-app/silabs/include/AppTask.h | 4 +-- examples/window-app/silabs/src/AppTask.cpp | 9 +----- 26 files changed, 63 insertions(+), 131 deletions(-) diff --git a/examples/air-quality-sensor-app/silabs/include/AppTask.h b/examples/air-quality-sensor-app/silabs/include/AppTask.h index 4a42295ffd..c4d68b6542 100644 --- a/examples/air-quality-sensor-app/silabs/include/AppTask.h +++ b/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 diff --git a/examples/air-quality-sensor-app/silabs/src/AppTask.cpp b/examples/air-quality-sensor-app/silabs/src/AppTask.cpp index 572ec66dd5..aabfc84f35 100644 --- a/examples/air-quality-sensor-app/silabs/src/AppTask.cpp +++ b/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) { diff --git a/examples/chef/silabs/include/AppTask.h b/examples/chef/silabs/include/AppTask.h index b6c6d8a271..16278f3af6 100644 --- a/examples/chef/silabs/include/AppTask.h +++ b/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 diff --git a/examples/chef/silabs/src/AppTask.cpp b/examples/chef/silabs/src/AppTask.cpp index aed343e1b3..966936daee 100644 --- a/examples/chef/silabs/src/AppTask.cpp +++ b/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; } diff --git a/examples/energy-management-app/silabs/include/AppTask.h b/examples/energy-management-app/silabs/include/AppTask.h index b7105da428..9141c4e99d 100644 --- a/examples/energy-management-app/silabs/include/AppTask.h +++ b/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 diff --git a/examples/energy-management-app/silabs/src/AppTask.cpp b/examples/energy-management-app/silabs/src/AppTask.cpp index 42069a85b5..052bc1089a 100644 --- a/examples/energy-management-app/silabs/src/AppTask.cpp +++ b/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 diff --git a/examples/light-switch-app/silabs/include/AppTask.h b/examples/light-switch-app/silabs/include/AppTask.h index 541e9aa37f..6133d05c49 100644 --- a/examples/light-switch-app/silabs/include/AppTask.h +++ b/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; }; diff --git a/examples/light-switch-app/silabs/src/AppTask.cpp b/examples/light-switch-app/silabs/src/AppTask.cpp index c3a32415ab..4c558ad9ee 100644 --- a/examples/light-switch-app/silabs/src/AppTask.cpp +++ b/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) { diff --git a/examples/lighting-app/silabs/include/AppTask.h b/examples/lighting-app/silabs/include/AppTask.h index c42415d886..e52c904363 100644 --- a/examples/lighting-app/silabs/include/AppTask.h +++ b/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 diff --git a/examples/lighting-app/silabs/src/AppTask.cpp b/examples/lighting-app/silabs/src/AppTask.cpp index ea0c8e1010..82c3349983 100644 --- a/examples/lighting-app/silabs/src/AppTask.cpp +++ b/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; } diff --git a/examples/lit-icd-app/silabs/include/AppTask.h b/examples/lit-icd-app/silabs/include/AppTask.h index e4440f78d7..c145e938b3 100644 --- a/examples/lit-icd-app/silabs/include/AppTask.h +++ b/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 diff --git a/examples/lit-icd-app/silabs/src/AppTask.cpp b/examples/lit-icd-app/silabs/src/AppTask.cpp index 0f330e700b..313b449d29 100644 --- a/examples/lit-icd-app/silabs/src/AppTask.cpp +++ b/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; } diff --git a/examples/lock-app/silabs/include/AppTask.h b/examples/lock-app/silabs/include/AppTask.h index fb911e3ff0..6327f18a3d 100644 --- a/examples/lock-app/silabs/include/AppTask.h +++ b/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 diff --git a/examples/lock-app/silabs/src/AppTask.cpp b/examples/lock-app/silabs/src/AppTask.cpp index 4e4d05a810..f75c191552 100644 --- a/examples/lock-app/silabs/src/AppTask.cpp +++ b/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) diff --git a/examples/platform/silabs/BaseApplication.cpp b/examples/platform/silabs/BaseApplication.cpp index 3ab8bcfd4b..dad447af2b 100644 --- a/examples/platform/silabs/BaseApplication.cpp +++ b/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; diff --git a/examples/platform/silabs/BaseApplication.h b/examples/platform/silabs/BaseApplication.h index e7457908eb..95d20471ae 100644 --- a/examples/platform/silabs/BaseApplication.h +++ b/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 diff --git a/examples/pump-app/silabs/include/AppTask.h b/examples/pump-app/silabs/include/AppTask.h index 921ae9a269..129d6282ec 100644 --- a/examples/pump-app/silabs/include/AppTask.h +++ b/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 diff --git a/examples/pump-app/silabs/src/AppTask.cpp b/examples/pump-app/silabs/src/AppTask.cpp index 1b4881ff77..5d5f38ada2 100644 --- a/examples/pump-app/silabs/src/AppTask.cpp +++ b/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) { diff --git a/examples/refrigerator-app/silabs/include/AppTask.h b/examples/refrigerator-app/silabs/include/AppTask.h index 36c4581b29..5b1efd6100 100644 --- a/examples/refrigerator-app/silabs/include/AppTask.h +++ b/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 diff --git a/examples/refrigerator-app/silabs/src/AppTask.cpp b/examples/refrigerator-app/silabs/src/AppTask.cpp index c9dc451b71..17430b44cf 100644 --- a/examples/refrigerator-app/silabs/src/AppTask.cpp +++ b/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) { diff --git a/examples/smoke-co-alarm-app/silabs/include/AppTask.h b/examples/smoke-co-alarm-app/silabs/include/AppTask.h index 0cfd86fa01..eefddcaa53 100644 --- a/examples/smoke-co-alarm-app/silabs/include/AppTask.h +++ b/examples/smoke-co-alarm-app/silabs/include/AppTask.h @@ -79,11 +79,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 diff --git a/examples/smoke-co-alarm-app/silabs/src/AppTask.cpp b/examples/smoke-co-alarm-app/silabs/src/AppTask.cpp index 105a3c9e5b..a45e8e6523 100644 --- a/examples/smoke-co-alarm-app/silabs/src/AppTask.cpp +++ b/examples/smoke-co-alarm-app/silabs/src/AppTask.cpp @@ -54,7 +54,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); @@ -63,13 +63,6 @@ CHIP_ERROR AppTask::Init() GetLCD().Init((uint8_t *) "Smoke-CO-Alarm-App"); #endif - err = BaseApplication::Init(); - if (err != CHIP_NO_ERROR) - { - SILABS_LOG("BaseApplication::Init() failed"); - appError(err); - } - err = AlarmMgr().Init(); if (err != CHIP_NO_ERROR) { diff --git a/examples/thermostat/silabs/include/AppTask.h b/examples/thermostat/silabs/include/AppTask.h index e411229942..f5537c1058 100644 --- a/examples/thermostat/silabs/include/AppTask.h +++ b/examples/thermostat/silabs/include/AppTask.h @@ -91,11 +91,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 diff --git a/examples/thermostat/silabs/src/AppTask.cpp b/examples/thermostat/silabs/src/AppTask.cpp index e033a3fe2b..8f405aeb9a 100644 --- a/examples/thermostat/silabs/src/AppTask.cpp +++ b/examples/thermostat/silabs/src/AppTask.cpp @@ -73,7 +73,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); @@ -83,12 +83,6 @@ CHIP_ERROR AppTask::Init() GetLCD().SetCustomUI(ThermostatUI::DrawUI); #endif - err = BaseApplication::Init(); - if (err != CHIP_NO_ERROR) - { - SILABS_LOG("BaseApplication::Init() failed"); - appError(err); - } err = SensorMgr().Init(); if (err != CHIP_NO_ERROR) { diff --git a/examples/window-app/silabs/include/AppTask.h b/examples/window-app/silabs/include/AppTask.h index ea9f6e5e19..414a45a5f2 100644 --- a/examples/window-app/silabs/include/AppTask.h +++ b/examples/window-app/silabs/include/AppTask.h @@ -59,9 +59,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; }; diff --git a/examples/window-app/silabs/src/AppTask.cpp b/examples/window-app/silabs/src/AppTask.cpp index 214a405b61..d020e2da3b 100644 --- a/examples/window-app/silabs/src/AppTask.cpp +++ b/examples/window-app/silabs/src/AppTask.cpp @@ -45,7 +45,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(WindowManager::ButtonEventHandler); @@ -54,13 +54,6 @@ CHIP_ERROR AppTask::Init() GetLCD().Init((uint8_t *) "Window-App"); #endif - err = BaseApplication::Init(); - if (err != CHIP_NO_ERROR) - { - SILABS_LOG("BaseApplication::Init() failed"); - appError(err); - } - err = WindowManager::sWindow.Init(); if (err != CHIP_NO_ERROR)