iotmanager/IoTManager
1
0
Fork 0
mirror of https://github.com/IoTManagerProject/IoTManager.git synced 2026-03-27 06:32:19 +03:00
Code Issues Packages Projects Releases Wiki Activity

changed json var names to more visible

Browse Source
This commit is contained in:
Dmitry Borisenko
2020-06-19 14:50:34 +02:00
parent e6637dcd69
commit 48ba3c99dd
18 changed files with 428 additions and 340 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/Init.cpp
View File

@@ -7,13 +7,13 @@ void All_init() {
value = request->getParam("arg")->value();
}
if (value == "0") { //выкл сценариев
jsonWriteStr(configSetup, "scenario", value);
jsonWriteStr(configSetupJson, "scenario", value);
saveConfig();
Scenario_init();
request->send(200, "text/text", "OK");
}
if (value == "1") { //вкл сценариев
jsonWriteStr(configSetup, "scenario", value);
jsonWriteStr(configSetupJson, "scenario", value);
saveConfig();
Scenario_init();
request->send(200, "text/text", "OK");
@@ -51,7 +51,7 @@ void Device_init() {
analog_value_names_list = "";
enter_to_analog_counter = 0;
level_value_name = "";
levelPr_value_name = "";
dhtT_value_name = "";
dhtH_value_name = "";
@@ -85,7 +85,7 @@ void Device_init() {
}
void Scenario_init() {
if (jsonReadStr(configSetup, "scenario") == "1") {
if (jsonReadStr(configSetupJson, "scenario") == "1") {
scenario = readFile("firmware.s.txt", 2048);
}
}
@@ -188,19 +188,19 @@ void up_time() {
if (ss != 0) {
out = "[i] uptime = " + String(ss) + " sec";
jsonWriteStr(configJson, "uptime", String(ss) + " sec");
jsonWriteStr(configLiveJson, "uptime", String(ss) + " sec");
}
if (mm != 0) {
out = "[i] uptime = " + String(mm) + " min";
jsonWriteStr(configJson, "uptime", String(mm) + " min");
jsonWriteStr(configLiveJson, "uptime", String(mm) + " min");
}
if (hh != 0) {
out = "[i] uptime = " + String(hh) + " hours";
jsonWriteStr(configJson, "uptime", String(hh) + " hours");
jsonWriteStr(configLiveJson, "uptime", String(hh) + " hours");
}
if (dd != 0) {
out = "[i] uptime = " + String(dd) + " days";
jsonWriteStr(configJson, "uptime", String(dd) + " days");
jsonWriteStr(configLiveJson, "uptime", String(dd) + " days");
}
Serial.println(out + ", mqtt_lost_error: " + String(mqtt_lost_error) + ", wifi_lost_error: " + String(wifi_lost_error));
}