diff --git a/examples/energy-management-app/silabs/BUILD.gn b/examples/energy-management-app/silabs/BUILD.gn index 624cfff6250a85..19e450d0b34d56 100644 --- a/examples/energy-management-app/silabs/BUILD.gn +++ b/examples/energy-management-app/silabs/BUILD.gn @@ -48,6 +48,7 @@ declare_args() { # Dump memory usage at link time. chip_print_memory_usage = false + # Enable test event triggers by default: Disable these in production devices sl_enable_energy_evse_trigger = true sl_enable_energy_reporting_trigger = true diff --git a/examples/energy-management-app/silabs/src/AppTask.cpp b/examples/energy-management-app/silabs/src/AppTask.cpp index 42069a85b5de84..21284134df17e8 100644 --- a/examples/energy-management-app/silabs/src/AppTask.cpp +++ b/examples/energy-management-app/silabs/src/AppTask.cpp @@ -21,6 +21,7 @@ #include "AppConfig.h" #include "AppEvent.h" #include "LEDWidget.h" + #if SL_MATTER_CONFIG_ENABLE_EXAMPLE_EVSE_DEVICE #include #endif @@ -153,6 +154,7 @@ void ApplicationInit() void ApplicationShutdown() { chip::DeviceLayer::PlatformMgr().LockChipStack(); + #if SL_MATTER_CONFIG_ENABLE_EXAMPLE_EVSE_DEVICE EvseApplicationShutdown(); #endif // CONFIG_ENABLE_EXAMPLE_EVSE_DEVICE @@ -169,6 +171,7 @@ CHIP_ERROR AppTask::Init() 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 @@ -185,6 +188,7 @@ CHIP_ERROR AppTask::Init() ApplicationInit(); + #ifdef SL_MATTER_TEST_EVENT_TRIGGER_ENABLED TestEventTriggerDelegate * pTestEventDelegate = Server::GetInstance().GetTestEventTriggerDelegate(); @@ -212,6 +216,7 @@ CHIP_ERROR AppTask::Init() VerifyOrDie(pTestEventDelegate->AddHandler(&sWaterHeaterManagementTestEventTriggerHandler) == CHIP_NO_ERROR); } #endif + #if SL_MATTER_CONFIG_ENABLE_DEVICE_ENERGY_MANAGEMENT_TRIGGER static DeviceEnergyManagementTestEventTriggerHandler sDeviceEnergyManagementTestEventTriggerHandler; if (pTestEventDelegate != nullptr) diff --git a/examples/platform/esp32/common/Esp32AppServer.cpp b/examples/platform/esp32/common/Esp32AppServer.cpp index 37dd7f4fe4adcf..e5b58e451e45e5 100644 --- a/examples/platform/esp32/common/Esp32AppServer.cpp +++ b/examples/platform/esp32/common/Esp32AppServer.cpp @@ -22,7 +22,7 @@ #include #include #include -#include + #include #include #include