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.

Sign up for GitHub

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

Jump to bottom

[EVSE] add evse cluster and examples energy management app #30793

Merged
merged 73 commits into from
Dec 18, 2023
Merged

[EVSE] add evse cluster and examples energy management app #30793

Changes from 1 commit
Commits
Show all changes
73 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
d7636ea
Merge branch '30665-13-updates-needed-on-evse-xml-device-energy-manag…
jamesharrow Dec 4, 2023
e12cf09
Fixes #30727 - Added initial EVSE cluster and Example Energy Managame…
jamesharrow Dec 4, 2023
f27b036
Tidied up old comments.
jamesharrow Dec 4, 2023
c0651fe
Restyled by whitespace
restyled-commits Dec 4, 2023
557f7c5
Restyled by gn
restyled-commits Dec 4, 2023
6763533
Restyled by prettier-markdown
restyled-commits Dec 4, 2023
53fa295
Added copy of files to all-clusters-app linux BUILD.gn and did basic …
jamesharrow Dec 5, 2023
e47f734
Fixed lint error (Remove PRId64)
jamesharrow Dec 5, 2023
7434ae8
Fix for Documentation Build and publish checker.
jamesharrow Dec 5, 2023
d9c3550
Merge branch 'upstream-master' into 30727-add-evse-to-examplesenergy-…
jamesharrow Dec 5, 2023
b88e826
Updated all-clusters-app.zap after merge and regen_all
jamesharrow Dec 5, 2023
8b92700
Added Cluster to ESP32 CMakeLists.txt
jamesharrow Dec 5, 2023
a368a5d
Fixed ESP32 compile error caused by %d
jamesharrow Dec 5, 2023
c96744a
Added missing source files to each build variant
jamesharrow Dec 5, 2023
68479cc
Restyled by gn
restyled-commits Dec 5, 2023
919fafb
Fixed incorrect uint64_t in EnableCharging/EnableDischarging command
jamesharrow Dec 5, 2023
2cab312
Fixed more issues seen on different platforms
jamesharrow Dec 5, 2023
293cdbf
Removed unused mEndpointId
jamesharrow Dec 5, 2023
f44f52a
Add source files to shell standalone BUILD.gn, More %d fixes for dif…
jamesharrow Dec 5, 2023
43b98d4
Restyled by gn
restyled-commits Dec 5, 2023
fc54724
Removed unused mMinimumChargingCurrentLimitFromCommand
jamesharrow Dec 6, 2023
d3752ba
Removed yet more unused variables
jamesharrow Dec 6, 2023
a14846a
Fixed missing semi-colon. How did the other compilers not pick this up?
jamesharrow Dec 6, 2023
04a12f7
Capitalise function names
jamesharrow Dec 6, 2023
49acb7f
PR comment - Moved PluginServerInitCallback to sdk. Capitalised more …
jamesharrow Dec 6, 2023
a2240c5
Restyled by whitespace
restyled-commits Dec 6, 2023
ee824c0
Fixes #30805 Updated energy-evse-cluster.xml
jamesharrow Dec 6, 2023
2947b9b
Fixes #30805 zap_regen_all commit.
jamesharrow Dec 6, 2023
0015eb8
Merge branch 'project-chip:master' into 30727-add-evse-to-examplesene…
jamesharrow Dec 6, 2023
271031c
Made Fault Event allow a nullable SessionID
jamesharrow Dec 7, 2023
b886c71
Updates based on review (use kMaximumChargeCurrent instead of duplica…
jamesharrow Dec 9, 2023
adbb15e
Added RFID Event support. Removed more unnecessary chip::
jamesharrow Dec 9, 2023
a2917b6
Added Feature flags, optional commands and optional attributes.
jamesharrow Dec 10, 2023
e34b523
Made command handling conditional based on features
jamesharrow Dec 10, 2023
3b97de1
Added Feature support to all-clusters-app
jamesharrow Dec 10, 2023
da7a3fb
Restyled by clang-format
restyled-commits Dec 10, 2023
e2652ec
Fix to Darwin compile error - not checking strcmp return
jamesharrow Dec 11, 2023
a9a7e8f
Attempt to fix Darwin errors (return after else)
jamesharrow Dec 11, 2023
f719610
Merge branch 'upstream-master' into 30727-add-evse-to-examplesenergy-…
jamesharrow Dec 11, 2023
2ff5a27
Updated based on latest upstream master
jamesharrow Dec 11, 2023
11b0151
Removed unnecessary mInstance and used 'this' instead.
jamesharrow Dec 11, 2023
774790d
Merge remote-tracking branch 'upstream/master' into 30727-add-evse-to…
jamesharrow Dec 11, 2023
893c6e5
Regen_all after merge to master.
jamesharrow Dec 11, 2023
68d3ea6
Merge branch 'master' into 30727-add-evse-to-examplesenergy-managemen…
jamesharrow Dec 12, 2023
30e6e8b
Fix review comment.
jamesharrow Dec 12, 2023
98f5d2a
Merge branch 'upstream-master' into 30727-add-evse-to-examplesenergy-…
jamesharrow Dec 12, 2023
51dd8cc
Ensure Init() returns a failure if there is one. Aligned to mode-base…
jamesharrow Dec 12, 2023
48dd130
Backed out Read attr check based on features.
jamesharrow Dec 12, 2023
f5928e7
Fixed EnumerateAcceptedCommands to handle Loop::Break condition.
jamesharrow Dec 12, 2023
2fba294
Had missed StartDiagnostic as an optional command in InvokeCommand
jamesharrow Dec 12, 2023
70d9cbe
Removed extra chip:: in attr types.
jamesharrow Dec 12, 2023
2feb493
Updated HwSetVehicleID to copy the value from callee
jamesharrow Dec 13, 2023
ebe0d14
Fixed potential buffer overrun in HwSetVehicleID.
jamesharrow Dec 13, 2023
bd0461c
Merge branch 'master' into 30727-add-evse-to-examplesenergy-managemen…
jamesharrow Dec 13, 2023
3f7560d
Fixed simple to address comments raised by Andrei in PR 30857
jamesharrow Dec 13, 2023
50cad61
Check Delegate is initialized before calling functions.
jamesharrow Dec 14, 2023
e00f848
Ensured that mVehicleID free's any malloc'd CharSpan in destructor
jamesharrow Dec 14, 2023
0939d3b
Sync EnergyEvseDelegateImpl.cpp from Example Energy Management
jamesharrow Dec 14, 2023
ab1ae6a
Merge branch 'master' into 30727-add-evse-to-examplesenergy-managemen…
jamesharrow Dec 14, 2023
6ab439b
Re-write of ApplicationInit to handle potential errors
jamesharrow Dec 14, 2023
34dd424
Open and saved in ZAP, then regen_all
jamesharrow Dec 15, 2023
4903b29
Merge branch 'upstream-master' into 30727-add-evse-to-examplesenergy-…
jamesharrow Dec 15, 2023
23910e2
Updated Energy-management-app.zap / .matter after change to general-d…
jamesharrow Dec 15, 2023
7385acd
Merge branch 'upstream-master' into 30727-add-evse-to-examplesenergy-…
jamesharrow Dec 15, 2023
ee510f4
Fixed types to be signed=true
jamesharrow Dec 16, 2023
be39a66
Fixed 31032 - revert removal of side="server". Also turned on Events.
jamesharrow Dec 16, 2023
49f39b5
PR comment fix - remove Localization Config and Time Format Localizat…
jamesharrow Dec 16, 2023
2329d46
Merge branch 'master' into 30727-add-evse-to-examplesenergy-managemen…
jamesharrow Dec 18, 2023
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
Merge branch 'upstream-master' into 30727-add-evse-to-examplesenergy-… 
…management-app
  • Loading branch information
@jamesharrow
jamesharrow committed Dec 15, 2023
commit 7385acd486617194bb5ee926ce261dc6b51e4cec
2 changes: 1 addition & 1 deletion examples/all-clusters-app/all-clusters-common/src/EnergyEvseDelegateImpl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ Status EnergyEvseDelegate::Disable()
{
ChipLogProgress(AppServer, "EnergyEvseDelegate::Disable()");

/* update State */
/* Update State */
switch (mHwState)
{
case StateEnum::kNotPluggedIn:
Expand Down
Loading
You are viewing a condensed version of this merge commit. You can view the full changes here.