Skip to content

Commit c577f52

Browse files
jamesharrowhastyrestyled-commitsPeterC1965andy31415
authored and
rochaferraz
committed
EVSE add get set clear targets support (project-chip#31407)
* De-alphabetize list of files to avoid breaking GH action * Semi-realphabetize? * Restore strangely dropped events * Better BitMask handling * Change min/max on electrical measurements to be decimal instead of hex * Rename meas-and-sense to measurement-and-sensing.xml * Remove seemingly superfluous attribute requirements on Descriptor cluster on Electrical Measurement * Updates to electrical-power-measurement-server based on comments * Remove defaults from MeasurementAccuracyRangeStruct to match spec update * Restore side="server" to events * Move common enums and bitmaps to detail:: instead of detail::Enums and detail::Bitmaps; remove superfluous using statement * Assign ID to Electrical Sensor device type * Removed EPM and EEM from Root Node Device * Restyled formatting is different than clang-format * Re-add FeatureMap to attributeAccessInterfaceAttributes for EEM and EPM * Regen after merge * Added electrical-energy-measurement-server to CMakelist to fix linker issue. * Lock client on Electrical Sensor device type * Remove unneeded using statement now that Enums are in detail:: * Check for null iterators and error * Switch to ResourceExhausted from CHIP_ERROR_INTERNAL * Re-enabled EEM in energy management app and regen all after previous merge * Some refactoring to add EPM Instance into the EVSEManufacturer class to clean up containment. Added ability to fake voltage, power and current to the TE triggers. * Missed one file. * Fixed crash due to unassigned dg pointer. Power/Voltage/Current faking working too. * Touch file since restyled crashed * Restyled by gn * Restyled by isort * Add stub for EPM cluster * Reverted whitespace change * Did regen_all after merge from master to resolve conflicts. * Put back line of clusters which somehow got deleted accidentally. * Remerged ZAP file and regen all after resolving conflicts. * Fixes for Python tests * Correct name for Ember init callback * Formatting * Sync optional attributes list with .zap file for EPM * Add missing features to EPM stub * Revert FeatureMap in attributeAccessInterfaceAttributes * Allow FeatureMap in EEM constructor; add all-clusters-app EEM stub * Forgot zcl-with-test-extensions * Unregister EEM attribute access in destructor * Remove redundant returns to keep clang-tidy happy * Fix for issue mentioned in code review on EEM cluster limiting the number of endpoints it allows. * Refactoring to have a common EvseMain across all platforms to avoid making changes in multiple places * Added electrical-power-measurement-server to ESP32 CMakeLists.txt * Updated Matter device types to add EVSE * Open and saved energy-management-app.zap and regen_all * Removed duplicate ElectricalEnergyMeasurment class which was accidentally merged in. Fixed issue raised about ElectricalEnergyMeasurement array size not working on bridges. * Added support for test event triggers and handling of reading events into matter_testing_support. * Made TC_EEVSE_Utils.py use the matter_testing_support instead of its own local copy. * Restyled by isort * Cherry pick from Tweaks to EVSE Test plans (Issue project-chip#31460) * Changed the random value generation to make the values +/- and handle sign conversion to avoid compile warnings * Enabled cumulativeEnergyExported in Energy-management-app. * Added initial electrical power measurement 2.2 test case * Changed copyright date * Code review comment fixes. * Changed to c++ style cast * Fixed trailing whitepace * Added support for testing read of EEM attributes and change of values * Corrected EPM references in TC_EEM_2_2. Added TC_EEM_2_3 * Added periodic energy reporting, and new cumulativeEnergyReset attribute into energy-management-app.zap * Added periodic energy reading support and TC_EEM_2_3 to 2_5. * Python removed unused logging and EventChangeCallback * Updates to align to test plan PR project-chip#3949 * Added initial EEM_2_1 test script. * Added example of setting EEM Accuracy and EEM CumulativeEnergyReset structure - TC_EEM_2_1 now passes * Restyled by whitespace * Restyled * Removed extra spaces in TC_EEM_2_1.py * Removed unused EnergyManagementManager.cpp/.h * Fixed PowerMode = kAc * Initial TC_EPM_2_1.py script * Restyled by isort * Merged TC_EEVSE tests back in * Initialized NumberOfMeasurementTypes * Added EEM 2.1,2.2,2.3,2.4,2.5 and EPM 2.1,2.2 into CI workflow tests.yaml * Interim state - partially refactored how Measurement Structs are encoded similar to how ModeBase clusters are implemented. Needs tidy up. Will break all-clusters for now * Removed SetNumberOfMeasurementTypes since this can be derived from the ArraySize(kMeasurementAccuracies). Added more stringent checking in test script of measurementTypes and ranges. * Completed TC_EPM_2_1.py script * Corrected test plan spec reference. * Test EPM_2_1 now runs and passes. Allows checking that attributes are supported, and skips test if not. Validation of values ignores Nulls (which are allowed). Turned on Ranges attribute. * Revert unintended change to tests.yaml * Python test case code-review updates * Removed old range iterator. * Fixed lint issues and adjusted timings to match the test plan pr. * Fixed all-clusters electrical-power-measurement cluster by using the energy-management-app/common Delegate * Implemented HarmonicCurrents and HarmonicStructs (to return empty list for now) * Updated TC_EEVSE_2_3.py from more up to date branch. * Added basic set/get/clear targets framework based on earlier work. Not working * Removed files that were recently deleted upstream * Corrected PICS in TC_EEVSE_2_3.py and copyright date * Interim checkin with GetTargets not working * Initial GetTargets working with a constant static array to demonstrate the command response can be encoded ok * Removed unused EnergyEvseManager.cpp, Added EnergyEvseTargetStore.cpp * Added EVSETargets to DefaultStorageKeyAllocator.h * Reverted incorrect removal of EnergyEvseManager.cpp * Added override into EnergyEvseDelegate which resulted in strange errors on some platforms. * Added basic infrastructure for storing targets and reading them back. Compiles and runs * Store working * Store and Load seem to work. * Fixed Status change caused by upstream changes * Added helper function to compute day of week bitmap * Fix to evse-stub in all-clusters to add gEvseTargetsDelegate * Fixed build error on some platforms: cast of dayOfWeek to uint8_t * Refactoring of GetTargets command to build the response using dynamic memory * Updated evse-server.cpp/.h * Tidy up of unused CommonIterator in electrical-power-measurement-server.h * Get Targets reading back from file working * Starting to clean up - ran through Valgrind to check for memory leaks. * More clean up * Added Clear Targets support and initial implementation of SetTargets * Fixed crash when erasing entries - test reported PASS! * Attempt to fix Darwin complaint about unsigned int cast * Added logging of get targets response * Fixed platform specific logging compilation issue * Clean up of unused code * More clean up * Removed unused variable - Darwin check * clang checker updates * Refactored code to fix missing added energy since the TargetSoC could be optional and calling Next() would skip AddedEnergy * Added checking of GetTargetsResponse - PASSES * Almost working but need to resolve the Charging current and start time calculation in some scenarios. * Fixed PEP8 lint errors in TC_EVSE_2_3.py and TC_EEVSE_Utils.py taking advantage of new TestStep 3rd arg * Restyled by isort * Fixed ChipLogDetail %d errors on some platforms with a static_cast * Fixes in EVSE FindTargets to remove signed/unsigned comparison. Calculation of charging time was out by factor of 10. * Fixed TC_EEVSE_2_3.py to match test plan. Fixed EVSE FindNextTarget to handle targets if searching for future days. Now passes tests. * Fixed FindNextTarget to use epoch_s for NextChargeTargetTime and NextChargeStartTime with associated TC_EEVSE_2_3.py changes. Fixed bug when TargetSoC = 100% caused start time to be reported incorrectly. * Fix: When EVSE is not plugged in, or not enabled for charge we shouldn't compute a schedule. Also add callbacks to update schedule if the state changes. * Updated TC_EEM, TC_EPM, TC_EEVSE to take advantage of the new TestStep 3rd element. * Address comments from Boris Zbarsky * Fix lint error by adding entry for src/app/clusters/energy-evse-server/energy-evse-server.h * Revert "Fix lint error by adding entry for src/app/clusters/energy-evse-server/energy-evse-server.h" This reverts commit 7a60876. * Rework HandleGetTargets following project-chip#33736 * Address comments from Boris Zbarsky * Update TC_EEVSE_2_3 to align with latest test spec * Remove the use of vector * Get all targets building again * Catch up from master + fix some lint and build errors * Restyled by whitespace * Restyled by clang-format * Restyled by autopep8 * Restyled by isort * Fixing regession-build error * Restyled by clang-format * Fixing regession-build error * Changed logic to not return NextChargeRequiredEnergy if not plugged in or not enabled for charging. * Removed max 80A current limit which aligns to the spec. Who knows how many Amps chargers will have in the future! * Bug fix - When disabling the mMaximumChargingCurrentLimitFromCommand was not being updated, so we didn't get attribute updates for MaximumChargeCurrent when toggling Enable-Disable-Enable. * Being into line with latest EVSE test spec although TODOs around the time of use trigger * Load the targets in EnergyEvseInit() * Made EvseTargetsEntryType -> evseTargetsEntryType (since it is a variable not a type) * Reformatting and correcting the cluster PICS to be EEVSE not DEM. * Reverted changes to python test cases which don't belong in this PR - See PR#34243 (makes this PR 10 files smaller). * Address review comments from James Harrow * Address review comments from James Harrow * Add energy unit tests * Fix test case to align with PR10027 * Move the EVSE targets key to be a private member of EnergyEvseTargetsStore * Move EvseTargetStore test harness to examples/energy-management-app/energy-management-common/tests * Move example tests to examples/BUILD.gn * Restyled by clang-format * Restyled by gn * Add a mechanism to enable the targets persistent data to be delete when the last fabric is deleted * Fix unused variable compilation issues * Restyled by whitespace * Restyled by clang-format * Adde TC_EEVSE_2_3.py to CI testing. * Added new test-runner info to top of Python TC_EEVSE_2_3.py * Remove assert from BUILD.gn so test harness can build * Put BEGIN CI TEST ARGUMENTS around runner test arguments * Fix compilation problem in unit test * Try and fix the zephyr build problems * Restyled by gn * Try and fix the zephyr build problems * Try and fix the zephyr build problems * Try and fix the zephyr build problems * Restyled by gn * Start addressing comments from Andrei * Continuing addressing comments from Andrei * Continuing addressing comments from Andrei * Restyled by clang-format * Fix a problem with the return code spotted by Boris * Update examples/energy-management-app/energy-management-common/src/ChargingTargetsMemMgr.cpp Co-authored-by: Andrei Litvin <andy314@gmail.com> * Update examples/energy-management-app/energy-management-common/src/ChargingTargetsMemMgr.cpp Co-authored-by: Andrei Litvin <andy314@gmail.com> * Update examples/energy-management-app/energy-management-common/src/EVSEManufacturerImpl.cpp Co-authored-by: Andrei Litvin <andy314@gmail.com> * Update with further review comments from Andrei * Update with further review comments from Andrei * Update with further review comments from Andrei * Get all targets building * Restyled by whitespace * Restyled by clang-format * Update with further review comments from Andrei * Address further review comments from Andrei * Restyled by clang-format * Complete rename of Reset to ChargingTargetsMemMgr::PrepareDaySchedule * Fix potential memory leak * Add check in ChargingTargetsMemMgr::PrepareDaySchedule against a bad chargingTargetSchedulesIdx * Restyled by clang-format * Address final comments from Andrei * Restyled by gn * Removed whitespace in openiotsdk/CMakelists.txt * Fix merge issue * Fix CI build issue --------- Co-authored-by: Hasty Granbery <hasty@granbery.org> Co-authored-by: Restyled.io <commits@restyled.io> Co-authored-by: pcoleman <pcoleman@geotogether.com> Co-authored-by: PeterC1965 <101805108+PeterC1965@users.noreply.github.com> Co-authored-by: Andrei Litvin <andy314@gmail.com>
1 parent b1c3e15 commit c577f52

Some content is hidden

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

41 files changed

+2568
-121
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
}

‎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/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}

‎examples/all-clusters-app/telink/CMakeLists.txt

+3-1
Original file line numberDiff line numberDiff line change
@@ -51,13 +51,15 @@ target_sources(app PRIVATE
5151
${ALL_CLUSTERS_COMMON_DIR}/src/device-energy-management-stub.cpp
5252
${ALL_CLUSTERS_COMMON_DIR}/src/energy-evse-stub.cpp
5353
${ALL_CLUSTERS_COMMON_DIR}/src/resource-monitoring-delegates.cpp
54-
${ENERGY_MANAGEMENT_COMMON_DIR}/src/EnergyTimeUtils.cpp
54+
${ENERGY_MANAGEMENT_COMMON_DIR}/src/ChargingTargetsMemMgr.cpp
5555
${ENERGY_MANAGEMENT_COMMON_DIR}/src/DeviceEnergyManagementDelegateImpl.cpp
5656
${ENERGY_MANAGEMENT_COMMON_DIR}/src/DeviceEnergyManagementManager.cpp
5757
${ENERGY_MANAGEMENT_COMMON_DIR}/src/EVSEManufacturerImpl.cpp
5858
${ENERGY_MANAGEMENT_COMMON_DIR}/src/ElectricalPowerMeasurementDelegate.cpp
5959
${ENERGY_MANAGEMENT_COMMON_DIR}/src/EnergyEvseDelegateImpl.cpp
6060
${ENERGY_MANAGEMENT_COMMON_DIR}/src/EnergyEvseManager.cpp
61+
${ENERGY_MANAGEMENT_COMMON_DIR}/src/EnergyEvseTargetsStore.cpp
62+
${ENERGY_MANAGEMENT_COMMON_DIR}/src/EnergyTimeUtils.cpp
6163
${TELINK_COMMON}/common/src/mainCommon.cpp
6264
${TELINK_COMMON}/common/src/AppTaskCommon.cpp
6365
${TELINK_COMMON}/util/src/LEDManager.cpp

‎examples/all-clusters-app/tizen/BUILD.gn

+2
Original file line numberDiff line numberDiff line change
@@ -38,12 +38,14 @@ source_set("chip-all-clusters-common") {
3838
"${chip_root}/examples/all-clusters-app/all-clusters-common/src/smco-stub.cpp",
3939
"${chip_root}/examples/all-clusters-app/all-clusters-common/src/static-supported-modes-manager.cpp",
4040
"${chip_root}/examples/all-clusters-app/all-clusters-common/src/static-supported-temperature-levels.cpp",
41+
"${chip_root}/examples/energy-management-app/energy-management-common/src/ChargingTargetsMemMgr.cpp",
4142
"${chip_root}/examples/energy-management-app/energy-management-common/src/DeviceEnergyManagementDelegateImpl.cpp",
4243
"${chip_root}/examples/energy-management-app/energy-management-common/src/DeviceEnergyManagementManager.cpp",
4344
"${chip_root}/examples/energy-management-app/energy-management-common/src/EVSEManufacturerImpl.cpp",
4445
"${chip_root}/examples/energy-management-app/energy-management-common/src/ElectricalPowerMeasurementDelegate.cpp",
4546
"${chip_root}/examples/energy-management-app/energy-management-common/src/EnergyEvseDelegateImpl.cpp",
4647
"${chip_root}/examples/energy-management-app/energy-management-common/src/EnergyEvseManager.cpp",
48+
"${chip_root}/examples/energy-management-app/energy-management-common/src/EnergyEvseTargetsStore.cpp",
4749
"${chip_root}/examples/energy-management-app/energy-management-common/src/EnergyTimeUtils.cpp",
4850
]
4951

0 commit comments

Comments
 (0)