andry/EMS-ESP32
1
0
Fork 0
mirror of https://github.com/emsesp/EMS-ESP32.git synced 2025-12-06 15:59:52 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix how json default values are set

Browse Source
This commit is contained in:
Paul
2019-06-18 22:13:30 +02:00
parent 32ca320afe
commit ffacc66d9e
2 changed files with 23 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/MyESP/MyESP.cpp
View File

@@ -274,10 +274,6 @@ void MyESP::_wifiCallback(justwifi_messages_t code, char * parameter) {
myDebug_P(PSTR("[WIFI] Could not create access point\n")); myDebug_P(PSTR("[WIFI] Could not create access point\n"));
} }
if (code == MESSAGE_ACCESSPOINT_DESTROYED) {
myDebug_P(PSTR("[WIFI] Access point destroyed\n"));
}
if (code == MESSAGE_WPS_START) { if (code == MESSAGE_WPS_START) {
myDebug_P(PSTR("[WIFI] WPS started\n")); myDebug_P(PSTR("[WIFI] WPS started\n"));
} }
@@ -1562,9 +1558,9 @@ bool MyESP::_fs_loadConfig() {
value = json["mqtt_password"]; value = json["mqtt_password"];
_mqtt_password = (value) ? strdup(value) : NULL; _mqtt_password = (value) ? strdup(value) : NULL;
_use_serial = (bool)json["use_serial"]; _use_serial = (bool)json["use_serial"]; // defaults to off
_heartbeat = (bool)json["heartbeat"]; _heartbeat = (bool)json["heartbeat"]; // defaults to off
// callback for loading custom settings // callback for loading custom settings
// ok is false if there's a problem loading a custom setting (e.g. does not exist) // ok is false if there's a problem loading a custom setting (e.g. does not exist)

71
src/ems-esp.cpp
View File

@@ -96,18 +96,18 @@ typedef struct {
command_t project_cmds[] = { command_t project_cmds[] = {
{true, "led <on | off>", "toggle status LED on/off"}, {true, "led <on | off>", "toggle status LED on/off"},
{true, "led_gpio <gpio>", "set the LED pin. Default is the onboard LED (D1=5)"}, {true, "led_gpio <gpio>", "set the LED pin. Default is the onboard LED 2. For external D1 use 5"},
{true, "dallas_gpio <gpio>", "set the pin for external Dallas temperature sensors (D5=14)"}, {true, "dallas_gpio <gpio>", "set the external Dallas temperature sensors pin. Default is 14 for D5"},
{true, "dallas_parasite <on | off>", "set to on if powering Dallas via parasite"}, {true, "dallas_parasite <on | off>", "set to on if powering Dallas sesnsors via parasite power"},
{true, "thermostat_type <device ID>", "set the thermostat type id (e.g. 10 for 0x10)"}, {true, "thermostat_type <device ID>", "set the thermostat type ID (e.g. 10 for 0x10)"},
{true, "boiler_type <device ID>", "set the boiler type id (e.g. 8 for 0x08)"}, {true, "boiler_type <device ID>", "set the boiler type ID (e.g. 8 for 0x08)"},
{true, "listen_mode <on | off>", "when on all automatic Tx is disabled"}, {true, "listen_mode <on | off>", "when set to on all automatic Tx are disabled"},
{true, "shower_timer <on | off>", "notify via MQTT all shower durations"}, {true, "shower_timer <on | off>", "send MQTT notification on all shower durations"},
{true, "shower_alert <on | off>", "send a warning of cold water after shower time is exceeded"}, {true, "shower_alert <on | off>", "stop hot water to send 3 cold burst warnings after max shower time is exceeded"},
{true, "publish_time <seconds>", "set frequency for publishing to MQTT (0=off)"}, {true, "publish_time <seconds>", "set frequency for publishing data to MQTT (0=off)"},
{true, "heating_circuit <1 | 2>", "set the thermostat HC to work with if using multiple heating circuits"}, {true, "heating_circuit <1 | 2>", "set the main thermostat HC to work with (if using multiple heating circuits)"},
{false, "info", "show data captured on the EMS bus"}, {false, "info", "show current captured on the devices"},
{false, "log <n | b | t | r | v>", "set logging mode to none, basic, thermostat only, raw or verbose"}, {false, "log <n | b | t | r | v>", "set logging mode to none, basic, thermostat only, raw or verbose"},
#ifdef TESTS #ifdef TESTS
@@ -1016,56 +1016,25 @@ void runUnitTest(uint8_t test_num) {
// callback for loading/saving settings to the file system (SPIFFS) // callback for loading/saving settings to the file system (SPIFFS)
bool FSCallback(MYESP_FSACTION action, const JsonObject json) { bool FSCallback(MYESP_FSACTION action, const JsonObject json) {
if (action == MYESP_FSACTION_LOAD) { if (action == MYESP_FSACTION_LOAD) {
bool recreate_config = true;
// led
EMSESP_Status.led = json["led"]; EMSESP_Status.led = json["led"];
EMSESP_Status.led_gpio = json["led_gpio"] | EMSESP_LED_GPIO;
// led_gpio EMSESP_Status.dallas_gpio = json["dallas_gpio"] | EMSESP_DALLAS_GPIO;
if (!(EMSESP_Status.led_gpio = json["led_gpio"])) {
EMSESP_Status.led_gpio = EMSESP_LED_GPIO; // default value
}
// dallas_gpio
if (!(EMSESP_Status.dallas_gpio = json["dallas_gpio"])) {
EMSESP_Status.dallas_gpio = EMSESP_DALLAS_GPIO; // default value
}
// dallas_parasite
EMSESP_Status.dallas_parasite = json["dallas_parasite"]; EMSESP_Status.dallas_parasite = json["dallas_parasite"];
// thermostat_type EMS_Thermostat.device_id = json["thermostat_type"] | EMSESP_THERMOSTAT_TYPE;
if (!(EMS_Thermostat.device_id = json["thermostat_type"])) { EMS_Boiler.device_id = json["boiler_type"] | EMSESP_BOILER_TYPE;
EMS_Thermostat.device_id = EMSESP_THERMOSTAT_TYPE; // set default
}
// boiler_type EMSESP_Status.shower_timer = json["shower_timer"];
if (!(EMS_Boiler.device_id = json["boiler_type"])) { EMSESP_Status.shower_alert = json["shower_alert"];
EMS_Boiler.device_id = EMSESP_BOILER_TYPE; // set default EMSESP_Status.publish_time = json["publish_time"] | DEFAULT_PUBLISHTIME;
}
// listen mode
EMSESP_Status.listen_mode = json["listen_mode"]; EMSESP_Status.listen_mode = json["listen_mode"];
ems_setTxDisabled(EMSESP_Status.listen_mode); ems_setTxDisabled(EMSESP_Status.listen_mode);
// shower_timer EMSESP_Status.heating_circuit = json["heating_circuit"] | DEFAULT_HEATINGCIRCUIT;
EMSESP_Status.shower_timer = json["shower_timer"];
// shower_alert
EMSESP_Status.shower_alert = json["shower_alert"];
// publish_time
if (!(EMSESP_Status.publish_time = json["publish_time"])) {
EMSESP_Status.publish_time = DEFAULT_PUBLISHTIME; // default value
}
// heating_circuit
if (!(EMSESP_Status.heating_circuit = json["heating_circuit"])) {
EMSESP_Status.heating_circuit = DEFAULT_HEATINGCIRCUIT; // default value
}
ems_setThermostatHC(EMSESP_Status.heating_circuit); ems_setThermostatHC(EMSESP_Status.heating_circuit);
return recreate_config; // return false if some settings are missing and we need to rebuild the file return true; // return false if some settings are missing and we need to rebuild the file
} }
if (action == MYESP_FSACTION_SAVE) { if (action == MYESP_FSACTION_SAVE) {