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

Unlock Evse module when Wifi module is ready #548

Merged
merged 4 commits into from
Feb 23, 2023
Merged

Unlock Evse module when Wifi module is ready #548

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f692464
Unlock openEvse at evseBoot() if compiled with BOOTLOCK
KipK Feb 20, 2023
830f21a
upgrade openevse lib version
KipK Feb 20, 2023
b6e871b
remove gui v2
KipK Feb 22, 2023
835bf73
Merge branch 'BOOTLOCK' of https://github.com/KipK/ESP32_WiFi_V4.x in…
KipK Feb 22, 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
1 change: 1 addition & 0 deletions openevse-gui-v2
Open in desktop
Submodule openevse-gui-v2 added at 606377
2 changes: 1 addition & 1 deletion platformio.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ lib_deps =
jeremypoulter/[email protected]
jeremypoulter/Micro [email protected]
jeremypoulter/[email protected]
jeremypoulter/[email protected].11
jeremypoulter/[email protected].12
jeremypoulter/[email protected]
jeremypoulter/[email protected]
jeremypoulter/[email protected]
Expand Down
15 changes: 14 additions & 1 deletion src/evse_monitor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -273,6 +273,19 @@ void EvseMonitor::evseBoot(const char *firmware)
_openevse.heartbeatEnable(EVSE_HEATBEAT_INTERVAL, EVSE_HEARTBEAT_CURRENT, [this](int ret, int interval, int current, int triggered) {
_heartbeat = RAPI_RESPONSE_OK == ret;
});

// Unlock OpenEVSE if compiled with BOOTLOCK
_openevse.clearBootLock([this](int ret)
{
if(RAPI_RESPONSE_OK == ret)
{
DBUGF("Unlocked OpenEVSE");
}
else {
DBUGF("Unlock OpenEVSE failed")
}

});
}

void EvseMonitor::updateEvseState(uint8_t evse_state, uint8_t pilot_state, uint32_t vflags)
Expand Down Expand Up @@ -312,7 +325,7 @@ void EvseMonitor::updateEvseState(uint8_t evse_state, uint8_t pilot_state, uint3
}

void EvseMonitor::verifyPilot() {
// After some state changes the OpenEVSE module compiled with PP_AUTO_AMPACITY will reset to the maximum pilot level, so reset to what we expect
// OpenEVSE module compiled with PP_AUTO_AMPACITY will reset to the maximum pilot level, so reset to what we expect
_openevse.getCurrentCapacity([this](int ret, long min_current, long max_hardware_current, long pilot, long max_configured_current)
{
if(RAPI_RESPONSE_OK == ret && pilot > getPilot())
Expand Down