From 42f34dd6220c39f3b54a2191dcdaa75825abfd14 Mon Sep 17 00:00:00 2001 From: lpbeliveau-silabs Date: Mon, 17 Mar 2025 16:35:34 -0400 Subject: [PATCH] Moved all LCD init into BaseApplication --- .../air-quality-sensor-app/silabs/include/AppConfig.h | 2 +- examples/air-quality-sensor-app/silabs/src/AppTask.cpp | 1 - examples/chef/silabs/include/AppConfig.h | 2 +- .../energy-management-app/silabs/include/AppConfig.h | 6 +++++- examples/energy-management-app/silabs/src/AppTask.cpp | 9 --------- examples/light-switch-app/silabs/include/AppConfig.h | 4 ++-- examples/light-switch-app/silabs/src/AppTask.cpp | 4 ---- examples/lighting-app/silabs/include/AppConfig.h | 4 ++-- examples/lighting-app/silabs/src/AppTask.cpp | 3 --- examples/lit-icd-app/silabs/include/AppConfig.h | 2 +- examples/lit-icd-app/silabs/src/AppTask.cpp | 5 ----- examples/lock-app/silabs/include/AppConfig.h | 2 +- examples/lock-app/silabs/src/AppTask.cpp | 4 ---- examples/platform/silabs/BaseApplication.cpp | 4 ++++ examples/pump-app/silabs/include/AppConfig.h | 4 ++-- examples/pump-app/silabs/src/AppTask.cpp | 4 ---- examples/refrigerator-app/silabs/include/AppConfig.h | 2 +- examples/refrigerator-app/silabs/src/AppTask.cpp | 4 ---- examples/smoke-co-alarm-app/silabs/include/AppConfig.h | 4 ++-- examples/smoke-co-alarm-app/silabs/src/AppTask.cpp | 4 ---- examples/thermostat/silabs/include/AppConfig.h | 4 ++-- examples/thermostat/silabs/src/AppTask.cpp | 1 - examples/window-app/silabs/include/AppConfig.h | 4 ++-- examples/window-app/silabs/src/AppTask.cpp | 4 ---- 24 files changed, 26 insertions(+), 61 deletions(-) diff --git a/examples/air-quality-sensor-app/silabs/include/AppConfig.h b/examples/air-quality-sensor-app/silabs/include/AppConfig.h index fafcfd3e83..fadc32d573 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 aabfc84f35..791ca42cbc 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 e278e9439a..a63b54eea2 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/energy-management-app/silabs/include/AppConfig.h b/examples/energy-management-app/silabs/include/AppConfig.h index bbd4d20112..5e09d26162 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 052bc1089a..487d282e5a 100644 --- a/examples/energy-management-app/silabs/src/AppTask.cpp +++ b/examples/energy-management-app/silabs/src/AppTask.cpp @@ -167,15 +167,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 8f6c5e090c..976c0ed510 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 4c558ad9ee..55d0344028 100644 --- a/examples/light-switch-app/silabs/src/AppTask.cpp +++ b/examples/light-switch-app/silabs/src/AppTask.cpp @@ -73,10 +73,6 @@ CHIP_ERROR AppTask::AppInit() CHIP_ERROR err = CHIP_NO_ERROR; chip::DeviceLayer::Silabs::GetPlatform().SetButtonsCb(LightSwitchMgr::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 4aee946506..3636f13739 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 82c3349983..9e12570cc0 100644 --- a/examples/lighting-app/silabs/src/AppTask.cpp +++ b/examples/lighting-app/silabs/src/AppTask.cpp @@ -71,9 +71,6 @@ CHIP_ERROR AppTask::AppInit() char rebootLightOnKey[] = "Reboot->LightOn"; CharSpan rebootLighOnSpan(rebootLightOnKey); SILABS_TRACE_REGISTER(rebootLighOnSpan); -#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 2ab78077e2..a677861f8e 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 313b449d29..374ec35ed3 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 2a98805fa0..2246b13196 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 f75c191552..0cafb156c9 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 dad447af2b..2ae2722c58 100644 --- a/examples/platform/silabs/BaseApplication.cpp +++ b/examples/platform/silabs/BaseApplication.cpp @@ -326,6 +326,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 e5645d69bf..964887de15 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 5d5f38ada2..660e0f502f 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 3c9472f8d3..11a337c735 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 17430b44cf..947ea57bcd 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 3158c6c34a..f5af1ec8db 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 a45e8e6523..0aa7ec1c12 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 edba77c5fc..6c6135b459 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 8f405aeb9a..8d589ecdc6 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 578861f259..25a0f853ad 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 d020e2da3b..fbb9a74e6c 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)