-
Notifications
You must be signed in to change notification settings - Fork 2.1k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Add EnergyEvse to all-clusters-app #30857
Merged
mergify
merged 73 commits into
project-chip:master
from
jamesharrow:30727-add-evse-to-all_clusters
Dec 15, 2023
Merged
Add EnergyEvse to all-clusters-app #30857
mergify
merged 73 commits into
project-chip:master
from
jamesharrow:30727-add-evse-to-all_clusters
Dec 15, 2023
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
- Changed to use amperage_mA, energy_mWh - removed max on epoch_s - removed access for operate - removed side for events
…ogen, but still fails with some parts of regen_all
…ement-to-use-new-types-and-clean-up-other-comments-with-optional-xml' into 30727-add-evse-to-examplesenergy-management-app
…rgy Managament app.
…test with chip-tool
…function names in energy-management-app.
andy31415
reviewed
Dec 13, 2023
PR #30857: Size comparison from 7378446 to aef5e45 Increases above 0.2%:
Increases (30 builds for esp32, linux, nrfconnect, psoc6, telink)
Decreases (55 builds for cc13x4_26x4, cc32xx, cyw30739, efr32, k32w, linux, mbed, nrfconnect, psoc6, qpg, telink)
Full report (83 builds for bl602, bl702, bl702l, cc13x4_26x4, cc32xx, cyw30739, efr32, esp32, k32w, linux, mbed, nrfconnect, psoc6, qpg, telink)
|
andy31415
reviewed
Dec 13, 2023
examples/all-clusters-app/all-clusters-common/src/EnergyEvseDelegateImpl.cpp
Show resolved
Hide resolved
andy31415
reviewed
Dec 13, 2023
examples/all-clusters-app/all-clusters-common/src/EnergyEvseDelegateImpl.cpp
Outdated
Show resolved
Hide resolved
andy31415
reviewed
Dec 13, 2023
examples/all-clusters-app/all-clusters-common/src/EnergyEvseDelegateImpl.cpp
Show resolved
Hide resolved
andy31415
reviewed
Dec 13, 2023
examples/all-clusters-app/all-clusters-common/src/EnergyEvseDelegateImpl.cpp
Outdated
Show resolved
Hide resolved
andy31415
reviewed
Dec 13, 2023
examples/all-clusters-app/all-clusters-common/src/EnergyEvseDelegateImpl.cpp
Outdated
Show resolved
Hide resolved
andy31415
reviewed
Dec 13, 2023
examples/all-clusters-app/all-clusters-common/src/EnergyEvseDelegateImpl.cpp
Show resolved
Hide resolved
andy31415
reviewed
Dec 13, 2023
examples/all-clusters-app/all-clusters-common/src/EnergyEvseDelegateImpl.cpp
Outdated
Show resolved
Hide resolved
andy31415
reviewed
Dec 13, 2023
examples/all-clusters-app/all-clusters-common/src/EnergyEvseDelegateImpl.cpp
Outdated
Show resolved
Hide resolved
andy31415
reviewed
Dec 13, 2023
examples/all-clusters-app/all-clusters-common/src/EnergyEvseDelegateImpl.cpp
Outdated
Show resolved
Hide resolved
andy31415
reviewed
Dec 13, 2023
examples/all-clusters-app/all-clusters-common/src/EnergyEvseDelegateImpl.cpp
Show resolved
Hide resolved
andy31415
reviewed
Dec 13, 2023
examples/all-clusters-app/all-clusters-common/src/EnergyEvseDelegateImpl.cpp
Outdated
Show resolved
Hide resolved
PR #30857: Size comparison from 7173769 to 03043f5 Increases above 0.2%:
Increases (30 builds for esp32, linux, nrfconnect, psoc6, telink)
Decreases (55 builds for cc13x4_26x4, cc32xx, cyw30739, efr32, k32w, linux, mbed, nrfconnect, psoc6, qpg, telink)
Full report (83 builds for bl602, bl702, bl702l, cc13x4_26x4, cc32xx, cyw30739, efr32, esp32, k32w, linux, mbed, nrfconnect, psoc6, qpg, telink)
|
jamesharrow
added a commit
to jamesharrow/connectedhomeip
that referenced
this pull request
Dec 14, 2023
PR #30857: Size comparison from 221e466 to d83c5be Increases above 0.2%:
Increases (30 builds for bl602, esp32, linux, nrfconnect, psoc6, telink)
Decreases (55 builds for cc13x4_26x4, cc32xx, cyw30739, efr32, k32w, linux, mbed, nrfconnect, psoc6, qpg, telink)
Full report (83 builds for bl602, bl702, bl702l, cc13x4_26x4, cc32xx, cyw30739, efr32, esp32, k32w, linux, mbed, nrfconnect, psoc6, qpg, telink)
|
andy31415
approved these changes
Dec 15, 2023
thivya-amazon
pushed a commit
to thivya-amazon/connectedhomeip
that referenced
this pull request
Dec 18, 2023
* Fix project-chip#30665 (EVSE) - Changed to use amperage_mA, energy_mWh - removed max on epoch_s - removed access for operate - removed side for events * Fix project-chip#30665 updates to try to get further with ZAP and autogen, but still fails with some parts of regen_all * Added ember-compatibility-functions.cpp which was missing. * Made all types all lowercase to resolve regen_all issues. * Fixed lint issue (trailing whitespace). * Fixes project-chip#30727 - Added initial EVSE cluster and Example Energy Managament app. * Tidied up old comments. * Restyled by whitespace * Restyled by gn * Restyled by prettier-markdown * Added copy of files to all-clusters-app linux BUILD.gn and did basic test with chip-tool * Fixed lint error (Remove PRId64) * Fix for Documentation Build and publish checker. * Updated all-clusters-app.zap after merge and regen_all * Added Cluster to ESP32 CMakeLists.txt * Fixed ESP32 compile error caused by %d * Added missing source files to each build variant * Restyled by gn * Fixed incorrect uint64_t in EnableCharging/EnableDischarging command * Fixed more issues seen on different platforms * Removed unused mEndpointId * Add source files to shell standalone BUILD.gn, More %d fixes for different platforms * Restyled by gn * Removed unused mMinimumChargingCurrentLimitFromCommand * Removed yet more unused variables * Fixed missing semi-colon. How did the other compilers not pick this up? * Capitalise function names * PR comment - Moved PluginServerInitCallback to sdk. Capitalised more function names in energy-management-app. * Restyled by whitespace * Fixes project-chip#30805 Updated energy-evse-cluster.xml * Fixes project-chip#30805 zap_regen_all commit. * Removed energy-management-app from this branch to make PR smaller to review * Changing something to force a rebuild once I turned off backwards compatibility check * Update examples/all-clusters-app/all-clusters-common/include/EnergyEvseDelegateImpl.h Co-authored-by: Boris Zbarsky <[email protected]> * Made Fault Event allow a nullable SessionID * Updates based on review (use kMaximumChargeCurrent instead of duplicate #define). Add HwSetVehicleID implementation * Added RFID Event support. Removed more unnecessary chip:: * Added Feature flags, optional commands and optional attributes. * Made command handling conditional based on features * Added Feature support to all-clusters-app * Restyled by clang-format * Restyled by clang-format * Fix to Darwin compile error - not checking strcmp return * Fix to Darwin compile error - not checking strcmp return * Attempt to fix Darwin errors (return after else) * Attempt to fix Darwin errors (return after else) * Merged to upstream master * Updated based on latest upstream master * Removed unnecessary mInstance and used 'this' instead. * Regen_all after merge to master. * Fix review comment. * Ensure Init() returns a failure if there is one. Aligned to mode-base-server.cpp * Backed out Read attr check based on features. * Fixed EnumerateAcceptedCommands to handle Loop::Break condition. * Had missed StartDiagnostic as an optional command in InvokeCommand * Removed extra chip:: in attr types. * Updated HwSetVehicleID to copy the value from callee * Fixed potential buffer overrun in HwSetVehicleID. * Ensured that mVehicleID free's any malloc'd CharSpan in destructor * Sync EnergyEvseDelegateImpl.cpp from Example Energy Management --------- Co-authored-by: Restyled.io <[email protected]> Co-authored-by: Boris Zbarsky <[email protected]>
mergify bot
pushed a commit
that referenced
this pull request
Dec 20, 2023
* Fix #30665 (EVSE) - Changed to use amperage_mA, energy_mWh - removed max on epoch_s - removed access for operate - removed side for events * Fix #30665 updates to try to get further with ZAP and autogen, but still fails with some parts of regen_all * Added ember-compatibility-functions.cpp which was missing. * Made all types all lowercase to resolve regen_all issues. * Fixed lint issue (trailing whitespace). * Fixes #30727 - Added initial EVSE cluster and Example Energy Managament app. * Tidied up old comments. * Restyled by whitespace * Restyled by gn * Restyled by prettier-markdown * Added copy of files to all-clusters-app linux BUILD.gn and did basic test with chip-tool * Fixed lint error (Remove PRId64) * Fix for Documentation Build and publish checker. * Updated all-clusters-app.zap after merge and regen_all * Added Cluster to ESP32 CMakeLists.txt * Fixed ESP32 compile error caused by %d * Added missing source files to each build variant * Restyled by gn * Fixed incorrect uint64_t in EnableCharging/EnableDischarging command * Fixed more issues seen on different platforms * Removed unused mEndpointId * Add source files to shell standalone BUILD.gn, More %d fixes for different platforms * Restyled by gn * Removed unused mMinimumChargingCurrentLimitFromCommand * Removed yet more unused variables * Fixed missing semi-colon. How did the other compilers not pick this up? * Capitalise function names * PR comment - Moved PluginServerInitCallback to sdk. Capitalised more function names in energy-management-app. * Restyled by whitespace * Fixes #30805 Updated energy-evse-cluster.xml * Fixes #30805 zap_regen_all commit. * Made Fault Event allow a nullable SessionID * Updates based on review (use kMaximumChargeCurrent instead of duplicate #define). Add HwSetVehicleID implementation * Added RFID Event support. Removed more unnecessary chip:: * Added Feature flags, optional commands and optional attributes. * Made command handling conditional based on features * Added Feature support to all-clusters-app * Restyled by clang-format * Fix to Darwin compile error - not checking strcmp return * Attempt to fix Darwin errors (return after else) * Updated based on latest upstream master * Removed unnecessary mInstance and used 'this' instead. * Regen_all after merge to master. * Fix review comment. * Ensure Init() returns a failure if there is one. Aligned to mode-base-server.cpp * Backed out Read attr check based on features. * Fixed EnumerateAcceptedCommands to handle Loop::Break condition. * Had missed StartDiagnostic as an optional command in InvokeCommand * Removed extra chip:: in attr types. * Updated HwSetVehicleID to copy the value from callee * Fixed potential buffer overrun in HwSetVehicleID. * Fixed simple to address comments raised by Andrei in PR 30857 * Fixed simple to address comments raised by Andrei in PR 30857 * Check Delegate is initialized before calling functions. * Check Delegate is initialized before calling functions. * Added callbacks into Application code * Restyled by whitespace * Ensured that mVehicleID free's any malloc'd CharSpan in destructor * Sync EnergyEvseDelegateImpl.cpp from Example Energy Management * Ensured that mVehicleID free's any malloc'd CharSpan in destructor * Sync EnergyEvseDelegateImpl.cpp from Example Energy Management * Sync'd changes from example energy management app, and commits from #30857 & #30727 * Added namespace to avoid global namespace error in header file. * Re-write of ApplicationInit to handle potential errors * Re-write of ApplicationInit to handle potential errors * Removed unnecessary void in function decl. * Open and saved in ZAP, then regen_all * Updated Energy-management-app.zap / .matter after change to general-diagnostics.xml change to MS. * Updated Energy-management-app.zap / .matter after change to general-diagnostics.xml change to MS. * Restyled by whitespace * Fixed types to be signed=true * Fixed 31032 - revert removal of side="server". Also turned on Events. * PR comment fix - remove Localization Config and Time Format Localization cluster * Removed EVSE commands from ZAP to avoid emberAf linker errors since these are handled in the IM Commands handler * Regen_all to update energy-management.matter file to remove commands that cause linker errors. * Minor changes to align all-clusters and energy-management common. * Apply suggestions from code review Co-authored-by: Boris Zbarsky <[email protected]> * Addressed comment and replicated into example energy management copies. * Added documentation to EVSE Callbacks as to which struct in the union is used. * Added Energy EVSE and Device Energy Management to config-data.yml under CommandHandlerInterfaceOnlyClusters. Then turned on EVSE commands in ZAP. --------- Co-authored-by: Restyled.io <[email protected]> Co-authored-by: Boris Zbarsky <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Labels
app
controller
darwin
examples
review - approved
scripts
skip-protocol-compatibility
Marker that protocol backwards compatibility checks are to be skipped
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.
Adds EVSE SDK and all-clusters-app. It does NOT include the new Energy-Management-App example - that is in a separate PR #30793
NOTE: the Energy EVSE XML makes SessionID nullable and changes TargetTime (as per spec https://github.com/CHIP-Specifications/connectedhomeip-spec/pull/8631)
Fixes #30805