Skip to content

Commit 3cf6d6f

Browse files
jeremypoulterjeremypoulter
committed
Updated to latest ConfigJson library
1 parent 0862537 commit 3cf6d6f

File tree

4 files changed

+56
-56
lines changed

4 files changed

+56
-56
lines changed

‎platformio.ini‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ lib_deps =
3333
bblanchon/[email protected]
3434
jeremypoulter/[email protected]
3535
jeremypoulter/Micro [email protected]
36-
jeremypoulter/[email protected].5
36+
jeremypoulter/[email protected].6
3737
jeremypoulter/[email protected]
3838
jeremypoulter/[email protected]
3939
jeremypoulter/[email protected]

‎src/app_config.cpp‎

Lines changed: 47 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -136,98 +136,98 @@ void config_changed(String name);
136136
CONFIG_OCPP_OFFLINE_AUTH | \
137137
CONFIG_DEFAULT_STATE)
138138

139-
ConfigOptDefenition<uint32_t> flagsOpt = ConfigOptDefenition<uint32_t>(flags, CONFIG_DEFAULT_FLAGS, "flags", "f");
140-
ConfigOptDefenition<uint32_t> flagsChanged = ConfigOptDefenition<uint32_t>(flags_changed, 0, "flags_changed", "c");
139+
ConfigOptDefinition<uint32_t> flagsOpt = ConfigOptDefinition<uint32_t>(flags, CONFIG_DEFAULT_FLAGS, "flags", "f");
140+
ConfigOptDefinition<uint32_t> flagsChanged = ConfigOptDefinition<uint32_t>(flags_changed, 0, "flags_changed", "c");
141141

142142
ConfigOpt *opts[] =
143143
{
144144
// Wifi Network Strings
145-
new ConfigOptDefenition<String>(esid, "", "ssid", "ws"),
145+
new ConfigOptDefinition<String>(esid, "", "ssid", "ws"),
146146
new ConfigOptSecret(epass, "", "pass", "wp"),
147-
new ConfigOptDefenition<String>(ap_ssid, "", "ap_ssid", "as"),
147+
new ConfigOptDefinition<String>(ap_ssid, "", "ap_ssid", "as"),
148148
new ConfigOptSecret(ap_pass, "", "ap_pass", "ap"),
149149

150150
// Language String
151-
new ConfigOptDefenition<String>(lang, "", "lang", "lan"),
151+
new ConfigOptDefinition<String>(lang, "", "lang", "lan"),
152152

153153
// Web server authentication (leave blank for none)
154-
new ConfigOptDefenition<String>(www_username, "", "www_username", "au"),
154+
new ConfigOptDefinition<String>(www_username, "", "www_username", "au"),
155155
new ConfigOptSecret(www_password, "", "www_password", "ap"),
156156

157157
// Advanced settings
158-
new ConfigOptDefenition<String>(esp_hostname, esp_hostname_default, "hostname", "hn"),
159-
new ConfigOptDefenition<String>(sntp_hostname, SNTP_DEFAULT_HOST, "sntp_hostname", "sh"),
158+
new ConfigOptDefinition<String>(esp_hostname, esp_hostname_default, "hostname", "hn"),
159+
new ConfigOptDefinition<String>(sntp_hostname, SNTP_DEFAULT_HOST, "sntp_hostname", "sh"),
160160

161161
// Time
162-
new ConfigOptDefenition<String>(time_zone, DEFAULT_TIME_ZONE, "time_zone", "tz"),
162+
new ConfigOptDefinition<String>(time_zone, DEFAULT_TIME_ZONE, "time_zone", "tz"),
163163

164164
// Limit
165-
new ConfigOptDefenition<String>(limit_default_type, {}, "limit_default_type", "ldt"),
166-
new ConfigOptDefenition<uint32_t>(limit_default_value, {}, "limit_default_value", "ldv"),
165+
new ConfigOptDefinition<String>(limit_default_type, {}, "limit_default_type", "ldt"),
166+
new ConfigOptDefinition<uint32_t>(limit_default_value, {}, "limit_default_value", "ldv"),
167167

168168
// EMONCMS SERVER strings
169-
new ConfigOptDefenition<String>(emoncms_server, "https://data.openevse.com/emoncms", "emoncms_server", "es"),
170-
new ConfigOptDefenition<String>(emoncms_node, esp_hostname, "emoncms_node", "en"),
169+
new ConfigOptDefinition<String>(emoncms_server, "https://data.openevse.com/emoncms", "emoncms_server", "es"),
170+
new ConfigOptDefinition<String>(emoncms_node, esp_hostname, "emoncms_node", "en"),
171171
new ConfigOptSecret(emoncms_apikey, "", "emoncms_apikey", "ea"),
172-
new ConfigOptDefenition<String>(emoncms_fingerprint, "", "emoncms_fingerprint", "ef"),
172+
new ConfigOptDefinition<String>(emoncms_fingerprint, "", "emoncms_fingerprint", "ef"),
173173

174174
// MQTT Settings
175-
new ConfigOptDefenition<String>(mqtt_server, "emonpi", "mqtt_server", "ms"),
176-
new ConfigOptDefenition<uint32_t>(mqtt_port, 1883, "mqtt_port", "mpt"),
177-
new ConfigOptDefenition<String>(mqtt_topic, esp_hostname, "mqtt_topic", "mt"),
178-
new ConfigOptDefenition<String>(mqtt_user, "emonpi", "mqtt_user", "mu"),
175+
new ConfigOptDefinition<String>(mqtt_server, "emonpi", "mqtt_server", "ms"),
176+
new ConfigOptDefinition<uint32_t>(mqtt_port, 1883, "mqtt_port", "mpt"),
177+
new ConfigOptDefinition<String>(mqtt_topic, esp_hostname, "mqtt_topic", "mt"),
178+
new ConfigOptDefinition<String>(mqtt_user, "emonpi", "mqtt_user", "mu"),
179179
new ConfigOptSecret(mqtt_pass, "emonpimqtt2016", "mqtt_pass", "mp"),
180-
new ConfigOptDefenition<String>(mqtt_solar, "", "mqtt_solar", "mo"),
181-
new ConfigOptDefenition<String>(mqtt_grid_ie, "emon/emonpi/power1", "mqtt_grid_ie", "mg"),
182-
new ConfigOptDefenition<String>(mqtt_vrms, "emon/emonpi/vrms", "mqtt_vrms", "mv"),
183-
new ConfigOptDefenition<String>(mqtt_live_pwr, "", "mqtt_live_pwr", "map"),
184-
new ConfigOptDefenition<String>(mqtt_vehicle_soc, "", "mqtt_vehicle_soc", "mc"),
185-
new ConfigOptDefenition<String>(mqtt_vehicle_range, "", "mqtt_vehicle_range", "mr"),
186-
new ConfigOptDefenition<String>(mqtt_vehicle_eta, "", "mqtt_vehicle_eta", "met"),
187-
new ConfigOptDefenition<String>(mqtt_announce_topic, "openevse/announce/" + ESPAL.getShortId(), "mqtt_announce_topic", "ma"),
180+
new ConfigOptDefinition<String>(mqtt_solar, "", "mqtt_solar", "mo"),
181+
new ConfigOptDefinition<String>(mqtt_grid_ie, "emon/emonpi/power1", "mqtt_grid_ie", "mg"),
182+
new ConfigOptDefinition<String>(mqtt_vrms, "emon/emonpi/vrms", "mqtt_vrms", "mv"),
183+
new ConfigOptDefinition<String>(mqtt_live_pwr, "", "mqtt_live_pwr", "map"),
184+
new ConfigOptDefinition<String>(mqtt_vehicle_soc, "", "mqtt_vehicle_soc", "mc"),
185+
new ConfigOptDefinition<String>(mqtt_vehicle_range, "", "mqtt_vehicle_range", "mr"),
186+
new ConfigOptDefinition<String>(mqtt_vehicle_eta, "", "mqtt_vehicle_eta", "met"),
187+
new ConfigOptDefinition<String>(mqtt_announce_topic, "openevse/announce/" + ESPAL.getShortId(), "mqtt_announce_topic", "ma"),
188188

189189
// OCPP 1.6 Settings
190-
new ConfigOptDefenition<String>(ocpp_server, "", "ocpp_server", "ows"),
191-
new ConfigOptDefenition<String>(ocpp_chargeBoxId, "", "ocpp_chargeBoxId", "cid"),
192-
new ConfigOptDefenition<String>(ocpp_authkey, "", "ocpp_authkey", "oky"),
193-
new ConfigOptDefenition<String>(ocpp_idtag, "DefaultIdTag", "ocpp_idtag", "idt"),
190+
new ConfigOptDefinition<String>(ocpp_server, "", "ocpp_server", "ows"),
191+
new ConfigOptDefinition<String>(ocpp_chargeBoxId, "", "ocpp_chargeBoxId", "cid"),
192+
new ConfigOptDefinition<String>(ocpp_authkey, "", "ocpp_authkey", "oky"),
193+
new ConfigOptDefinition<String>(ocpp_idtag, "DefaultIdTag", "ocpp_idtag", "idt"),
194194

195195
// Ohm Connect Settings
196-
new ConfigOptDefenition<String>(ohm, "", "ohm", "o"),
196+
new ConfigOptDefinition<String>(ohm, "", "ohm", "o"),
197197

198198
// Divert settings
199-
new ConfigOptDefenition<int8_t>(divert_type, -1, "divert_type", "dm"),
200-
new ConfigOptDefenition<double>(divert_PV_ratio, 1.1, "divert_PV_ratio", "dpr"),
201-
new ConfigOptDefenition<uint32_t>(divert_attack_smoothing_time, 20, "divert_attack_smoothing_time", "das"),
202-
new ConfigOptDefenition<uint32_t>(divert_decay_smoothing_time, 600, "divert_decay_smoothing_time", "dds"),
203-
new ConfigOptDefenition<uint32_t>(divert_min_charge_time, 600, "divert_min_charge_time", "dt"),
199+
new ConfigOptDefinition<int8_t>(divert_type, -1, "divert_type", "dm"),
200+
new ConfigOptDefinition<double>(divert_PV_ratio, 1.1, "divert_PV_ratio", "dpr"),
201+
new ConfigOptDefinition<uint32_t>(divert_attack_smoothing_time, 20, "divert_attack_smoothing_time", "das"),
202+
new ConfigOptDefinition<uint32_t>(divert_decay_smoothing_time, 600, "divert_decay_smoothing_time", "dds"),
203+
new ConfigOptDefinition<uint32_t>(divert_min_charge_time, 600, "divert_min_charge_time", "dt"),
204204

205205
// Current Shaper settings
206-
new ConfigOptDefenition<uint32_t>(current_shaper_max_pwr, 0, "current_shaper_max_pwr", "smp"),
207-
new ConfigOptDefenition<uint32_t>(current_shaper_smoothing_time, 60, "current_shaper_smoothing_time", "sst"),
208-
new ConfigOptDefenition<uint32_t>(current_shaper_min_pause_time, 300, "current_shaper_min_pause_time", "spt"),
209-
new ConfigOptDefenition<uint32_t>(current_shaper_data_maxinterval, 120, "current_shaper_data_maxinterval", "sdm"),
206+
new ConfigOptDefinition<uint32_t>(current_shaper_max_pwr, 0, "current_shaper_max_pwr", "smp"),
207+
new ConfigOptDefinition<uint32_t>(current_shaper_smoothing_time, 60, "current_shaper_smoothing_time", "sst"),
208+
new ConfigOptDefinition<uint32_t>(current_shaper_min_pause_time, 300, "current_shaper_min_pause_time", "spt"),
209+
new ConfigOptDefinition<uint32_t>(current_shaper_data_maxinterval, 120, "current_shaper_data_maxinterval", "sdm"),
210210

211211
// Vehicle settings
212-
new ConfigOptDefenition<uint8_t>(vehicle_data_src, 0, "vehicle_data_src", "vds"),
212+
new ConfigOptDefinition<uint8_t>(vehicle_data_src, 0, "vehicle_data_src", "vds"),
213213

214214
// Tesla client settings
215215
new ConfigOptSecret(tesla_access_token, "", "tesla_access_token", "tat"),
216216
new ConfigOptSecret(tesla_refresh_token, "", "tesla_refresh_token", "trt"),
217-
new ConfigOptDefenition<uint64_t>(tesla_created_at, -1, "tesla_created_at", "tc"),
218-
new ConfigOptDefenition<uint64_t>(tesla_expires_in, -1, "tesla_expires_in", "tx"),
219-
new ConfigOptDefenition<String>(tesla_vehicle_id, "", "tesla_vehicle_id", "ti"),
217+
new ConfigOptDefinition<uint64_t>(tesla_created_at, -1, "tesla_created_at", "tc"),
218+
new ConfigOptDefinition<uint64_t>(tesla_expires_in, -1, "tesla_expires_in", "tx"),
219+
new ConfigOptDefinition<String>(tesla_vehicle_id, "", "tesla_vehicle_id", "ti"),
220220

221221
// RFID storage
222-
new ConfigOptDefenition<String>(rfid_storage, "", "rfid_storage", "rs"),
222+
new ConfigOptDefinition<String>(rfid_storage, "", "rfid_storage", "rs"),
223223

224224
#if RGB_LED
225225
// LED brightness
226-
new ConfigOptDefenition<uint8_t>(led_brightness, LED_DEFAULT_BRIGHTNESS, "led_brightness", "lb"),
226+
new ConfigOptDefinition<uint8_t>(led_brightness, LED_DEFAULT_BRIGHTNESS, "led_brightness", "lb"),
227227
#endif
228228

229229
// Scheduler options
230-
new ConfigOptDefenition<uint32_t>(scheduler_start_window, SCHEDULER_DEFAULT_START_WINDOW, "scheduler_start_window", "ssw"),
230+
new ConfigOptDefinition<uint32_t>(scheduler_start_window, SCHEDULER_DEFAULT_START_WINDOW, "scheduler_start_window", "ssw"),
231231

232232
// Flags
233233
&flagsOpt,

‎src/app_config_mode.h‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,19 @@
22
#define app_config_mode_h
33

44
#include <ConfigOpt.h>
5-
#include <ConfigOptDefenition.h>
5+
#include <ConfigOptDefinition.h>
66

77
#include "mqtt.h"
88
#include "app_config.h"
99

1010
class ConfigOptVirtualChargeMode : public ConfigOpt
1111
{
1212
protected:
13-
ConfigOptDefenition<uint32_t> &_base;
14-
ConfigOptDefenition<uint32_t> &_change;
13+
ConfigOptDefinition<uint32_t> &_base;
14+
ConfigOptDefinition<uint32_t> &_change;
1515

1616
public:
17-
ConfigOptVirtualChargeMode(ConfigOptDefenition<uint32_t> &base, ConfigOptDefenition<uint32_t> &change, const char *long_name, const char *short_name) :
17+
ConfigOptVirtualChargeMode(ConfigOptDefinition<uint32_t> &base, ConfigOptDefinition<uint32_t> &change, const char *long_name, const char *short_name) :
1818
ConfigOpt(long_name, short_name),
1919
_base(base),
2020
_change(change)

‎src/app_config_mqtt.h‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,19 @@
22
#define app_config_mqtt_h
33

44
#include <ConfigOpt.h>
5-
#include <ConfigOptDefenition.h>
5+
#include <ConfigOptDefinition.h>
66

77
#include "mqtt.h"
88
#include "app_config.h"
99

1010
class ConfigOptVirtualMqttProtocol : public ConfigOpt
1111
{
1212
protected:
13-
ConfigOptDefenition<uint32_t> &_base;
14-
ConfigOptDefenition<uint32_t> &_change;
13+
ConfigOptDefinition<uint32_t> &_base;
14+
ConfigOptDefinition<uint32_t> &_change;
1515

1616
public:
17-
ConfigOptVirtualMqttProtocol(ConfigOptDefenition<uint32_t> &base, ConfigOptDefenition<uint32_t> &change, const char *long_name, const char *short_name) :
17+
ConfigOptVirtualMqttProtocol(ConfigOptDefinition<uint32_t> &base, ConfigOptDefinition<uint32_t> &change, const char *long_name, const char *short_name) :
1818
ConfigOpt(long_name, short_name),
1919
_base(base),
2020
_change(change)

0 commit comments

Comments
 (0)