energy-management-app: Split WH and EVSE into 2 endpoints #36201
+2,506
−615
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This PR adds the missing Water Heater device to matter-devices.xml. The description was generated using the Alchemy tool (https://github.com/project-chip/alchemy) with the following command: `alchemy zap --attribute="in-progress" --sdkRoot=./connectedhomeip/ --specRoot=./connectedhomeip-spec/ ./connectedhomeip-spec/src/device_types/WaterHeater.adoc` I manually fixed the device nae from `Matter Water Heater` to `Water Heater`.
This PR refactors the energy-management-app into 2 separate endpoints (one for EVSE and another for WaterHeater). This is the first step in making this app spec-conformant. `TC_DeviceBasicComposition.py` failed on this app before this PR and now passes. Changes: * Split Water Heater and EVSE into two separate endpoints (1 and 2). Updated zap and code. * Dinamically disable unused endpoint at runtime. Based on the app choice (command line argument on linux or #define in ESP32 or SIlabs), initialize the clusters in the correct endpoint and disable the other endpoint. For example, for Water Heater, initialize clusters on endpoint 2 and disable endpoint 1 (EVSE). * Refactor/move the init code related to ElectricalSensor (PowerTopology, EPM and EEM) from inside EVSE into ElectricalSensorInit.h/.cpp so they can be easier to reuse by both WaterHeater and EVSE. * Refactor/move DEM cluster init code into its own file so it can be better reused outside EVSE. Test performed: 1. Check basic composition for EVSE: ``` scripts/run_in_python_env.sh out/python_env './scripts/tests/run_python_test.py --app ./out/linux-x64-energy-management-no-ble/chip-energy-management-app --app-args "--application evse --trace-to json:log" --script src/python_testing/TC_DeviceBasicComposition.py --script-args "--qr-code MT:-24J0AFN00KA0648G00"' ``` 2. Check basic composition for WaterHeater: ``` scripts/run_in_python_env.sh out/python_env './scripts/tests/run_python_test.py --app ./out/linux-x64-energy-management-no-ble/chip-energy-management-app --app-args "--application water-heater --trace-to json:log" --script src/python_testing/TC_DeviceBasicComposition.py --script-args "--qr-code MT:-24J0AFN00KA0648G00"' ``` 3. Check app against `TC_EEVSE_2_6.py`: ``` rm -f evse.bin; ./out/linux-x64-energy-management-no-ble/chip-energy-management-app --enable-key 000102030405060708090a0b0c0d0e0f --KVS evse.bin --featureSet 0x3d python src/python_testing/TC_EEVSE_2_6.py --endpoint 1 -m on-network -n 1234 -p 20202021 -d 3840 --hex-arg enableKey:000102030405060708090a0b0c0d0e0f ```
|
Review changes with SemanticDiff. |
Comment on lines
+28
to
+31
| constexpr EndpointId kEvseEndpoint = 1; | ||
| constexpr EndpointId kWaterHeaterEndpoint = 2; | ||
|
|
||
| EndpointId GetMainAppEndpointId(); |
There was a problem hiding this comment.
This likely don't belong in a file called examples/energy-management-app/energy-management-common/common/include/EnergyManagementAppCmdLineOptions.h when they don't relate to command line options. Suggest moving these elsewhere, or rename file to EnergyManagementAppConfig.*
...ples/energy-management-app/energy-management-common/device-energy-management/src/DEMInit.cpp
Outdated
Show resolved
Hide resolved
Comment on lines
+26
to
+27
| chip::app::Clusters::PowerTopology::PowerTopologyInstance * GetPTInstance(); | ||
| chip::app::Clusters::ElectricalPowerMeasurement::ElectricalPowerMeasurementInstance * GetEPMInstance(); |
There was a problem hiding this comment.
Since these are not widely used it would be good to leave inside the the place that inits everything and injects it down from the places that need it, rather than having to go through these global getters that init more globals in their guts.
There was a problem hiding this comment.
It may even be worthwhile to introduce a class to hold this state.
|
PR #36201: Size comparison from 0b93b0d to ea06d89 Full report (7 builds for cc32xx, qpg, stm32, tizen)
|
tcarmelveilleux
approved these changes
Oct 22, 2024
|
PR #36201: Size comparison from 0b93b0d to f05afff Full report (14 builds for cc13x4_26x4, cc32xx, nrfconnect, qpg, stm32, tizen)
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR refactors the energy-management-app into 2 separate endpoints
(one for EVSE and another for WaterHeater).
This is the first step in making this app spec-conformant.
TC_DeviceBasicComposition.pyfailed on this app before this PR and now passes.Changes:
Updated zap and code.
(command line argument on linux or #define in ESP32 or SIlabs), initialize
the clusters in the correct endpoint and disable the other endpoint.
For example, for Water Heater, initialize clusters on endpoint 2 and
disable endpoint 1 (EVSE).
into ElectricalSensorInit.h/.cpp so they can be easier to reuse by both WaterHeater and EVSE.
better reused outside EVSE.
Test performed:
TC_EEVSE_2_6.py: