Add water heater to energy management app #34886
Merged
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
…2 and linux build files.
|
Review changes with SemanticDiff. |
|
|
|
PR #34886: Size comparison from fd1421c to 4b141d2 Increases above 0.2%:
Full report (16 builds for cc13x4_26x4, cc32xx, nxp, qpg, stm32, tizen)
|
|
PR #34886: Size comparison from fd1421c to df29b97 Increases above 0.2%:
Full report (95 builds for bl602, bl702, bl702l, cc13x4_26x4, cc32xx, cyw30739, efr32, esp32, linux, nrfconnect, nxp, psoc6, qpg, stm32, telink, tizen)
|
|
PR #34886: Size comparison from 95ff33b to 9c98c94 Increases above 0.2%:
Full report (95 builds for bl602, bl702, bl702l, cc13x4_26x4, cc32xx, cyw30739, efr32, esp32, linux, nrfconnect, nxp, psoc6, qpg, stm32, telink, tizen)
|
github-actions
bot
added
tests
matter-1.4-te2-script-change
|
PR #34886: Size comparison from 0ea43c9 to 1a02f76 Full report (84 builds for bl602, bl702, bl702l, cc13x4_26x4, cc32xx, cyw30739, efr32, esp32, linux, nrfconnect, nxp, psoc6, qpg, stm32, telink, tizen)
|
…r heater files from all-clusters-app to examples/energy-management-app/energy-management-common/water-heater
|
PR #34886: Size comparison from 339274a to e910999 Full report (77 builds for bl602, bl702, bl702l, cyw30739, efr32, esp32, linux, nrfconnect, nxp, psoc6, qpg, stm32, telink, tizen)
|
lpbeliveau-silabs
approved these changes
Aug 23, 2024
18 tasks
doru91
approved these changes
Aug 27, 2024
|
PR #34886: Size comparison from d185778 to 31e1022 Full report (10 builds for nrfconnect, nxp, qpg, stm32, tizen)
|
hasty
approved these changes
Aug 27, 2024
|
PR #34886: Size comparison from d185778 to c9a40d0 Full report (77 builds for bl602, bl702, bl702l, cyw30739, efr32, esp32, linux, nrfconnect, nxp, psoc6, qpg, stm32, telink, tizen)
|
|
PR #34886: Size comparison from d185778 to 440514c Full report (10 builds for nrfconnect, nxp, qpg, stm32)
|
|
PR #34886: Size comparison from 4d4fcb3 to 06e69a7 Full report (77 builds for bl602, bl702, bl702l, cyw30739, efr32, esp32, linux, nrfconnect, nxp, psoc6, qpg, stm32, telink, tizen)
|
PeterC1965
added a commit
to PeterC1965/connectedhomeip
that referenced
this pull request
Aug 28, 2024
* Refactored file location for chip-energy-management-app. Updated esp32 and linux build files. * Updated some all-clusters-app build and CMakeLists (linux, esp32, psoc6) * Updated remaining build and CMakefiles with new folders. * Fixed unit tests BUILD.gn * Restyled by gn * Missed Ameba .cmake * Missed all-clusters-minimal-app/esp32/main/CMakeLists.txt * Added basic hooks to ESP32 to allow EVSE or Water Heater app * Added initial WaterHeaterMain.cpp - needs rework * Configure runner command to use --application <dem|eevse|whm> option * Unify the WHM and EEVSE/DEM apps * Restyled by whitespace * Restyled by clang-format * Restyled by gn * Rename application names * Get ESP32 energy management app building with water-heater. Move water heater files from all-clusters-app to examples/energy-management-app/energy-management-common/water-heater * Get WHM triggers working * Get energy tests passing * Add some more build infrastructure to set the DEM feature map * Address review comments from James and fix some CI tests * Restyled by clang-format * Restyled by gn * Undo changes to Objects.py * Address review from James and fix forecast subscription issues * Address review from James * Added ENERGY_REPORTING_TRIGGERS option to ESP32 and updated ESP32 README.md * Guard against a EVSE and WHM app being simultaneously defined * Updated Linux README.md to highlight --application and --featureSet args. * Fixed mis-spell * Removed duplicate WaterHeaterMode::Shutdown() * Fixed missing free of WaterHeaterMode and made a call to both EvseMain shutdown and WaterHeaterMain shutdown regardless of application mode. * Restyled by whitespace * Restyled by clang-format * Applied code review comments, attempt to fix clang build failure with type in loop. * Restyled by whitespace * Restyled by clang-format * Get DEM and EEM tests passing when running combined app in WHM mode * Restyled by clang-format * Ensure absMinPower and absMaxPower are set * Fix CI build error * Restyled by whitespace * Restyled by clang-format * Fix power levels so they fit within absMinPower and absMaxPower * Fix definition of CHIP_DEVICE_CONFIG_ENABLE_ENERGY_REPORTING_TRIGGER --------- Co-authored-by: Restyled.io <[email protected]> Co-authored-by: pcoleman <[email protected]> Co-authored-by: PeterC1965 <[email protected]>
shgutte
pushed a commit
to shgutte/connectedhomeip
that referenced
this pull request
Sep 10, 2024
* Refactored file location for chip-energy-management-app. Updated esp32 and linux build files. * Updated some all-clusters-app build and CMakeLists (linux, esp32, psoc6) * Updated remaining build and CMakefiles with new folders. * Fixed unit tests BUILD.gn * Restyled by gn * Missed Ameba .cmake * Missed all-clusters-minimal-app/esp32/main/CMakeLists.txt * Added basic hooks to ESP32 to allow EVSE or Water Heater app * Added initial WaterHeaterMain.cpp - needs rework * Configure runner command to use --application <dem|eevse|whm> option * Unify the WHM and EEVSE/DEM apps * Restyled by whitespace * Restyled by clang-format * Restyled by gn * Rename application names * Get ESP32 energy management app building with water-heater. Move water heater files from all-clusters-app to examples/energy-management-app/energy-management-common/water-heater * Get WHM triggers working * Get energy tests passing * Add some more build infrastructure to set the DEM feature map * Address review comments from James and fix some CI tests * Restyled by clang-format * Restyled by gn * Undo changes to Objects.py * Address review from James and fix forecast subscription issues * Address review from James * Added ENERGY_REPORTING_TRIGGERS option to ESP32 and updated ESP32 README.md * Guard against a EVSE and WHM app being simultaneously defined * Updated Linux README.md to highlight --application and --featureSet args. * Fixed mis-spell * Removed duplicate WaterHeaterMode::Shutdown() * Fixed missing free of WaterHeaterMode and made a call to both EvseMain shutdown and WaterHeaterMain shutdown regardless of application mode. * Restyled by whitespace * Restyled by clang-format * Applied code review comments, attempt to fix clang build failure with type in loop. * Restyled by whitespace * Restyled by clang-format * Get DEM and EEM tests passing when running combined app in WHM mode * Restyled by clang-format * Ensure absMinPower and absMaxPower are set * Fix CI build error * Restyled by whitespace * Restyled by clang-format * Fix power levels so they fit within absMinPower and absMaxPower * Fix definition of CHIP_DEVICE_CONFIG_ENABLE_ENERGY_REPORTING_TRIGGER --------- Co-authored-by: Restyled.io <[email protected]> Co-authored-by: pcoleman <[email protected]> Co-authored-by: PeterC1965 <[email protected]>
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 aims to add a Water Heater example into the energy-management example app so that EP1 has EVSE and EP2 has WaterHeater.
Both would then share the Electrical Sensor, DEM and Power Topology clusters.
Summary of changes made in this PR
Disabled OnMode / StartupMode for EVSEM, DEMM and WHM Energy Management ZAP file (to align with spec)
Moved several WaterHeater related files from All-clusters-app to energy-management-app (updates all-clusters-build path and re-used in energy-management-app)
Fixed bugs around Forecast attribute not being marked for reporting when it was being updated
Added an application type command flag to energy-management-app (Linux)
--application evse|--application water-heaterupdated DEM and EVSE test scripts test runner header to include this new flag.
Added new Linux Build options for WaterHeater Test event trigger enabled by default
Added Water Heater support to ESP32 via KConfig settings
Included test event trigger support into ESP32 main.cpp based on KConfig flags
Added compile type support for PFR or SFR features (note that these are mutually exclusive and will fail DEM tests if both are on!) (equivalent of
--featureSetargument in the linux chip-energy-management-app)Updated the README.md for ESP32 and Linux
Fixes [Test Failed] EWATERHRT1.1: Failure return on reading Feature-Map and Cluster Revision attribute. #34977
Fixes [BUG] Example Energy Management app for EVSE etc does not set the absMinPower and adsMaxPower values in DEM #34966