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

OCPP update and clean up #682

Merged
merged 14 commits into from
Sep 12, 2023
Merged

OCPP update and clean up #682

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
5ca9d3d
rework lifecycle mgmt, config sync and issues
matth-x Jun 27, 2023
27d2f3a
trace config updates
matth-x Jun 28, 2023
4200e24
change OCPP factory defaults
matth-x Jul 4, 2023
b45f275
change configs sync (OpenEVSE prevails); update AO
matth-x Jul 4, 2023
f4570d1
clean up configs sync
matth-x Jul 5, 2023
d15dbd8
stop looping when OCPP is disabled
matth-x Jul 5, 2023
77ec0cb
minor clean up
matth-x Jul 5, 2023
fdf4b96
convert kWh into Wh (addresses #703)
matth-x Jul 24, 2023
b099df2
Merge branch 'master' into master
chris1howell Aug 17, 2023
25474bf
change configs directly
matth-x Aug 18, 2023
78f2a5b
update OCPP lib
matth-x Aug 18, 2023
1af53e4
Merge remote-tracking branch 'upstream/master'
matth-x Aug 19, 2023
b23cffc
Merge remote-tracking branch 'upstream/master'
matth-x Sep 5, 2023
ae8aaa3
Merge branch 'master' into master
jeremypoulter Sep 12, 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
4 changes: 2 additions & 2 deletions platformio.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@ lib_deps =
jeremypoulter/ESPAL@0.0.3
jeremypoulter/StreamSpy@0.0.1
jeremypoulter/MicroTasks@0.0.3
matth-x/ArduinoOcpp@0.2.0
matth-x/ArduinoOcppMongoose@0.0.1
https://github.com/matth-x/ArduinoOcpp#00e42d7
https://github.com/matth-x/ArduinoOcppMongoose
matth-x marked this conversation as resolved.
Show resolved Hide resolved
lib_ignore = WebSockets ; ArduinoOcpp: don't compile built-in WS library
extra_scripts =
pre:scripts/auto_fw_version.py
Expand Down
8 changes: 6 additions & 2 deletions src/app_config.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,11 @@ String esp_hostname_default = "openevse-"+ESPAL.getShortId();

void config_changed(String name);

ConfigOptDefenition<uint32_t> flagsOpt = ConfigOptDefenition<uint32_t>(flags, CONFIG_SERVICE_SNTP, "flags", "f");
ConfigOptDefenition<uint32_t> flagsOpt = ConfigOptDefenition<uint32_t>(flags,
CONFIG_SERVICE_SNTP |
CONFIG_OCPP_AUTO_AUTH |
CONFIG_OCPP_OFFLINE_AUTH,
jeremypoulter marked this conversation as resolved.
Show resolved Hide resolved
"flags", "f");

ConfigOpt *opts[] =
{
Expand Down Expand Up @@ -183,7 +187,7 @@ ConfigOpt *opts[] =
new ConfigOptDefenition<String>(ocpp_server, "", "ocpp_server", "ows"),
new ConfigOptDefenition<String>(ocpp_chargeBoxId, "", "ocpp_chargeBoxId", "cid"),
new ConfigOptDefenition<String>(ocpp_authkey, "", "ocpp_authkey", "oky"),
new ConfigOptDefenition<String>(ocpp_idtag, "", "ocpp_idtag", "idt"),
new ConfigOptDefenition<String>(ocpp_idtag, "DefaultIdTag", "ocpp_idtag", "idt"),

// Ohm Connect Settings
new ConfigOptDefenition<String>(ohm, "", "ohm", "o"),
Expand Down
Loading
Loading