Skip to content

Commit 1f3b31e

Browse files
fbhaiyat-silabsmkardous-silabs
fbhaiyat-silabs
authored and
mkardous-silabs
committed
[Silabs] Fix silabs energy mangement app
1 parent 86b7291 commit 1f3b31e

File tree

3 files changed

+29
-21
lines changed

3 files changed

+29
-21
lines changed

‎examples/energy-management-app/silabs/BUILD.gn

+21-18
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,10 @@ if (wifi_soc) {
101101
"${examples_plat_dir}",
102102
"${chip_root}/src/lib",
103103
"${examples_common_plat_dir}",
104-
"../energy-management-common/include",
104+
"${chip_root}/examples/energy-management-app/energy-management-common/common/include",
105+
"${chip_root}/examples/energy-management-app/energy-management-common/device-energy-management/include",
106+
"${chip_root}/examples/energy-management-app/energy-management-common/energy-evse/include",
107+
"${chip_root}/examples/energy-management-app/energy-management-common/energy-reporting/include",
105108
]
106109

107110
if (use_wf200) {
@@ -136,23 +139,23 @@ silabs_executable("energy-management-app") {
136139
}
137140

138141
sources = [
139-
"${chip_root}/examples/energy-management-app/energy-management-common/src/ChargingTargetsMemMgr.cpp",
140-
"${chip_root}/examples/energy-management-app/energy-management-common/src/DEMTestEventTriggers.cpp",
141-
"${chip_root}/examples/energy-management-app/energy-management-common/src/DeviceEnergyManagementDelegateImpl.cpp",
142-
"${chip_root}/examples/energy-management-app/energy-management-common/src/DeviceEnergyManagementManager.cpp",
143-
"${chip_root}/examples/energy-management-app/energy-management-common/src/EVSEManufacturerImpl.cpp",
144-
"${chip_root}/examples/energy-management-app/energy-management-common/src/ElectricalPowerMeasurementDelegate.cpp",
145-
"${chip_root}/examples/energy-management-app/energy-management-common/src/EnergyEvseDelegateImpl.cpp",
146-
"${chip_root}/examples/energy-management-app/energy-management-common/src/EnergyEvseEventTriggers.cpp",
147-
"${chip_root}/examples/energy-management-app/energy-management-common/src/EnergyEvseMain.cpp",
148-
"${chip_root}/examples/energy-management-app/energy-management-common/src/EnergyEvseManager.cpp",
149-
"${chip_root}/examples/energy-management-app/energy-management-common/src/EnergyEvseTargetsStore.cpp",
150-
"${chip_root}/examples/energy-management-app/energy-management-common/src/EnergyReportingEventTriggers.cpp",
151-
"${chip_root}/examples/energy-management-app/energy-management-common/src/EnergyTimeUtils.cpp",
152-
"${chip_root}/examples/energy-management-app/energy-management-common/src/FakeReadings.cpp",
153-
"${chip_root}/examples/energy-management-app/energy-management-common/src/PowerTopologyDelegate.cpp",
154-
"${chip_root}/examples/energy-management-app/energy-management-common/src/device-energy-management-mode.cpp",
155-
"${chip_root}/examples/energy-management-app/energy-management-common/src/energy-evse-mode.cpp",
142+
"${chip_root}/examples/energy-management-app/energy-management-common/common/src/EnergyTimeUtils.cpp",
143+
"${chip_root}/examples/energy-management-app/energy-management-common/device-energy-management/src/DEMTestEventTriggers.cpp",
144+
"${chip_root}/examples/energy-management-app/energy-management-common/device-energy-management/src/DeviceEnergyManagementDelegateImpl.cpp",
145+
"${chip_root}/examples/energy-management-app/energy-management-common/device-energy-management/src/DeviceEnergyManagementManager.cpp",
146+
"${chip_root}/examples/energy-management-app/energy-management-common/device-energy-management/src/device-energy-management-mode.cpp",
147+
"${chip_root}/examples/energy-management-app/energy-management-common/energy-evse/src/ChargingTargetsMemMgr.cpp",
148+
"${chip_root}/examples/energy-management-app/energy-management-common/energy-evse/src/EVSEManufacturerImpl.cpp",
149+
"${chip_root}/examples/energy-management-app/energy-management-common/energy-evse/src/EnergyEvseDelegateImpl.cpp",
150+
"${chip_root}/examples/energy-management-app/energy-management-common/energy-evse/src/EnergyEvseEventTriggers.cpp",
151+
"${chip_root}/examples/energy-management-app/energy-management-common/energy-evse/src/EnergyEvseMain.cpp",
152+
"${chip_root}/examples/energy-management-app/energy-management-common/energy-evse/src/EnergyEvseManager.cpp",
153+
"${chip_root}/examples/energy-management-app/energy-management-common/energy-evse/src/EnergyEvseTargetsStore.cpp",
154+
"${chip_root}/examples/energy-management-app/energy-management-common/energy-evse/src/energy-evse-mode.cpp",
155+
"${chip_root}/examples/energy-management-app/energy-management-common/energy-reporting/src/ElectricalPowerMeasurementDelegate.cpp",
156+
"${chip_root}/examples/energy-management-app/energy-management-common/energy-reporting/src/EnergyReportingEventTriggers.cpp",
157+
"${chip_root}/examples/energy-management-app/energy-management-common/energy-reporting/src/FakeReadings.cpp",
158+
"${chip_root}/examples/energy-management-app/energy-management-common/energy-reporting/src/PowerTopologyDelegate.cpp",
156159
"${examples_common_plat_dir}/main.cpp",
157160
"src/AppTask.cpp",
158161
]

‎examples/energy-management-app/silabs/src/AppTask.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343

4444
#include <platform/CHIPDeviceLayer.h>
4545

46-
#if SL_MATTER_TEST_EVENT_TRIGGER_ENABLED
46+
#ifdef SL_MATTER_TEST_EVENT_TRIGGER_ENABLED
4747
#include <app/TestEventTriggerDelegate.h>
4848
#include <app/clusters/device-energy-management-server/DeviceEnergyManagementTestEventTriggerHandler.h>
4949
#include <app/clusters/electrical-energy-measurement-server/EnergyReportingTestEventTriggerHandler.h>
@@ -73,7 +73,7 @@ using namespace ::chip::DeviceLayer::Silabs;
7373
using namespace ::chip::DeviceLayer::Internal;
7474
using namespace chip::TLV;
7575

76-
#if SL_MATTER_TEST_EVENT_TRIGGER_ENABLED
76+
#ifdef SL_MATTER_TEST_EVENT_TRIGGER_ENABLED
7777
static EnergyEvseTestEventTriggerHandler sEnergyEvseTestEventTriggerHandler;
7878
static EnergyReportingTestEventTriggerHandler sEnergyReportingTestEventTriggerHandler;
7979
static DeviceEnergyManagementTestEventTriggerHandler sDeviceEnergyManagementTestEventTriggerHandler;
@@ -133,7 +133,7 @@ CHIP_ERROR AppTask::Init()
133133

134134
ApplicationInit();
135135

136-
#if SL_MATTER_TEST_EVENT_TRIGGER_ENABLED
136+
#ifdef SL_MATTER_TEST_EVENT_TRIGGER_ENABLED
137137
if (Server::GetInstance().GetTestEventTriggerDelegate() != nullptr)
138138
{
139139
Server::GetInstance().GetTestEventTriggerDelegate()->AddHandler(&sEnergyEvseTestEventTriggerHandler);

‎examples/platform/silabs/provision/BUILD.gn

+5
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,11 @@ source_set("storage") {
4747
}
4848

4949
deps = [ "${chip_root}/src/lib" ]
50+
5051
public_deps =
5152
[ "${chip_root}/src/platform/silabs/provision:provision-headers" ]
53+
54+
public_configs = [
55+
"${chip_root}/examples/platform/silabs/efr32:test-event-trigger-config",
56+
]
5257
}

0 commit comments

Comments
 (0)