diff --git a/examples/air-quality-sensor-app/silabs/include/AppConfig.h b/examples/air-quality-sensor-app/silabs/include/AppConfig.h index fafcfd3e830cd7..fadc32d573b7c3 100644 --- a/examples/air-quality-sensor-app/silabs/include/AppConfig.h +++ b/examples/air-quality-sensor-app/silabs/include/AppConfig.h @@ -25,7 +25,7 @@ #define APP_TASK_NAME "AQS" -#define BLE_DEV_NAME "SiLabs-Air-Quality-Sensor" +#define BLE_DEV_NAME "SL-" APP_TASK_NAME // Time it takes in ms for the simulated actuator to move from one // APP Logo, boolean only. must be 64x64 diff --git a/examples/air-quality-sensor-app/silabs/src/AppTask.cpp b/examples/air-quality-sensor-app/silabs/src/AppTask.cpp index 6bc60872b0e8d0..b025e7894c5f4e 100644 --- a/examples/air-quality-sensor-app/silabs/src/AppTask.cpp +++ b/examples/air-quality-sensor-app/silabs/src/AppTask.cpp @@ -73,7 +73,6 @@ CHIP_ERROR AppTask::AppInit() CHIP_ERROR err = CHIP_NO_ERROR; chip::DeviceLayer::Silabs::GetPlatform().SetButtonsCb(AppTask::ButtonEventHandler); #ifdef DISPLAY_ENABLED - GetLCD().Init((uint8_t *) "Air-Quality-Sensor"); GetLCD().SetCustomUI(AirQualitySensorUI::DrawUI); #endif diff --git a/examples/chef/silabs/include/AppConfig.h b/examples/chef/silabs/include/AppConfig.h index e278e9439a437f..a63b54eea29db4 100644 --- a/examples/chef/silabs/include/AppConfig.h +++ b/examples/chef/silabs/include/AppConfig.h @@ -22,7 +22,7 @@ // ---- Lighting Example App Config ---- -#define APP_TASK_NAME "Lit" +#define APP_TASK_NAME "Chef" // Time it takes in ms for the simulated actuator to move from one // state to another. diff --git a/examples/dishwasher-app/silabs/include/AppTask.h b/examples/dishwasher-app/silabs/include/AppTask.h index 63cc97e84922a2..99ffd2b94eff11 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 de686f68e957e0..ac3e970ccc37a7 100644 --- a/examples/dishwasher-app/silabs/src/AppTask.cpp +++ b/examples/dishwasher-app/silabs/src/AppTask.cpp @@ -60,22 +60,11 @@ 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); -#ifdef DISPLAY_ENABLED - 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/energy-management-app/silabs/include/AppConfig.h b/examples/energy-management-app/silabs/include/AppConfig.h index bbd4d201124fbf..5e09d26162c2b6 100644 --- a/examples/energy-management-app/silabs/include/AppConfig.h +++ b/examples/energy-management-app/silabs/include/AppConfig.h @@ -23,6 +23,10 @@ // ---- EVSE Example App Config ---- +#if SL_MATTER_CONFIG_ENABLE_EXAMPLE_EVSE_DEVICE #define APP_TASK_NAME "EVSE" +#else +#define APP_TASK_NAME "W-Heater" +#endif -#define BLE_DEV_NAME "SiLabs-EVSE" +#define BLE_DEV_NAME "SL-" APP_TASK_NAME diff --git a/examples/energy-management-app/silabs/src/AppTask.cpp b/examples/energy-management-app/silabs/src/AppTask.cpp index e217ed6ed75f1e..f5e61f1bfae663 100644 --- a/examples/energy-management-app/silabs/src/AppTask.cpp +++ b/examples/energy-management-app/silabs/src/AppTask.cpp @@ -181,15 +181,6 @@ CHIP_ERROR AppTask::AppInit() { CHIP_ERROR err = CHIP_NO_ERROR; chip::DeviceLayer::Silabs::GetPlatform().SetButtonsCb(AppTask::ButtonEventHandler); - -#ifdef DISPLAY_ENABLED -#if SL_MATTER_CONFIG_ENABLE_EXAMPLE_EVSE_DEVICE - GetLCD().Init((uint8_t *) "energy-management-App (EVSE)"); -#elif SL_CONFIG_ENABLE_EXAMPLE_WATER_HEATER_DEVICE - GetLCD().Init((uint8_t *) "energy-management-App (WaterHeater)"); -#endif -#endif - ApplicationInit(); #ifdef SL_MATTER_TEST_EVENT_TRIGGER_ENABLED diff --git a/examples/light-switch-app/silabs/include/AppConfig.h b/examples/light-switch-app/silabs/include/AppConfig.h index 040aafc6912b25..6276e25761f910 100644 --- a/examples/light-switch-app/silabs/include/AppConfig.h +++ b/examples/light-switch-app/silabs/include/AppConfig.h @@ -23,9 +23,9 @@ // ---- Lighting Example App Config ---- -#define APP_TASK_NAME "Lit" +#define APP_TASK_NAME "Light-Sw" -#define BLE_DEV_NAME "SiLabs-Light-Switch" +#define BLE_DEV_NAME "SL-" APP_TASK_NAME // Time it takes in ms for the simulated actuator to move from one // state to another. diff --git a/examples/light-switch-app/silabs/src/AppTask.cpp b/examples/light-switch-app/silabs/src/AppTask.cpp index df9a66f10d4e7a..5859d592152bad 100644 --- a/examples/light-switch-app/silabs/src/AppTask.cpp +++ b/examples/light-switch-app/silabs/src/AppTask.cpp @@ -76,10 +76,6 @@ CHIP_ERROR AppTask::AppInit() CHIP_ERROR err = CHIP_NO_ERROR; chip::DeviceLayer::Silabs::GetPlatform().SetButtonsCb(AppTask::ButtonEventHandler); -#ifdef DISPLAY_ENABLED - GetLCD().Init((uint8_t *) "Light Switch"); -#endif - err = LightSwitchMgr::GetInstance().Init(kLightSwitchEndpoint, kGenericSwitchEndpoint); if (err != CHIP_NO_ERROR) { diff --git a/examples/lighting-app/silabs/include/AppConfig.h b/examples/lighting-app/silabs/include/AppConfig.h index 4aee946506f022..3636f137391abc 100644 --- a/examples/lighting-app/silabs/include/AppConfig.h +++ b/examples/lighting-app/silabs/include/AppConfig.h @@ -23,9 +23,9 @@ // ---- Lighting Example App Config ---- -#define APP_TASK_NAME "Lit" +#define APP_TASK_NAME "Light" -#define BLE_DEV_NAME "SiLabs-Light" +#define BLE_DEV_NAME "SL-" APP_TASK_NAME // Time it takes in ms for the simulated actuator to move from one // state to another. diff --git a/examples/lighting-app/silabs/src/AppTask.cpp b/examples/lighting-app/silabs/src/AppTask.cpp index 191e7066a4cee3..d601ebac3ce0dd 100644 --- a/examples/lighting-app/silabs/src/AppTask.cpp +++ b/examples/lighting-app/silabs/src/AppTask.cpp @@ -67,10 +67,6 @@ CHIP_ERROR AppTask::AppInit() CHIP_ERROR err = CHIP_NO_ERROR; chip::DeviceLayer::Silabs::GetPlatform().SetButtonsCb(AppTask::ButtonEventHandler); -#ifdef DISPLAY_ENABLED - GetLCD().Init((uint8_t *) "Lighting-App"); -#endif - err = LightMgr().Init(); if (err != CHIP_NO_ERROR) { diff --git a/examples/lit-icd-app/silabs/include/AppConfig.h b/examples/lit-icd-app/silabs/include/AppConfig.h index 2ab78077e22261..a677861f8e443c 100644 --- a/examples/lit-icd-app/silabs/include/AppConfig.h +++ b/examples/lit-icd-app/silabs/include/AppConfig.h @@ -24,7 +24,7 @@ #define APP_TASK_NAME "Lit" -#define BLE_DEV_NAME "SiLabs-LIT-ICD" +#define BLE_DEV_NAME "SL-" APP_TASK_NAME // APP Logo, boolean only. must be 64x64 #define ON_DEMO_BITMAP \ diff --git a/examples/lit-icd-app/silabs/src/AppTask.cpp b/examples/lit-icd-app/silabs/src/AppTask.cpp index 828ba687fe3677..00eab95bee5b60 100644 --- a/examples/lit-icd-app/silabs/src/AppTask.cpp +++ b/examples/lit-icd-app/silabs/src/AppTask.cpp @@ -72,11 +72,6 @@ CHIP_ERROR AppTask::AppInit() { CHIP_ERROR err = CHIP_NO_ERROR; chip::DeviceLayer::Silabs::GetPlatform().SetButtonsCb(AppTask::ButtonEventHandler); - -#ifdef DISPLAY_ENABLED - GetLCD().Init((uint8_t *) "LIT ICD"); -#endif - return err; } diff --git a/examples/lock-app/silabs/include/AppConfig.h b/examples/lock-app/silabs/include/AppConfig.h index 2a98805fa0c8d3..2246b13196239a 100644 --- a/examples/lock-app/silabs/include/AppConfig.h +++ b/examples/lock-app/silabs/include/AppConfig.h @@ -25,7 +25,7 @@ #define APP_TASK_NAME "Lock" -#define BLE_DEV_NAME "SiLabs-Door-Lock" +#define BLE_DEV_NAME "SL-" APP_TASK_NAME // Time it takes in ms for the simulated actuator to move from one // state to another. diff --git a/examples/lock-app/silabs/src/AppTask.cpp b/examples/lock-app/silabs/src/AppTask.cpp index 4a930cca441a2b..31ff05f5d383e8 100644 --- a/examples/lock-app/silabs/src/AppTask.cpp +++ b/examples/lock-app/silabs/src/AppTask.cpp @@ -122,10 +122,6 @@ CHIP_ERROR AppTask::AppInit() chip::DeviceLayer::Silabs::GetPlatform().SetButtonsCb(AppTask::ButtonEventHandler); -#ifdef DISPLAY_ENABLED - GetLCD().Init((uint8_t *) "Lock-App", true); -#endif - #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 767d5aede6d335..8b092c0f565c68 100644 --- a/examples/platform/silabs/BaseApplication.cpp +++ b/examples/platform/silabs/BaseApplication.cpp @@ -288,6 +288,10 @@ CHIP_ERROR BaseApplication::BaseInit() { CHIP_ERROR err = CHIP_NO_ERROR; +#ifdef DISPLAY_ENABLED + GetLCD().Init((uint8_t *) APP_TASK_NAME); +#endif + #ifdef SL_WIFI /* * Wait for the WiFi to be initialized diff --git a/examples/pump-app/silabs/include/AppConfig.h b/examples/pump-app/silabs/include/AppConfig.h index e5645d69bfdf2c..964887de150466 100644 --- a/examples/pump-app/silabs/include/AppConfig.h +++ b/examples/pump-app/silabs/include/AppConfig.h @@ -23,9 +23,9 @@ // ---- Lighting Example App Config ---- -#define APP_TASK_NAME "Lit" +#define APP_TASK_NAME "Pump" -#define BLE_DEV_NAME "SiLabs-Pump" +#define BLE_DEV_NAME "SL-" APP_TASK_NAME #define ON_DEMO_BITMAP \ 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, \ diff --git a/examples/pump-app/silabs/src/AppTask.cpp b/examples/pump-app/silabs/src/AppTask.cpp index 19d2b6841d2a21..0fe0352b37fa4e 100644 --- a/examples/pump-app/silabs/src/AppTask.cpp +++ b/examples/pump-app/silabs/src/AppTask.cpp @@ -76,10 +76,6 @@ CHIP_ERROR AppTask::AppInit() CHIP_ERROR err = CHIP_NO_ERROR; chip::DeviceLayer::Silabs::GetPlatform().SetButtonsCb(AppTask::ButtonEventHandler); -#ifdef DISPLAY_ENABLED - GetLCD().Init((uint8_t *) "Pump-App"); -#endif - err = PumpMgr().Init(); if (err != CHIP_NO_ERROR) { diff --git a/examples/refrigerator-app/silabs/include/AppConfig.h b/examples/refrigerator-app/silabs/include/AppConfig.h index 3c9472f8d30ebe..11a337c7351e32 100644 --- a/examples/refrigerator-app/silabs/include/AppConfig.h +++ b/examples/refrigerator-app/silabs/include/AppConfig.h @@ -24,7 +24,7 @@ #define APP_TASK_NAME "Refr" -#define BLE_DEV_NAME "SiLabs-Refrigerator" +#define BLE_DEV_NAME "SL-" APP_TASK_NAME // Time it takes in ms for the simulated actuator to move from one // state to another. diff --git a/examples/refrigerator-app/silabs/src/AppTask.cpp b/examples/refrigerator-app/silabs/src/AppTask.cpp index fe2e0828df0181..021052867a6e82 100644 --- a/examples/refrigerator-app/silabs/src/AppTask.cpp +++ b/examples/refrigerator-app/silabs/src/AppTask.cpp @@ -80,10 +80,6 @@ CHIP_ERROR AppTask::AppInit() CHIP_ERROR err = CHIP_NO_ERROR; chip::DeviceLayer::Silabs::GetPlatform().SetButtonsCb(AppTask::ButtonEventHandler); -#ifdef DISPLAY_ENABLED - GetLCD().Init((uint8_t *) "Refrigrator-App"); -#endif - err = RefrigeratorMgr().Init(); if (err != CHIP_NO_ERROR) { diff --git a/examples/smoke-co-alarm-app/silabs/include/AppConfig.h b/examples/smoke-co-alarm-app/silabs/include/AppConfig.h index 3158c6c34a09aa..f5af1ec8db057b 100644 --- a/examples/smoke-co-alarm-app/silabs/include/AppConfig.h +++ b/examples/smoke-co-alarm-app/silabs/include/AppConfig.h @@ -21,9 +21,9 @@ // ---- Smoke CO Alarm Example App Config ---- -#define APP_TASK_NAME "Alm" +#define APP_TASK_NAME "Smoke" -#define BLE_DEV_NAME "SiLabs-Alarm" +#define BLE_DEV_NAME "SL-" APP_TASK_NAME // Time it takes in ms for the simulated actuator to move from one // state to another. diff --git a/examples/smoke-co-alarm-app/silabs/src/AppTask.cpp b/examples/smoke-co-alarm-app/silabs/src/AppTask.cpp index 868c1ee854aa4e..52e1de7dab86a2 100644 --- a/examples/smoke-co-alarm-app/silabs/src/AppTask.cpp +++ b/examples/smoke-co-alarm-app/silabs/src/AppTask.cpp @@ -59,10 +59,6 @@ CHIP_ERROR AppTask::AppInit() CHIP_ERROR err = CHIP_NO_ERROR; chip::DeviceLayer::Silabs::GetPlatform().SetButtonsCb(AppTask::ButtonEventHandler); -#ifdef DISPLAY_ENABLED - GetLCD().Init((uint8_t *) "Smoke-CO-Alarm-App"); -#endif - err = AlarmMgr().Init(); if (err != CHIP_NO_ERROR) { diff --git a/examples/thermostat/silabs/include/AppConfig.h b/examples/thermostat/silabs/include/AppConfig.h index edba77c5fc078c..6c6135b459e78d 100644 --- a/examples/thermostat/silabs/include/AppConfig.h +++ b/examples/thermostat/silabs/include/AppConfig.h @@ -23,9 +23,9 @@ // ---- Lighting Example App Config ---- -#define APP_TASK_NAME "Lit" +#define APP_TASK_NAME "Therm" -#define BLE_DEV_NAME "SiLabs-Thermostat" +#define BLE_DEV_NAME "SL-" APP_TASK_NAME // Time it takes in ms for the simulated actuator to move from one // state to another. diff --git a/examples/thermostat/silabs/src/AppTask.cpp b/examples/thermostat/silabs/src/AppTask.cpp index 74da4b5614204e..f2325fd0e18dd9 100644 --- a/examples/thermostat/silabs/src/AppTask.cpp +++ b/examples/thermostat/silabs/src/AppTask.cpp @@ -79,7 +79,6 @@ CHIP_ERROR AppTask::AppInit() chip::DeviceLayer::Silabs::GetPlatform().SetButtonsCb(AppTask::ButtonEventHandler); #ifdef DISPLAY_ENABLED - GetLCD().Init((uint8_t *) "Thermostat-App"); GetLCD().SetCustomUI(ThermostatUI::DrawUI); #endif diff --git a/examples/window-app/silabs/include/AppConfig.h b/examples/window-app/silabs/include/AppConfig.h index 578861f25987a3..25a0f853ada61b 100644 --- a/examples/window-app/silabs/include/AppConfig.h +++ b/examples/window-app/silabs/include/AppConfig.h @@ -22,9 +22,9 @@ #include "silabs_utils.h" // ---- Window Example App Config ---- -#define APP_TASK_NAME "APP" +#define APP_TASK_NAME "Window" #define APP_EVENT_QUEUE_SIZE 20 -#define BLE_DEV_NAME "SiLabs-Window" +#define BLE_DEV_NAME "SL-" APP_TASK_NAME #define LCD_SIZE 128 #define LCD_MARGIN_SIZE 1 diff --git a/examples/window-app/silabs/src/AppTask.cpp b/examples/window-app/silabs/src/AppTask.cpp index 2610b350771c91..fb9fef320389fd 100644 --- a/examples/window-app/silabs/src/AppTask.cpp +++ b/examples/window-app/silabs/src/AppTask.cpp @@ -50,10 +50,6 @@ CHIP_ERROR AppTask::AppInit() CHIP_ERROR err = CHIP_NO_ERROR; chip::DeviceLayer::Silabs::GetPlatform().SetButtonsCb(WindowManager::ButtonEventHandler); -#ifdef DISPLAY_ENABLED - GetLCD().Init((uint8_t *) "Window-App"); -#endif - err = WindowManager::sWindow.Init(); if (err != CHIP_NO_ERROR)