Skip to content
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

Initial versions of TC_DEM_2_1 and TC_DEM_2_2 #31038

Closed
Changes from 1 commit
Commits
Show all changes
150 commits
Select commit Hold shift + click to select a range
874d750
Fix #30665 (EVSE)
jamesharrow Nov 29, 2023
35a06a7
Fix #30665 updates to try to get further with ZAP and autogen, but st…
jamesharrow Nov 29, 2023
c3aef3a
Added ember-compatibility-functions.cpp which was missing.
jamesharrow Nov 29, 2023
a71bef8
Made all types all lowercase to resolve regen_all issues.
jamesharrow Nov 29, 2023
41acd01
Fixed lint issue (trailing whitespace).
jamesharrow Nov 29, 2023
1541c71
Merge branch 'upstream-master' into 30665-13-updates-needed-on-evse-x…
jamesharrow Dec 6, 2023
c96493f
Added Device Energy Management server.cpp, added to all-clusters-app.…
jamesharrow Dec 12, 2023
f6e9d41
Restyled by whitespace
restyled-commits Dec 12, 2023
82d6fa5
Restyled by clang-format
restyled-commits Dec 12, 2023
2dd4b79
Fixes based on similar conversations on EVSE review. Made Forecast an…
jamesharrow Dec 12, 2023
8582412
Added delegate class to all-clusters-app
jamesharrow Dec 12, 2023
c9ce2f7
Changed ChipLogProgress to Error. Better handling of EnumerateCommands
jamesharrow Dec 13, 2023
6d5b2d8
Merge branch 'upstream-master' into Fix-for-#30726---Add-Device-Energ…
jamesharrow Dec 15, 2023
6b83a69
Merge branch 'upstream-master' into 30665-13-updates-needed-on-evse-x…
jamesharrow Dec 15, 2023
b44b866
Aligned EVSE XML to same state as PR#30857 (includes SessionID being …
jamesharrow Dec 15, 2023
42b79f0
Updated Device Energy Management XML to use power_mw, energy_mwh per …
jamesharrow Dec 15, 2023
56e62ec
Updated controller-clusters.zap
jamesharrow Dec 15, 2023
1b9316d
regen_all.py
jamesharrow Dec 15, 2023
460ca15
Restyled by whitespace
restyled-commits Dec 15, 2023
1e7fe6b
Merge branch 'master' into 30665-13-updates-needed-on-evse-xml-device…
jamesharrow Dec 15, 2023
9a491cf
Merge branch 'upstream-master' into Fix-for-#30726---Add-Device-Energ…
jamesharrow Dec 15, 2023
0d82d88
Merge branch '30665-13-updates-needed-on-evse-xml-device-energy-manag…
jamesharrow Dec 15, 2023
3caf114
Regen_all after merging in changes for XML
jamesharrow Dec 15, 2023
c2765ee
Initial versions of TC_DEM_2_1 and TC_DEM_2_2
jamesharrow Dec 15, 2023
5e31362
Restyled by autopep8
restyled-commits Dec 15, 2023
73badd6
Restyled by isort
restyled-commits Dec 15, 2023
3047c5a
Fixed types to be signed=true
jamesharrow Dec 16, 2023
e10f2cc
Fixed 31032 - revert removal of side="server".
jamesharrow Dec 16, 2023
711851c
regen_all.py
jamesharrow Dec 16, 2023
430b028
Merge branch '30665-13-updates-needed-on-evse-xml-device-energy-manag…
jamesharrow Dec 16, 2023
09d6501
Merge remote-tracking branch 'upstream/master' into Fix-for-#30726---…
jamesharrow Dec 18, 2023
8243d76
Added Device Energy Management cluster back into all-clusters.zap and…
jamesharrow Dec 18, 2023
d6b5e45
Compiles but doesn't work. Needs stub to instantiate class
jamesharrow Dec 18, 2023
68de7f8
Fixed EnumerateCommands to allow optional ModifyForecastRequest and R…
jamesharrow Dec 18, 2023
729fef0
Fixed InvokeCommand issues to allow optional commands.
jamesharrow Dec 18, 2023
c731f2b
Improved HandleModifyForecastRequest and HandleRequestConstraintBased…
jamesharrow Dec 18, 2023
202420a
Updates to add DeviceEnergyManagement to all-clusters.
jamesharrow Dec 19, 2023
1483304
Compiles and links
jamesharrow Dec 19, 2023
be9d483
Sync file in energy-management-app
jamesharrow Dec 19, 2023
1d7acdf
Updated DEM to support SetPowerAdjustmentCapability and SetForecast m…
jamesharrow Dec 19, 2023
3aadedd
Merge remote-tracking branch 'upstream/master' into Fix-for-#30726---…
jamesharrow Dec 19, 2023
21cdca6
Updated based on review comments. Changed Epoch to be Matter 2000 bas…
jamesharrow Dec 20, 2023
997a9b3
Merge branch 'upstream-master' into Fix-for-#30726---Add-Device-Energ…
jamesharrow Dec 20, 2023
2130070
Turned on commands in DEM. Added DEM cluster server to energy-managem…
jamesharrow Dec 20, 2023
b66fd0e
Added more comments to Delegate to describe expected behaviour.
jamesharrow Dec 20, 2023
6224246
Updated BUILD.gn to remove duplicated files from all-clusters-common …
jamesharrow Dec 20, 2023
e4e299e
Aim to fix compile issues on other platforms due to logging of %d
jamesharrow Dec 20, 2023
b9bcb5b
Merge branch 'master' into Fix-for-#30726---Add-Device-Energy-Managem…
jamesharrow Dec 20, 2023
6c00dcd
Restyled by gn
restyled-commits Dec 20, 2023
9232e5e
Updated build files to remove duplicate copies from all-clusters-comm…
jamesharrow Dec 20, 2023
a5267e3
Fixed ESP32 include path
jamesharrow Dec 20, 2023
363f79c
Added DEM into energy-management-app - refactored main.cpp.
jamesharrow Dec 20, 2023
0db5eb0
Added DEM into EVSEManufacturerImpl.h
jamesharrow Dec 20, 2023
23e174a
Fix - avoid using global namespace in header file
jamesharrow Dec 20, 2023
77a33be
Restyled by gn
restyled-commits Dec 20, 2023
8744697
Updated CMakeLists.txt to remove duplicate energy-management files.
jamesharrow Dec 21, 2023
2f744c6
Added device-energy-management-server to ESP32 all-clusters CMakeList…
jamesharrow Dec 21, 2023
88003ef
Removed return at end of void function.
jamesharrow Dec 21, 2023
8890c0b
Merge branch 'upstream-master' into Fix-for-#30726---Add-Device-Energ…
jamesharrow Dec 21, 2023
0bad68b
Added include to all-clusters-minimal in ESP32
jamesharrow Dec 21, 2023
203861d
Merge branch 'master' into Fix-for-#30726---Add-Device-Energy-Managem…
jamesharrow Dec 21, 2023
082f1b7
Removed __FUNCTION__ from logs
jamesharrow Dec 22, 2023
04e48fd
Merge branch 'upstream-master' into Fix-for-#30726---Add-Device-Energ…
jamesharrow Dec 26, 2023
db4e85b
Removed stray %s
jamesharrow Dec 26, 2023
f765206
Added FeatureMap handling in sdk (not in ember)
jamesharrow Dec 26, 2023
a098fbd
Removed extra chip::
jamesharrow Dec 27, 2023
dac77cb
Used CHIP_ERROR_FORMAT, err.Format() mechanism
jamesharrow Dec 27, 2023
8ea64dd
Refactored StartTimeAdjust based on review comments.
jamesharrow Dec 27, 2023
7e0e5e7
Removed unnecessary Write Attributes function
jamesharrow Dec 27, 2023
3f0cded
Beginnings of Session handling
jamesharrow Dec 27, 2023
2990233
Added beginnings of EVConnected,EVNotDetected,EnergyTransferStarted,E…
jamesharrow Dec 28, 2023
c703453
Added framework for EVSE Test Event triggers
jamesharrow Dec 29, 2023
bfc9bfb
Added EnergyEvseTestEventTrigger delegates
jamesharrow Dec 29, 2023
590e63f
Restyled by whitespace
restyled-commits Dec 29, 2023
451428e
Restyled by gn
restyled-commits Dec 29, 2023
22d2504
Added :energy-evse-test-event-trigger to public_deps to see if it res…
jamesharrow Dec 29, 2023
85c68ed
Restyled by gn
restyled-commits Dec 29, 2023
a897dec
Fixed Darwin compile error - do not use else after return
jamesharrow Dec 30, 2023
9ccf8e5
Refactored code so that the EvseManufacturer instance could be retrie…
jamesharrow Dec 31, 2023
57cde7a
Started adding TC_EEVSE_2_2.py
jamesharrow Dec 31, 2023
b775fed
Updated TC_EEVSE_2_2.py to support test events. Still needs to handle…
jamesharrow Jan 1, 2024
8075657
Refactored Handling of TestEvents to allow clear, and better error ha…
jamesharrow Jan 1, 2024
8631c07
Refactored state handling by decomposing into state machine events wh…
jamesharrow Jan 2, 2024
a5774de
Fixed step 6e caused by not setting the cable limit / maxHardwareCurr…
jamesharrow Jan 2, 2024
3f365af
Added comment to clarify purpose and definition of test eventtrigger …
jamesharrow Jan 4, 2024
2f49014
Fixed several bugs in test script
jamesharrow Jan 5, 2024
f2ce4cf
Made SetChargingEnabledUntil take a nullable type.
jamesharrow Jan 5, 2024
b16e1ff
Removed Reference to step 5c, and moved reading of SessionID to step 4b.
jamesharrow Jan 7, 2024
469f313
Fixed issue with not detecting 2nd plug in event, and session ID not …
jamesharrow Jan 7, 2024
fbc5c6e
Merge branch 'upstream-master' into EVSE_Add_PersistedAttributes_and_…
jamesharrow Jan 7, 2024
ec0a876
Restyled by isort
restyled-commits Jan 7, 2024
e008095
Made some attributes persisted per spec.
jamesharrow Jan 8, 2024
165af4c
Added attributes to zcl.json to mark them as implemented in attribute…
jamesharrow Jan 8, 2024
3120589
Merge branch 'upstream-master' into Fix-for-#30726---Add-Device-Energ…
jamesharrow Jan 8, 2024
d7b6b08
Ran regen_all.py after changing zcl.json
jamesharrow Jan 8, 2024
b24bb80
Fixed incorrect type - not picked up by all compilers.
jamesharrow Jan 8, 2024
4e16e53
Merge branch 'upstream-master' into EVSE_Add_PersistedAttributes_and_…
jamesharrow Jan 8, 2024
24768a2
Merge branch 'upstream-master' into Fix-for-#30726---Add-Device-Energ…
jamesharrow Jan 8, 2024
2fe195d
Re-ran bootstrap, and then regen-all - to pick up more zap generated …
jamesharrow Jan 8, 2024
320b5e1
Added provisional handling for Faults
jamesharrow Jan 8, 2024
3a7ace4
Added new test event triggers to help test Fault and Diagnostics
jamesharrow Jan 9, 2024
309b8f6
Added TC_EEVSE_2_4
jamesharrow Jan 9, 2024
9b02ef8
Fix lint issue - unused datetime modules.
jamesharrow Jan 9, 2024
228ffed
Committed suggested change to comment
jamesharrow Jan 10, 2024
925a701
Added TC_EEVSE_2_5.py to support DiagnosticsCommand testing. Also cha…
jamesharrow Jan 10, 2024
684d6b5
Merge branch 'master' into EVSE_Add_PersistedAttributes_and_Events
jamesharrow Jan 11, 2024
bd83ba4
Created a helper EEVSE base class to avoid repetition in the differen…
jamesharrow Jan 11, 2024
514e18e
Restyled by isort
restyled-commits Jan 11, 2024
21cd6d7
Fixed Lint issues
jamesharrow Jan 11, 2024
9ab79d1
Revamped TC_EEVSE_2_5 to match spec behaviour (cannot start diagnosti…
jamesharrow Jan 11, 2024
2e774fe
Implemented timer to disable the EVSE automatically.
jamesharrow Jan 12, 2024
cafe1b4
Added documentation to cover concern about long-lived bytespan in ena…
jamesharrow Jan 12, 2024
02d9713
Merge branch 'master' into EVSE_Add_PersistedAttributes_and_Events
jamesharrow Jan 12, 2024
c52fe69
Fixed Lint and build issues on other platforms
jamesharrow Jan 12, 2024
f50ef1e
Restyled by isort
restyled-commits Jan 12, 2024
bd97562
Implemented some of the feedback on PR
jamesharrow Jan 12, 2024
895b552
Refactored HwSetState to use nested switch statements to be clear tha…
jamesharrow Jan 12, 2024
87fe6cc
Fixed error messages
jamesharrow Jan 12, 2024
6b12abe
Test scripts: Removed hardcoded endpoint 1 (use --endpoint 1 in args)…
jamesharrow Jan 12, 2024
303ca2a
Made enum class for callbacks and improved documentation comments bas…
jamesharrow Jan 12, 2024
34c077d
Fixed another python lint issue.
jamesharrow Jan 12, 2024
50793c3
Updated README.md with help on how to build for test event triggers, …
jamesharrow Jan 12, 2024
f629326
Tweaks to README.md to avoid Myst syntax highlighting issues.
jamesharrow Jan 13, 2024
4d2108b
Improved error logging around GetEpochTS()
jamesharrow Jan 13, 2024
1f16b6c
Made main use std::unique_ptr instead of using new/delete per PR comm…
jamesharrow Jan 13, 2024
13f16a8
Fixing MISSPELL issues in README.md
jamesharrow Jan 13, 2024
6ae3073
Merge branch 'upstream-master' into EVSE_Add_PersistedAttributes_and_…
jamesharrow Jan 13, 2024
243521a
Merge branch 'EVSE_Add_PersistedAttributes_and_Events' into Fix-for-#…
jamesharrow Jan 13, 2024
0d64694
Small change missed in main.cpp missed in unique_ptr change.
jamesharrow Jan 13, 2024
1aed975
Changed all-clusters app stubs to use unique_ptr style instead of new…
jamesharrow Jan 13, 2024
304cec1
Removed unhelpful comment
jamesharrow Jan 13, 2024
e2c9b65
Restyled by whitespace
restyled-commits Jan 13, 2024
a1b379e
Fixes #31061 Updated DEVICE_TYPE to 0x050C now this has been allocated
jamesharrow Jan 13, 2024
44c85a5
Merge branch 'master' into EVSE_Add_PersistedAttributes_and_Events
jamesharrow Jan 15, 2024
495d347
Small correction to description in test case.
jamesharrow Jan 15, 2024
8f51c0b
Merge branch 'upstream-master' into EVSE_Add_PersistedAttributes_and_…
jamesharrow Jan 15, 2024
ac40f61
Merge branch 'master' into EVSE_Add_PersistedAttributes_and_Events
jamesharrow Jan 16, 2024
138760c
Merge branch 'master' into EVSE_Add_PersistedAttributes_and_Events
jamesharrow Jan 16, 2024
69241b7
Update examples/energy-management-app/energy-management-common/includ…
jamesharrow Jan 16, 2024
4e2c4c4
Merge branch 'master' into EVSE_Add_PersistedAttributes_and_Events
jamesharrow Jan 16, 2024
0c2a8cd
Touched file to retrigger restyled job
jamesharrow Jan 16, 2024
ddb4edc
Merge branch 'master' into EVSE_Add_PersistedAttributes_and_Events
jamesharrow Jan 16, 2024
fa45472
Removed whitespace which was added to trigger restyled to rerun
jamesharrow Jan 16, 2024
0e378b0
Merge branch 'master' into EVSE_Add_PersistedAttributes_and_Events
jamesharrow Jan 16, 2024
6c34314
Removed potentially unsafe code before merging into PR #30957
jamesharrow Jan 16, 2024
b2a8c1c
Renamed variable and replaced auto with type so it is clearer to reader.
jamesharrow Jan 16, 2024
ec1e6a6
Merge branch 'EVSE_Add_PersistedAttributes_and_Events' into Fix-for-#…
jamesharrow Jan 16, 2024
b362c71
Merge branch 'master' into EVSE_Add_PersistedAttributes_and_Events
jamesharrow Jan 16, 2024
2af089d
Merge branch 'EVSE_Add_PersistedAttributes_and_Events' into 31037-add…
jamesharrow Jan 16, 2024
537fca8
Merge branch 'Fix-for-#30726---Add-Device-Energy-Management-cluster-t…
jamesharrow Jan 16, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Update examples/energy-management-app/energy-management-common/includ…
…e/EnergyEvseDelegateImpl.h

Co-authored-by: Boris Zbarsky <bzbarsky@apple.com>
jamesharrow and bzbarsky-apple authored Jan 16, 2024

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
commit 69241b73791455b6713b857ff83dd4e447b8841b
Original file line number Diff line number Diff line change
@@ -53,7 +53,7 @@ class EvseSession
public:
EvseSession(EndpointId aEndpoint) { mEndpointId = aEndpoint; }
/**
* @brief This function samples the start-time, and energy meter to hold the session info
* @brief This function records the start time and provided energy meter values as part of the new session.
*
* @param chargingMeterValue - The current value of the energy meter (charging) in mWh
* @param dischargingMeterValue - The current value of the energy meter (discharging) in mWh