Skip to content

Commit 8299037

Browse files
authored
Merge branch 'master' into feature/add-validation-logic
2 parents 5611211 + 9ef5bbf commit 8299037

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+2693
-144
lines changed

.github/workflows/tests.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -527,6 +527,7 @@ jobs:
527527
scripts/run_in_python_env.sh out/venv './scripts/tests/run_python_test.py --load-from-env /tmp/test_env.yaml --script src/python_testing/TC_EEM_2_4.py'
528528
scripts/run_in_python_env.sh out/venv './scripts/tests/run_python_test.py --load-from-env /tmp/test_env.yaml --script src/python_testing/TC_EEM_2_5.py'
529529
scripts/run_in_python_env.sh out/venv './scripts/tests/run_python_test.py --load-from-env /tmp/test_env.yaml --script src/python_testing/TC_EEVSE_2_2.py'
530+
scripts/run_in_python_env.sh out/venv './scripts/tests/run_python_test.py --load-from-env /tmp/test_env.yaml --script src/python_testing/TC_EEVSE_2_3.py'
530531
scripts/run_in_python_env.sh out/venv './scripts/tests/run_python_test.py --load-from-env /tmp/test_env.yaml --script src/python_testing/TC_EEVSE_2_4.py'
531532
scripts/run_in_python_env.sh out/venv './scripts/tests/run_python_test.py --load-from-env /tmp/test_env.yaml --script src/python_testing/TC_EEVSE_2_5.py'
532533
scripts/run_in_python_env.sh out/venv './scripts/tests/run_python_test.py --load-from-env /tmp/test_env.yaml --script src/python_testing/TC_EPM_2_1.py'

BUILD.gn

+2
Original file line numberDiff line numberDiff line change
@@ -146,6 +146,8 @@ if (current_toolchain != "${dir_pw_toolchain}/default:default") {
146146

147147
if (chip_build_tests) {
148148
deps += [ "//src:tests" ]
149+
deps += [ "//examples:example_tests" ]
150+
149151
if (current_os == "android" && current_toolchain == default_toolchain) {
150152
deps += [ "${chip_root}/build/chip/java/tests:java_build_test" ]
151153
}

config/esp32/components/chip/CMakeLists.txt

+3
Original file line numberDiff line numberDiff line change
@@ -224,6 +224,9 @@ endif()
224224

225225
if (CONFIG_ENABLE_MATTER_OVER_THREAD)
226226
chip_gn_arg_append("chip_enable_openthread" "true")
227+
if (CONFIG_THREAD_NETWORK_COMMISSIONING_DRIVER)
228+
chip_gn_arg_append("chip_device_config_thread_network_endpoint_id" ${CONFIG_THREAD_NETWORK_ENDPOINT_ID})
229+
endif()
227230
else()
228231
chip_gn_arg_append("chip_enable_openthread" "false")
229232
endif()

config/esp32/components/chip/Kconfig

+54
Original file line numberDiff line numberDiff line change
@@ -157,6 +157,12 @@ menu "CHIP Core"
157157
help
158158
Option to enable/disable CHIP log level filtering APIs.
159159

160+
config ENABLE_CHIP_DATA_MODEL
161+
bool "Enable CHIP data model"
162+
default y
163+
help
164+
Option to enable/disable CHIP data model.
165+
160166
endmenu # "General Options"
161167

162168
menu "Networking Options"
@@ -1289,4 +1295,52 @@ menu "CHIP Device Layer"
12891295

12901296
endmenu
12911297

1298+
menu "Network Commissioning Driver Endpoint Id"
1299+
config THREAD_NETWORK_COMMISSIONING_DRIVER
1300+
bool "Use the generic Thread network commissioning driver"
1301+
depends on ENABLE_MATTER_OVER_THREAD && ENABLE_CHIP_DATA_MODEL
1302+
default y
1303+
help
1304+
Option to enable/disable the use of generic Thread network commissioning driver.
1305+
1306+
config THREAD_NETWORK_ENDPOINT_ID
1307+
int "Endpoint Id for Thread network"
1308+
depends on THREAD_NETWORK_COMMISSIONING_DRIVER
1309+
range 0 65534
1310+
default 0
1311+
help
1312+
The endpoint id for the generic Thread network commissioning driver.
1313+
1314+
config WIFI_NETWORK_COMMISSIONING_DRIVER
1315+
bool "Use ESP Wi-Fi network commissioning driver"
1316+
depends on (ENABLE_WIFI_STATION || ENABLE_WIFI_AP) && ENABLE_CHIP_DATA_MODEL
1317+
default y
1318+
help
1319+
Option to enable/disable the use of ESP Wi-Fi network commissioning driver.
1320+
1321+
config WIFI_NETWORK_ENDPOINT_ID
1322+
int "Endpoint Id for Wi-Fi network"
1323+
depends on WIFI_NETWORK_COMMISSIONING_DRIVER
1324+
range 0 65534
1325+
default 0
1326+
help
1327+
The endpoint id for the ESP Wi-Fi network commissioning driver.
1328+
1329+
config ETHERNET_NETWORK_COMMISSIONING_DRIVER
1330+
bool "Use ESP Ethernet network commissioning driver"
1331+
depends on ENABLE_ETHERNET_TELEMETRY && ENABLE_CHIP_DATA_MODEL
1332+
default y
1333+
help
1334+
Option to enable/disable the use of ESP Ethernet network commissioning driver.
1335+
1336+
config ETHERNET_NETWORK_ENDPOINT_ID
1337+
int "Endpoint Id for Ethernet network"
1338+
depends on ETHERNET_NETWORK_COMMISSIONING_DRIVER
1339+
range 0 65534
1340+
default 0
1341+
help
1342+
The endpoint id for the ESP Ethernet network commissioning driver.
1343+
1344+
endmenu
1345+
12921346
endmenu

examples/BUILD.gn

+32
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
# Copyright (c) 2020-2021 Project CHIP Authors
2+
#
3+
# Licensed under the Apache License, Version 2.0 (the "License");
4+
# you may not use this file except in compliance with the License.
5+
# You may obtain a copy of the License at
6+
#
7+
# http://www.apache.org/licenses/LICENSE-2.0
8+
#
9+
# Unless required by applicable law or agreed to in writing, software
10+
# distributed under the License is distributed on an "AS IS" BASIS,
11+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
# See the License for the specific language governing permissions and
13+
# limitations under the License.
14+
15+
import("//build_overrides/build.gni")
16+
import("//build_overrides/chip.gni")
17+
18+
import("${build_root}/config/compiler/compiler.gni")
19+
import("${chip_root}/build/chip/tests.gni")
20+
import("${chip_root}/src/platform/device.gni")
21+
22+
if (chip_build_tests) {
23+
import("${chip_root}/build/chip/chip_test_group.gni")
24+
25+
chip_test_group("example_tests") {
26+
deps = []
27+
tests = []
28+
if (chip_device_platform == "linux" && current_os == "linux") {
29+
tests += [ "${chip_root}/examples/energy-management-app/energy-management-common/tests" ]
30+
}
31+
}
32+
}

examples/all-clusters-app/all-clusters-common/src/energy-evse-stub.cpp

+11-1
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,24 @@ using namespace chip::app::Clusters;
2323
using namespace chip::app::Clusters::EnergyEvse;
2424

2525
static std::unique_ptr<EnergyEvseDelegate> gDelegate;
26+
static std::unique_ptr<EvseTargetsDelegate> gEvseTargetsDelegate;
2627
static std::unique_ptr<EnergyEvseManager> gInstance;
2728

2829
void emberAfEnergyEvseClusterInitCallback(chip::EndpointId endpointId)
2930
{
3031
VerifyOrDie(endpointId == 1); // this cluster is only enabled for endpoint 1.
32+
VerifyOrDie(!gDelegate);
33+
VerifyOrDie(!gEvseTargetsDelegate);
3134
VerifyOrDie(!gInstance);
3235

33-
gDelegate = std::make_unique<EnergyEvseDelegate>();
36+
gEvseTargetsDelegate = std::make_unique<EvseTargetsDelegate>();
37+
if (!gEvseTargetsDelegate)
38+
{
39+
ChipLogError(AppServer, "Failed to allocate memory for EvseTargetsDelegate");
40+
return;
41+
}
42+
43+
gDelegate = std::make_unique<EnergyEvseDelegate>(*gEvseTargetsDelegate);
3444
if (gDelegate)
3545
{
3646
gInstance = std::make_unique<EnergyEvseManager>(

examples/all-clusters-app/ameba/chip_main.cmake

+3-1
Original file line numberDiff line numberDiff line change
@@ -187,13 +187,15 @@ list(
187187

188188
${chip_dir}/examples/microwave-oven-app/microwave-oven-common/src/microwave-oven-device.cpp
189189

190-
${chip_dir}/examples/energy-management-app/energy-management-common/src/EnergyTimeUtils.cpp
190+
${chip_dir}/examples/energy-management-app/energy-management-common/src/ChargingTargetsMemMgr.cpp
191191
${chip_dir}/examples/energy-management-app/energy-management-common/src/DeviceEnergyManagementDelegateImpl.cpp
192192
${chip_dir}/examples/energy-management-app/energy-management-common/src/DeviceEnergyManagementManager.cpp
193193
${chip_dir}/examples/energy-management-app/energy-management-common/src/EVSEManufacturerImpl.cpp
194194
${chip_dir}/examples/energy-management-app/energy-management-common/src/ElectricalPowerMeasurementDelegate.cpp
195195
${chip_dir}/examples/energy-management-app/energy-management-common/src/EnergyEvseDelegateImpl.cpp
196196
${chip_dir}/examples/energy-management-app/energy-management-common/src/EnergyEvseManager.cpp
197+
${chip_dir}/examples/energy-management-app/energy-management-common/src/EnergyEvseTargetsStore.cpp
198+
${chip_dir}/examples/energy-management-app/energy-management-common/src/EnergyTimeUtils.cpp
197199

198200
${chip_dir}/examples/platform/ameba/route_hook/ameba_route_hook.c
199201
${chip_dir}/examples/platform/ameba/route_hook/ameba_route_table.c

examples/all-clusters-app/asr/BUILD.gn

+2
Original file line numberDiff line numberDiff line change
@@ -82,12 +82,14 @@ asr_executable("clusters_app") {
8282
"${chip_root}/examples/all-clusters-app/all-clusters-common/src/smco-stub.cpp",
8383
"${chip_root}/examples/all-clusters-app/all-clusters-common/src/static-supported-modes-manager.cpp",
8484
"${chip_root}/examples/all-clusters-app/all-clusters-common/src/static-supported-temperature-levels.cpp",
85+
"${chip_root}/examples/energy-management-app/energy-management-common/src/ChargingTargetsMemMgr.cpp",
8586
"${chip_root}/examples/energy-management-app/energy-management-common/src/DeviceEnergyManagementDelegateImpl.cpp",
8687
"${chip_root}/examples/energy-management-app/energy-management-common/src/DeviceEnergyManagementManager.cpp",
8788
"${chip_root}/examples/energy-management-app/energy-management-common/src/EVSEManufacturerImpl.cpp",
8889
"${chip_root}/examples/energy-management-app/energy-management-common/src/ElectricalPowerMeasurementDelegate.cpp",
8990
"${chip_root}/examples/energy-management-app/energy-management-common/src/EnergyEvseDelegateImpl.cpp",
9091
"${chip_root}/examples/energy-management-app/energy-management-common/src/EnergyEvseManager.cpp",
92+
"${chip_root}/examples/energy-management-app/energy-management-common/src/EnergyEvseTargetsStore.cpp",
9193
"${chip_root}/examples/energy-management-app/energy-management-common/src/EnergyTimeUtils.cpp",
9294
"${examples_plat_dir}/ButtonHandler.cpp",
9395
"${examples_plat_dir}/CHIPDeviceManager.cpp",

examples/all-clusters-app/cc13x2x7_26x2x7/BUILD.gn

Whitespace-only changes.

examples/all-clusters-app/cc13x4_26x4/BUILD.gn

+2
Original file line numberDiff line numberDiff line change
@@ -72,12 +72,14 @@ ti_simplelink_executable("all-clusters-app") {
7272
"${chip_root}/examples/all-clusters-app/all-clusters-common/src/smco-stub.cpp",
7373
"${chip_root}/examples/all-clusters-app/all-clusters-common/src/static-supported-modes-manager.cpp",
7474
"${chip_root}/examples/all-clusters-app/all-clusters-common/src/static-supported-temperature-levels.cpp",
75+
"${chip_root}/examples/energy-management-app/energy-management-common/src/ChargingTargetsMemMgr.cpp",
7576
"${chip_root}/examples/energy-management-app/energy-management-common/src/DeviceEnergyManagementDelegateImpl.cpp",
7677
"${chip_root}/examples/energy-management-app/energy-management-common/src/DeviceEnergyManagementManager.cpp",
7778
"${chip_root}/examples/energy-management-app/energy-management-common/src/EVSEManufacturerImpl.cpp",
7879
"${chip_root}/examples/energy-management-app/energy-management-common/src/ElectricalPowerMeasurementDelegate.cpp",
7980
"${chip_root}/examples/energy-management-app/energy-management-common/src/EnergyEvseDelegateImpl.cpp",
8081
"${chip_root}/examples/energy-management-app/energy-management-common/src/EnergyEvseManager.cpp",
82+
"${chip_root}/examples/energy-management-app/energy-management-common/src/EnergyEvseTargetsStore.cpp",
8183
"${chip_root}/examples/energy-management-app/energy-management-common/src/EnergyTimeUtils.cpp",
8284
"${chip_root}/examples/providers/DeviceInfoProviderImpl.cpp",
8385
"${chip_root}/src/app/clusters/general-diagnostics-server/GenericFaultTestEventTriggerHandler.cpp",

examples/all-clusters-app/esp32/README.md

+12-6
Original file line numberDiff line numberDiff line change
@@ -47,14 +47,20 @@ NetworkCommissioning Endpoint can be used to manage the driver of extra network
4747
interface.
4848

4949
For ESP32-C6 DevKits, if `CHIP_DEVICE_CONFIG_ENABLE_WIFI` and
50-
`CHIP_DEVICE_CONFIG_ENABLE_THREAD` are both enabled, the NetworkCommissioning
51-
cluster in Endpoint 0 will be used for Thread network driver and the same
52-
cluster on Endpoint 65534 will be used for Wi-Fi network driver.
50+
`CHIP_DEVICE_CONFIG_ENABLE_THREAD` are both enabled, please set
51+
`CONFIG_THREAD_NETWORK_ENDPOINT_ID` to 0 and set
52+
`CONFIG_WIFI_NETWORK_ENDPOINT_ID` to 65534, which presents that the
53+
NetworkCommissioning cluster in Endpoint 0 will be used for Thread network
54+
driver and the same cluster on Endpoint 65534 will be used for Wi-Fi network
55+
driver. Or vice versa.
5356

5457
For ESP32-Ethernet-Kits, if `CHIP_DEVICE_CONFIG_ENABLE_WIFI` and
55-
`CHIP_DEVICE_CONFIG_ENABLE_ETHERNET` are both enabled, the NetworkCommissioning
56-
cluster in Endpoint 0 will be used for Ethernet network driver and the same
57-
cluster on Endpoint 65534 will be used for Wi-Fi network driver.
58+
`CHIP_DEVICE_CONFIG_ENABLE_ETHERNET` are both enabled, please set
59+
`CONFIG_ETHERNET_NETWORK_ENDPOINT_ID` to 0 and set
60+
`CONFIG_WIFI_NETWORK_ENDPOINT_ID` to 65534, which presents that the
61+
NetworkCommissioning cluster in Endpoint 0 will be used for Ethernet network
62+
driver and the same cluster on Endpoint 65534 will be used for Wi-Fi network
63+
driver. Or vice versa.
5864

5965
---
6066

examples/all-clusters-app/infineon/psoc6/BUILD.gn

+2
Original file line numberDiff line numberDiff line change
@@ -124,12 +124,14 @@ psoc6_executable("clusters_app") {
124124
"${chip_root}/examples/all-clusters-app/all-clusters-common/src/smco-stub.cpp",
125125
"${chip_root}/examples/all-clusters-app/all-clusters-common/src/static-supported-modes-manager.cpp",
126126
"${chip_root}/examples/all-clusters-app/all-clusters-common/src/static-supported-temperature-levels.cpp",
127+
"${chip_root}/examples/energy-management-app/energy-management-common/src/ChargingTargetsMemMgr.cpp",
127128
"${chip_root}/examples/energy-management-app/energy-management-common/src/DeviceEnergyManagementDelegateImpl.cpp",
128129
"${chip_root}/examples/energy-management-app/energy-management-common/src/DeviceEnergyManagementManager.cpp",
129130
"${chip_root}/examples/energy-management-app/energy-management-common/src/EVSEManufacturerImpl.cpp",
130131
"${chip_root}/examples/energy-management-app/energy-management-common/src/ElectricalPowerMeasurementDelegate.cpp",
131132
"${chip_root}/examples/energy-management-app/energy-management-common/src/EnergyEvseDelegateImpl.cpp",
132133
"${chip_root}/examples/energy-management-app/energy-management-common/src/EnergyEvseManager.cpp",
134+
"${chip_root}/examples/energy-management-app/energy-management-common/src/EnergyEvseTargetsStore.cpp",
133135
"${chip_root}/examples/energy-management-app/energy-management-common/src/EnergyTimeUtils.cpp",
134136
"${examples_plat_dir}/LEDWidget.cpp",
135137
"${examples_plat_dir}/init_psoc6Platform.cpp",

examples/all-clusters-app/linux/BUILD.gn

+2
Original file line numberDiff line numberDiff line change
@@ -59,12 +59,14 @@ source_set("chip-all-clusters-common") {
5959
"${chip_root}/examples/all-clusters-app/all-clusters-common/src/tcc-mode.cpp",
6060
"${chip_root}/examples/all-clusters-app/all-clusters-common/src/water-heater-mode.cpp",
6161
"${chip_root}/examples/all-clusters-app/linux/diagnostic-logs-provider-delegate-impl.cpp",
62+
"${chip_root}/examples/energy-management-app/energy-management-common/src/ChargingTargetsMemMgr.cpp",
6263
"${chip_root}/examples/energy-management-app/energy-management-common/src/DeviceEnergyManagementDelegateImpl.cpp",
6364
"${chip_root}/examples/energy-management-app/energy-management-common/src/DeviceEnergyManagementManager.cpp",
6465
"${chip_root}/examples/energy-management-app/energy-management-common/src/EVSEManufacturerImpl.cpp",
6566
"${chip_root}/examples/energy-management-app/energy-management-common/src/ElectricalPowerMeasurementDelegate.cpp",
6667
"${chip_root}/examples/energy-management-app/energy-management-common/src/EnergyEvseDelegateImpl.cpp",
6768
"${chip_root}/examples/energy-management-app/energy-management-common/src/EnergyEvseManager.cpp",
69+
"${chip_root}/examples/energy-management-app/energy-management-common/src/EnergyEvseTargetsStore.cpp",
6870
"${chip_root}/examples/energy-management-app/energy-management-common/src/EnergyTimeUtils.cpp",
6971
"${chip_root}/examples/energy-management-app/energy-management-common/src/device-energy-management-mode.cpp",
7072
"${chip_root}/examples/energy-management-app/energy-management-common/src/energy-evse-mode.cpp",

examples/all-clusters-app/mbed/CMakeLists.txt

+3-1
Original file line numberDiff line numberDiff line change
@@ -72,13 +72,15 @@ target_sources(${APP_TARGET} PRIVATE
7272
${ALL_CLUSTERS_COMMON}/src/smco-stub.cpp
7373
${ALL_CLUSTERS_COMMON}/src/static-supported-modes-manager.cpp
7474
${ALL_CLUSTERS_COMMON}/src/static-supported-temperature-levels.cpp
75-
${ENERGY_MANAGEMENT_COMMON}/src/EnergyTimeUtils.cpp
75+
${ENERGY_MANAGEMENT_COMMON}/src/ChargingTargetsMemMgr.cpp
7676
${ENERGY_MANAGEMENT_COMMON}/src/DeviceEnergyManagementDelegateImpl.cpp
7777
${ENERGY_MANAGEMENT_COMMON}/src/DeviceEnergyManagementManager.cpp
7878
${ENERGY_MANAGEMENT_COMMON}/src/EVSEManufacturerImpl.cpp
7979
${ENERGY_MANAGEMENT_COMMON}/src/ElectricalPowerMeasurementDelegate.cpp
8080
${ENERGY_MANAGEMENT_COMMON}/src/EnergyEvseDelegateImpl.cpp
8181
${ENERGY_MANAGEMENT_COMMON}/src/EnergyEvseManager.cpp
82+
${ENERGY_MANAGEMENT_COMMON}/src/EnergyEvseTargetsStore.cpp
83+
${ENERGY_MANAGEMENT_COMMON}/src/EnergyTimeUtils.cpp
8284
)
8385

8486
chip_configure_data_model(${APP_TARGET}

examples/all-clusters-app/nrfconnect/CMakeLists.txt

+3-1
Original file line numberDiff line numberDiff line change
@@ -62,13 +62,15 @@ target_sources(app PRIVATE
6262
${ALL_CLUSTERS_COMMON_DIR}/src/air-quality-instance.cpp
6363
${ALL_CLUSTERS_COMMON_DIR}/src/concentration-measurement-instances.cpp
6464
${ALL_CLUSTERS_COMMON_DIR}/src/resource-monitoring-delegates.cpp
65-
${ENERGY_MANAGEMENT_COMMON_DIR}/src/EnergyTimeUtils.cpp
65+
${ENERGY_MANAGEMENT_COMMON_DIR}/src/ChargingTargetsMemMgr.cpp
6666
${ENERGY_MANAGEMENT_COMMON_DIR}/src/DeviceEnergyManagementDelegateImpl.cpp
6767
${ENERGY_MANAGEMENT_COMMON_DIR}/src/DeviceEnergyManagementManager.cpp
6868
${ENERGY_MANAGEMENT_COMMON_DIR}/src/EVSEManufacturerImpl.cpp
6969
${ENERGY_MANAGEMENT_COMMON_DIR}/src/ElectricalPowerMeasurementDelegate.cpp
7070
${ENERGY_MANAGEMENT_COMMON_DIR}/src/EnergyEvseDelegateImpl.cpp
7171
${ENERGY_MANAGEMENT_COMMON_DIR}/src/EnergyEvseManager.cpp
72+
${ENERGY_MANAGEMENT_COMMON_DIR}/src/EnergyEvseTargetsStore.cpp
73+
${ENERGY_MANAGEMENT_COMMON_DIR}/src/EnergyTimeUtils.cpp
7274
${NRFCONNECT_COMMON}/util/LEDWidget.cpp)
7375

7476
chip_configure_data_model(app

examples/all-clusters-app/nxp/mw320/BUILD.gn

+2
Original file line numberDiff line numberDiff line change
@@ -89,12 +89,14 @@ mw320_executable("shell_mw320") {
8989
"${chip_root}/examples/all-clusters-app/all-clusters-common/src/smco-stub.cpp",
9090
"${chip_root}/examples/all-clusters-app/all-clusters-common/src/static-supported-modes-manager.cpp",
9191
"${chip_root}/examples/all-clusters-app/all-clusters-common/src/static-supported-temperature-levels.cpp",
92+
"${chip_root}/examples/energy-management-app/energy-management-common/src/ChargingTargetsMemMgr.cpp",
9293
"${chip_root}/examples/energy-management-app/energy-management-common/src/DeviceEnergyManagementDelegateImpl.cpp",
9394
"${chip_root}/examples/energy-management-app/energy-management-common/src/DeviceEnergyManagementManager.cpp",
9495
"${chip_root}/examples/energy-management-app/energy-management-common/src/EVSEManufacturerImpl.cpp",
9596
"${chip_root}/examples/energy-management-app/energy-management-common/src/ElectricalPowerMeasurementDelegate.cpp",
9697
"${chip_root}/examples/energy-management-app/energy-management-common/src/EnergyEvseDelegateImpl.cpp",
9798
"${chip_root}/examples/energy-management-app/energy-management-common/src/EnergyEvseManager.cpp",
99+
"${chip_root}/examples/energy-management-app/energy-management-common/src/EnergyEvseTargetsStore.cpp",
98100
"${chip_root}/examples/energy-management-app/energy-management-common/src/EnergyTimeUtils.cpp",
99101
"${chip_root}/src/lib/shell/streamer_mw320.cpp",
100102
"binding-handler.cpp",

examples/all-clusters-app/openiotsdk/CMakeLists.txt

+3-1
Original file line numberDiff line numberDiff line change
@@ -65,13 +65,15 @@ target_sources(${APP_TARGET}
6565
${ALL_CLUSTERS_COMMON}/src/resource-monitoring-delegates.cpp
6666
${ALL_CLUSTERS_COMMON}/src/static-supported-modes-manager.cpp
6767
${ALL_CLUSTERS_COMMON}/src/binding-handler.cpp
68-
${ENERGY_MANAGEMENT_COMMON}/src/EnergyTimeUtils.cpp
68+
${ENERGY_MANAGEMENT_COMMON}/src/ChargingTargetsMemMgr.cpp
6969
${ENERGY_MANAGEMENT_COMMON}/src/DeviceEnergyManagementDelegateImpl.cpp
7070
${ENERGY_MANAGEMENT_COMMON}/src/DeviceEnergyManagementManager.cpp
7171
${ENERGY_MANAGEMENT_COMMON}/src/EVSEManufacturerImpl.cpp
7272
${ENERGY_MANAGEMENT_COMMON}/src/ElectricalPowerMeasurementDelegate.cpp
7373
${ENERGY_MANAGEMENT_COMMON}/src/EnergyEvseDelegateImpl.cpp
7474
${ENERGY_MANAGEMENT_COMMON}/src/EnergyEvseManager.cpp
75+
${ENERGY_MANAGEMENT_COMMON}/src/EnergyEvseTargetsStore.cpp
76+
${ENERGY_MANAGEMENT_COMMON}/src/EnergyTimeUtils.cpp
7577
)
7678

7779
target_link_libraries(${APP_TARGET}

0 commit comments

Comments
 (0)