From 01a419d987522e3053f882bb1d9edd0215160a71 Mon Sep 17 00:00:00 2001 From: Dmitry Borisenko <49808844+DmitryBorisenko33@users.noreply.github.com> Date: Tue, 26 May 2020 22:12:35 +0200 Subject: [PATCH 1/6] uncomment --- set.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/set.h b/set.h index c1de1f87..00a94f64 100644 --- a/set.h +++ b/set.h @@ -9,12 +9,12 @@ boolean mb_4_of_memory = true; //#define layout_in_ram #define UDP_enable /*==========================SENSORS===============================*/ -//#define level_enable -//#define analog_enable -//#define dallas_enable -//#define dht_enable //подъедает оперативку сука -//#define bmp_enable -//#define bme_enable +#define level_enable +#define analog_enable +#define dallas_enable +#define dht_enable //подъедает оперативку сука +#define bmp_enable +#define bme_enable /*=========================LOGGING================================*/ #define logging_enable /*==========================GEARS=================================*/ From 48ddb1a505740702e520a091d9a8e563cc722455 Mon Sep 17 00:00:00 2001 From: Dmitry Borisenko <49808844+DmitryBorisenko33@users.noreply.github.com> Date: Tue, 26 May 2020 22:18:27 +0200 Subject: [PATCH 2/6] Update set.h --- set.h | 1 + 1 file changed, 1 insertion(+) diff --git a/set.h b/set.h index 00a94f64..18f53186 100644 --- a/set.h +++ b/set.h @@ -1,6 +1,7 @@ /******************************************************************* **********************FIRMWARE SETTINGS**************************** ******************************************************************/ + //dev String firmware_version = "2.3.3"; boolean mb_4_of_memory = true; //#define OTA_enable From 3135e5658f49902bd8bd7419f7a9813be7bf5778 Mon Sep 17 00:00:00 2001 From: Dmitry Borisenko <49808844+DmitryBorisenko33@users.noreply.github.com> Date: Thu, 28 May 2020 00:33:26 +0200 Subject: [PATCH 3/6] Global Webinterface Upgrade --- Cmd.ino | 10 +- Init.ino | 131 +------- Scenario.ino | 4 +- Time.ino | 20 +- Upgrade.ino | 42 --- Web.ino | 315 ++++++++++++++++++ WiFi.ino | 60 +--- data/config.json | 6 +- data/index.json | 30 +- data/lang/lang.ru.json | 6 + data/{configuration.json => set.device.json} | 31 +- data/{mqtt.json => set.mqtt.json} | 0 data/{pushingbox.json => set.push.json} | 0 data/{dev.json => set.udp.json} | 23 +- data/{utilities.json => set.utilities.json} | 0 data/{setup.json => set.wifi.json} | 0 ...2-esp8266_iot-manager_modules_firmware.ino | 13 +- mqtt.ino | 38 +-- push_pushingbox.ino | 13 - udp.ino | 36 +- 20 files changed, 390 insertions(+), 388 deletions(-) create mode 100644 Web.ino create mode 100644 data/lang/lang.ru.json rename data/{configuration.json => set.device.json} (85%) rename data/{mqtt.json => set.mqtt.json} (100%) rename data/{pushingbox.json => set.push.json} (100%) rename data/{dev.json => set.udp.json} (69%) rename data/{utilities.json => set.utilities.json} (100%) rename data/{setup.json => set.wifi.json} (100%) diff --git a/Cmd.ino b/Cmd.ino index 6e1b58a1..9001fb42 100644 --- a/Cmd.ino +++ b/Cmd.ino @@ -107,8 +107,8 @@ void button() { digitalWrite(button_param.toInt(), start_state.toInt()); } - if (button_param == "scenario") { - jsonWriteStr(configSetup, "scenario", start_state); + if (button_param == "scen") { + jsonWriteStr(configSetup, "scen", start_state); Scenario_init(); saveConfig(); } @@ -135,12 +135,12 @@ void buttonSet() { String button_state = sCmd.next(); String button_param = jsonReadStr(optionJson, "button_param" + button_number); - if (button_param != "na" || button_param != "scenario" || button_param.indexOf("line") != -1) { + if (button_param != "na" || button_param != "scen" || button_param.indexOf("line") != -1) { digitalWrite(button_param.toInt(), button_state.toInt()); } - if (button_param == "scenario") { - jsonWriteStr(configSetup, "scenario", button_state); + if (button_param == "scen") { + jsonWriteStr(configSetup, "scen", button_state); Scenario_init(); saveConfig(); } diff --git a/Init.ino b/Init.ino index 49922054..4465b97f 100644 --- a/Init.ino +++ b/Init.ino @@ -1,50 +1,11 @@ void All_init() { - - server.on("/init", HTTP_GET, [](AsyncWebServerRequest * request) { - String value; - if (request->hasArg("arg")) { - value = request->getParam("arg")->value(); - } - if (value == "0") { //выкл сценариев - jsonWriteStr(configSetup, "scenario", value); - saveConfig(); - Scenario_init(); - request->send(200, "text/text", "OK"); - } - if (value == "1") { //вкл сценариев - jsonWriteStr(configSetup, "scenario", value); - saveConfig(); - Scenario_init(); - request->send(200, "text/text", "OK"); - } - if (value == "2") { //инициализация - Device_init(); - request->send(200, "text/text", "OK"); - } - if (value == "3") { -#ifdef logging_enable - clean_log_date(); -#endif - request->send(200, "text/text", "OK"); - } - if (value == "4") { - Scenario_init(); - request->send(200, "text/text", "OK"); - } - if (value == "5") { - i2c_scanning = true; - request->redirect("/?utilities"); - } - }); - - prsets_init(); Device_init(); Scenario_init(); Timer_countdown_init(); } void Device_init() { - + logging_value_names_list = ""; enter_to_logging_counter = LOG1 - 1; @@ -86,99 +47,11 @@ void Device_init() { //-------------------------------сценарии----------------------------------------------------- void Scenario_init() { - if (jsonReadStr(configSetup, "scenario") == "1") { + if (jsonReadStr(configSetup, "scen") == "1") { scenario = readFile("firmware.s.txt", 2048); } } -void prsets_init() { - server.on("/preset", HTTP_GET, [](AsyncWebServerRequest * request) { - String value; - if (request->hasArg("arg")) { - value = request->getParam("arg")->value(); - } - if (value == "1") { - writeFile("firmware.c.txt", readFile("configs/relay.c.txt", 2048)); - writeFile("firmware.s.txt", readFile("configs/relay.s.txt", 2048)); - } - if (value == "2") { - writeFile("firmware.c.txt", readFile("configs/relay_t.c.txt", 2048)); - writeFile("firmware.s.txt", readFile("configs/relay_t.s.txt", 2048)); - } - if (value == "3") { - writeFile("firmware.c.txt", readFile("configs/relay_c.c.txt", 2048)); - writeFile("firmware.s.txt", readFile("configs/relay_c.s.txt", 2048)); - } - if (value == "4") { - writeFile("firmware.c.txt", readFile("configs/relay_s.c.txt", 2048)); - writeFile("firmware.s.txt", readFile("configs/relay_s.s.txt", 2048)); - } - if (value == "5") { - writeFile("firmware.c.txt", readFile("configs/relay_sw.c.txt", 2048)); - writeFile("firmware.s.txt", readFile("configs/relay_sw.s.txt", 2048)); - } - if (value == "6") { - writeFile("firmware.c.txt", readFile("configs/relay_br.c.txt", 2048)); - writeFile("firmware.s.txt", readFile("configs/relay_br.s.txt", 2048)); - } - if (value == "7") { - writeFile("firmware.c.txt", readFile("configs/relay_sr.c.txt", 2048)); - writeFile("firmware.s.txt", readFile("configs/relay_sr.s.txt", 2048)); - } - if (value == "8") { - writeFile("firmware.c.txt", readFile("configs/pwm.c.txt", 2048)); - writeFile("firmware.s.txt", readFile("configs/pwm.s.txt", 2048)); - } - if (value == "9") { - writeFile("firmware.c.txt", readFile("configs/dht11.c.txt", 2048)); - writeFile("firmware.s.txt", readFile("configs/dht11.s.txt", 2048)); - } - if (value == "10") { - writeFile("firmware.c.txt", readFile("configs/dht22.c.txt", 2048)); - writeFile("firmware.s.txt", readFile("configs/dht22.s.txt", 2048)); - } - if (value == "11") { - writeFile("firmware.c.txt", readFile("configs/analog.c.txt", 2048)); - writeFile("firmware.s.txt", readFile("configs/analog.s.txt", 2048)); - } - if (value == "12") { - writeFile("firmware.c.txt", readFile("configs/dallas.c.txt", 2048)); - writeFile("firmware.s.txt", readFile("configs/dallas.s.txt", 2048)); - } - if (value == "13") { - writeFile("firmware.c.txt", readFile("configs/termostat.c.txt", 2048)); - writeFile("firmware.s.txt", readFile("configs/termostat.s.txt", 2048)); - } - if (value == "14") { - writeFile("firmware.c.txt", readFile("configs/level.c.txt", 2048)); - writeFile("firmware.s.txt", readFile("configs/level.s.txt", 2048)); - } - if (value == "15") { - writeFile("firmware.c.txt", readFile("configs/moution_r.c.txt", 2048)); - writeFile("firmware.s.txt", readFile("configs/moution_r.s.txt", 2048)); - } - if (value == "16") { - writeFile("firmware.c.txt", readFile("configs/moution_s.c.txt", 2048)); - writeFile("firmware.s.txt", readFile("configs/moution_s.s.txt", 2048)); - } - if (value == "17") { - writeFile("firmware.c.txt", readFile("configs/stepper.c.txt", 2048)); - writeFile("firmware.s.txt", readFile("configs/stepper.s.txt", 2048)); - } - if (value == "18") { - writeFile("firmware.c.txt", readFile("configs/servo.c.txt", 2048)); - writeFile("firmware.s.txt", readFile("configs/servo.s.txt", 2048)); - } - if (value == "19") { - writeFile("firmware.c.txt", readFile("configs/firmware.c.txt", 2048)); - writeFile("firmware.s.txt", readFile("configs/firmware.s.txt", 2048)); - } - Device_init(); - Scenario_init(); - request->redirect("/?configuration"); - }); -} - void up_time() { uint32_t ss = millis() / 1000; uint32_t mm = ss / 60; diff --git a/Scenario.ino b/Scenario.ino index 52828b79..8422b0fa 100644 --- a/Scenario.ino +++ b/Scenario.ino @@ -1,6 +1,6 @@ void handleScenario() { - if (jsonReadStr(configSetup, "scenario") == "1") { + if (jsonReadStr(configSetup, "scen") == "1") { if ((jsonReadStr(optionJson, "scenario_status") != "")) { int i = 0; String str = scenario; //читаем переменную с сценариями (то что из файла на странице) @@ -73,7 +73,7 @@ void handleScenario() { void eventGen (String event_name, String number) { //событие выглядит как имя плюс set плюс номер: button+Set+1 - if (jsonReadStr(configSetup, "scenario") == "1") { + if (jsonReadStr(configSetup, "scen") == "1") { String tmp = jsonReadStr(optionJson, "scenario_status") ; //генерирование события //Serial.println(event_name); jsonWriteStr(optionJson, "scenario_status", tmp + event_name + number + ","); diff --git a/Time.ino b/Time.ino index 365d40e4..b1fc9b66 100644 --- a/Time.ino +++ b/Time.ino @@ -1,16 +1,4 @@ void Time_Init() { - server.on("/time", HTTP_GET, [](AsyncWebServerRequest * request) { - if (request->hasArg("timezone")) { - jsonWriteStr(configSetup, "timezone", request->getParam("timezone")->value()); - } - if (request->hasArg("ntp")) { - jsonWriteStr(configSetup, "ntp", request->getParam("ntp")->value()); - } - saveConfig(); - reconfigTime(); - request->send(200, "text/text", "OK"); // отправляем ответ о выполнении - }); - ts.add(TIME_SYNC, 30000, [&](void*) { time_check(); }, nullptr, true); @@ -24,11 +12,11 @@ void time_check() { } void reconfigTime() { - if (WiFi.status() == WL_CONNECTED) { + if (WiFi.status() == WL_CONNECTED) { String ntp = jsonReadStr(configSetup, "ntp"); - configTime(0, 0, ntp.c_str()); + configTime(0, 0, ntp.c_str()); int i = 0; - Serial.println("[i] Awaiting for time "); + Serial.println("[i] Awaiting for time "); #ifdef ESP32 struct tm timeinfo; while (!getLocalTime(&timeinfo) && i <= 4) { @@ -41,7 +29,7 @@ void reconfigTime() { //while (!time(nullptr) && i < 4) { // Serial.print("."); // i++; - delay(2000); + delay(2000); //} #endif if (GetTimeUnix() != "failed") { diff --git a/Upgrade.ino b/Upgrade.ino index f576bfe6..6154acfe 100644 --- a/Upgrade.ino +++ b/Upgrade.ino @@ -1,5 +1,4 @@ void initUpgrade() { - #ifdef ESP8266 if (WiFi.status() == WL_CONNECTED) last_version = getURL("http://91.204.228.124:1100/update/esp8266/version.txt"); #endif @@ -9,47 +8,6 @@ void initUpgrade() { jsonWriteStr(configSetup, "last_version", last_version); Serial.print("[i] Last firmware version: "); Serial.println(last_version); - - server.on("/check", HTTP_GET, [](AsyncWebServerRequest * request) { - upgrade_url = true; - Serial.print("[i] Last firmware version: "); - Serial.println(last_version); - String tmp = "{}"; - if (WiFi.status() == WL_CONNECTED) { - if (mb_4_of_memory) { - if (last_version != "") { - if (last_version != "error") { - if (last_version == firmware_version) { - jsonWriteStr(tmp, "title", "Последняя версия прошивки уже установлена."); - jsonWriteStr(tmp, "class", "pop-up"); - } else { - jsonWriteStr(tmp, "title", "Имеется новая версия прошивкиИдет обновление прошивки, после обновления страница перезагрузится автоматически...')\">Установить"); - jsonWriteStr(tmp, "class", "pop-up"); - } - } else { - jsonWriteStr(tmp, "title", "Ошибка... Cервер не найден. Попробуйте позже..."); - jsonWriteStr(tmp, "class", "pop-up"); - } - } else { - jsonWriteStr(tmp, "title", "Нажмите на кнопку \"обновить прошивку\" повторно..."); - jsonWriteStr(tmp, "class", "pop-up"); - } - } else { - jsonWriteStr(tmp, "title", "Обновление по воздуху не поддерживается, модуль имеет меньше 4 мб памяти..."); - jsonWriteStr(tmp, "class", "pop-up"); - } - } else { - jsonWriteStr(tmp, "title", "Устройство не подключен к роутеру..."); - jsonWriteStr(tmp, "class", "pop-up"); - } - request->send(200, "text/text", tmp); - }); - - server.on("/upgrade", HTTP_GET, [](AsyncWebServerRequest * request) { - upgrade = true; - String tmp = "{}"; - request->send(200, "text/text", "ok"); - }); } void do_upgrade_url() { diff --git a/Web.ino b/Web.ino new file mode 100644 index 00000000..fc4c9b11 --- /dev/null +++ b/Web.ino @@ -0,0 +1,315 @@ +void web_init() { + /****************************************************************************** + **********************************INITIALIZATION******************************* + ******************************************************************************/ + server.on("/set", HTTP_GET, [](AsyncWebServerRequest * request) { + String value; + //============================device settings===================================== + if (request->hasArg("devinit")) { + Device_init(); + request->send(200, "text/text", "OK"); + } + + if (request->hasArg("scen")) { + value = request->getParam("scen")->value(); + if (value == "0") { + jsonWriteStr(configSetup, "scen", value); + saveConfig(); + Scenario_init(); + } + if (value == "1") { + jsonWriteStr(configSetup, "scen", value); + saveConfig(); + Scenario_init(); + } + request->send(200, "text/text", "OK"); + } + + if (request->hasArg("sceninit")) { + Scenario_init(); + request->send(200, "text/text", "OK"); + } + + if (request->hasArg("cleanlog")) { +#ifdef logging_enable + clean_log_date(); +#endif + } + //==============================udp settings============================================= + if (request->hasArg("udponoff")) { + value = request->getParam("udponoff")->value(); + if (value == "0") { + jsonWriteStr(configSetup, "udponoff", value); + saveConfig(); + Scenario_init(); + } + if (value == "1") { + jsonWriteStr(configSetup, "udponoff", value); + saveConfig(); + Scenario_init(); + } + request->send(200, "text/text", "OK"); + } + + if (request->hasArg("updatelist")) { + SPIFFS.remove("/dev.csv"); + addFile("dev.csv", "device id;device name;ip address"); + request->redirect("/?set.udp"); + } + + if (request->hasArg("updatepage")) { + request->redirect("/?set.udp"); + } + + + + + /*if (value == "5") { + i2c_scanning = true; + request->redirect("/?utilities"); + }*/ + + /*if (value == "2") { + mqtt_send_settings_to_udp = true; + request->send(200, "text/text", "ok"); + }*/ + }); + /****************************************************************************** + **********************************TIME***************************************** + ******************************************************************************/ + server.on("/time", HTTP_GET, [](AsyncWebServerRequest * request) { + if (request->hasArg("timezone")) { + jsonWriteStr(configSetup, "timezone", request->getParam("timezone")->value()); + } + if (request->hasArg("ntp")) { + jsonWriteStr(configSetup, "ntp", request->getParam("ntp")->value()); + } + saveConfig(); + reconfigTime(); + request->send(200, "text/text", "OK"); // отправляем ответ о выполнении + }); + /****************************************************************************** + **********************************UPDATE*************************************** + ******************************************************************************/ + server.on("/check", HTTP_GET, [](AsyncWebServerRequest * request) { + upgrade_url = true; + Serial.print("[i] Last firmware version: "); + Serial.println(last_version); + String tmp = "{}"; + if (WiFi.status() == WL_CONNECTED) { + if (mb_4_of_memory) { + if (last_version != "") { + if (last_version != "error") { + if (last_version == firmware_version) { + jsonWriteStr(tmp, "title", "Последняя версия прошивки уже установлена."); + jsonWriteStr(tmp, "class", "pop-up"); + } else { + jsonWriteStr(tmp, "title", "Имеется новая версия прошивкиИдет обновление прошивки, после обновления страница перезагрузится автоматически...')\">Установить"); + jsonWriteStr(tmp, "class", "pop-up"); + } + } else { + jsonWriteStr(tmp, "title", "Ошибка... Cервер не найден. Попробуйте позже..."); + jsonWriteStr(tmp, "class", "pop-up"); + } + } else { + jsonWriteStr(tmp, "title", "Нажмите на кнопку \"обновить прошивку\" повторно..."); + jsonWriteStr(tmp, "class", "pop-up"); + } + } else { + jsonWriteStr(tmp, "title", "Обновление по воздуху не поддерживается, модуль имеет меньше 4 мб памяти..."); + jsonWriteStr(tmp, "class", "pop-up"); + } + } else { + jsonWriteStr(tmp, "title", "Устройство не подключен к роутеру..."); + jsonWriteStr(tmp, "class", "pop-up"); + } + request->send(200, "text/text", tmp); + }); + + server.on("/upgrade", HTTP_GET, [](AsyncWebServerRequest * request) { + upgrade = true; + String tmp = "{}"; + request->send(200, "text/text", "ok"); + }); + /****************************************************************************** + **********************************WIFI***************************************** + ******************************************************************************/ + server.on("/ssid", HTTP_GET, [](AsyncWebServerRequest * request) { + if (request->hasArg("ssid")) { + jsonWriteStr(configSetup, "ssid", request->getParam("ssid")->value()); + } + if (request->hasArg("password")) { + jsonWriteStr(configSetup, "password", request->getParam("password")->value()); + } + saveConfig(); + request->send(200, "text/text", "OK"); + }); + server.on("/ssidap", HTTP_GET, [](AsyncWebServerRequest * request) { + if (request->hasArg("ssidAP")) { + jsonWriteStr(configSetup, "ssidAP", request->getParam("ssidAP")->value()); + } + if (request->hasArg("passwordAP")) { + jsonWriteStr(configSetup, "passwordAP", request->getParam("passwordAP")->value()); + } + saveConfig(); + request->send(200, "text/text", "OK"); + }); + server.on("/web", HTTP_GET, [](AsyncWebServerRequest * request) { + if (request->hasArg("web_login")) { + jsonWriteStr(configSetup, "web_login", request->getParam("web_login")->value()); + } + if (request->hasArg("web_pass")) { + jsonWriteStr(configSetup, "web_pass", request->getParam("web_pass")->value()); + } + saveConfig(); + //Web_server_init(); + request->send(200, "text/text", "OK"); + }); + server.on("/restart", HTTP_GET, [](AsyncWebServerRequest * request) { + if (request->hasArg("device")) { + if (request->getParam("device")->value() == "ok") ESP.restart(); + } + request->send(200, "text/text", "OK"); + }); + /****************************************************************************** + **********************************MQTT**************************************** + ******************************************************************************/ + server.on("/mqttSave", HTTP_GET, [](AsyncWebServerRequest * request) { + if (request->hasArg("mqttServer")) { + jsonWriteStr(configSetup, "mqttServer", request->getParam("mqttServer")->value()); + } + if (request->hasArg("mqttPort")) { + int port = (request->getParam("mqttPort")->value()).toInt(); + jsonWriteInt(configSetup, "mqttPort", port); + } + if (request->hasArg("mqttPrefix")) { + jsonWriteStr(configSetup, "mqttPrefix", request->getParam("mqttPrefix")->value()); + } + if (request->hasArg("mqttUser")) { + jsonWriteStr(configSetup, "mqttUser", request->getParam("mqttUser")->value()); + } + if (request->hasArg("mqttPass")) { + jsonWriteStr(configSetup, "mqttPass", request->getParam("mqttPass")->value()); + } + saveConfig(); + mqtt_connection = true; + request->send(200, "text/text", "ok"); + }); + server.on("/mqttCheck", HTTP_GET, [](AsyncWebServerRequest * request) { + String tmp = "{}"; + jsonWriteStr(tmp, "title", "" + stateMQTT()); + jsonWriteStr(tmp, "class", "pop-up"); + request->send(200, "text/text", tmp); + }); + /****************************************************************************** + **********************************PUSH***************************************** + ******************************************************************************/ +#ifdef push_enable + server.on("/pushingboxDate", HTTP_GET, [](AsyncWebServerRequest * request) { + if (request->hasArg("pushingbox_id")) { + jsonWriteStr(configSetup, "pushingbox_id", request->getParam("pushingbox_id")->value()); + } + saveConfig(); + request->send(200, "text/text", "ok"); + }); +#endif + /****************************************************************************** + **********************************PRESETS************************************** + ******************************************************************************/ + server.on("/preset", HTTP_GET, [](AsyncWebServerRequest * request) { + String value; + if (request->hasArg("arg")) { + value = request->getParam("arg")->value(); + } + if (value == "1") { + writeFile("firmware.c.txt", readFile("configs/relay.c.txt", 2048)); + writeFile("firmware.s.txt", readFile("configs/relay.s.txt", 2048)); + } + if (value == "2") { + writeFile("firmware.c.txt", readFile("configs/relay_t.c.txt", 2048)); + writeFile("firmware.s.txt", readFile("configs/relay_t.s.txt", 2048)); + } + if (value == "3") { + writeFile("firmware.c.txt", readFile("configs/relay_c.c.txt", 2048)); + writeFile("firmware.s.txt", readFile("configs/relay_c.s.txt", 2048)); + } + if (value == "4") { + writeFile("firmware.c.txt", readFile("configs/relay_s.c.txt", 2048)); + writeFile("firmware.s.txt", readFile("configs/relay_s.s.txt", 2048)); + } + if (value == "5") { + writeFile("firmware.c.txt", readFile("configs/relay_sw.c.txt", 2048)); + writeFile("firmware.s.txt", readFile("configs/relay_sw.s.txt", 2048)); + } + if (value == "6") { + writeFile("firmware.c.txt", readFile("configs/relay_br.c.txt", 2048)); + writeFile("firmware.s.txt", readFile("configs/relay_br.s.txt", 2048)); + } + if (value == "7") { + writeFile("firmware.c.txt", readFile("configs/relay_sr.c.txt", 2048)); + writeFile("firmware.s.txt", readFile("configs/relay_sr.s.txt", 2048)); + } + if (value == "8") { + writeFile("firmware.c.txt", readFile("configs/pwm.c.txt", 2048)); + writeFile("firmware.s.txt", readFile("configs/pwm.s.txt", 2048)); + } + if (value == "9") { + writeFile("firmware.c.txt", readFile("configs/dht11.c.txt", 2048)); + writeFile("firmware.s.txt", readFile("configs/dht11.s.txt", 2048)); + } + if (value == "10") { + writeFile("firmware.c.txt", readFile("configs/dht22.c.txt", 2048)); + writeFile("firmware.s.txt", readFile("configs/dht22.s.txt", 2048)); + } + if (value == "11") { + writeFile("firmware.c.txt", readFile("configs/analog.c.txt", 2048)); + writeFile("firmware.s.txt", readFile("configs/analog.s.txt", 2048)); + } + if (value == "12") { + writeFile("firmware.c.txt", readFile("configs/dallas.c.txt", 2048)); + writeFile("firmware.s.txt", readFile("configs/dallas.s.txt", 2048)); + } + if (value == "13") { + writeFile("firmware.c.txt", readFile("configs/termostat.c.txt", 2048)); + writeFile("firmware.s.txt", readFile("configs/termostat.s.txt", 2048)); + } + if (value == "14") { + writeFile("firmware.c.txt", readFile("configs/level.c.txt", 2048)); + writeFile("firmware.s.txt", readFile("configs/level.s.txt", 2048)); + } + if (value == "15") { + writeFile("firmware.c.txt", readFile("configs/moution_r.c.txt", 2048)); + writeFile("firmware.s.txt", readFile("configs/moution_r.s.txt", 2048)); + } + if (value == "16") { + writeFile("firmware.c.txt", readFile("configs/moution_s.c.txt", 2048)); + writeFile("firmware.s.txt", readFile("configs/moution_s.s.txt", 2048)); + } + if (value == "17") { + writeFile("firmware.c.txt", readFile("configs/stepper.c.txt", 2048)); + writeFile("firmware.s.txt", readFile("configs/stepper.s.txt", 2048)); + } + if (value == "18") { + writeFile("firmware.c.txt", readFile("configs/servo.c.txt", 2048)); + writeFile("firmware.s.txt", readFile("configs/servo.s.txt", 2048)); + } + if (value == "19") { + writeFile("firmware.c.txt", readFile("configs/firmware.c.txt", 2048)); + writeFile("firmware.s.txt", readFile("configs/firmware.s.txt", 2048)); + } + Device_init(); + Scenario_init(); + request->redirect("/?configuration"); + }); + /****************************************************************************** + **********************************UDP****************************************** + ******************************************************************************/ + server.on("/name", HTTP_GET, [](AsyncWebServerRequest * request) { + if (request->hasArg("arg")) { + jsonWriteStr(configSetup, "name", request->getParam("arg")->value()); + jsonWriteStr(configJson, "name", request->getParam("arg")->value()); + saveConfig(); + } + request->send(200, "text/text", "OK"); + }); +} diff --git a/WiFi.ino b/WiFi.ino index 501e5a8f..a4af35cd 100644 --- a/WiFi.ino +++ b/WiFi.ino @@ -1,54 +1,7 @@ -void WIFI_init() { - - // --------------------Получаем ssid password со страницы - server.on("/ssid", HTTP_GET, [](AsyncWebServerRequest * request) { - if (request->hasArg("ssid")) { - jsonWriteStr(configSetup, "ssid", request->getParam("ssid")->value()); - } - if (request->hasArg("password")) { - jsonWriteStr(configSetup, "password", request->getParam("password")->value()); - } - saveConfig(); // Функция сохранения данных во Flash - request->send(200, "text/text", "OK"); // отправляем ответ о выполнении - }); - // --------------------Получаем ssidAP passwordAP со страницы - server.on("/ssidap", HTTP_GET, [](AsyncWebServerRequest * request) { - if (request->hasArg("ssidAP")) { - jsonWriteStr(configSetup, "ssidAP", request->getParam("ssidAP")->value()); - } - if (request->hasArg("passwordAP")) { - jsonWriteStr(configSetup, "passwordAP", request->getParam("passwordAP")->value()); - } - saveConfig(); // Функция сохранения данных во Flash - request->send(200, "text/text", "OK"); // отправляем ответ о выполнении - }); - - // --------------------Получаем логин и пароль для web со страницы - server.on("/web", HTTP_GET, [](AsyncWebServerRequest * request) { - if (request->hasArg("web_login")) { - jsonWriteStr(configSetup, "web_login", request->getParam("web_login")->value()); - } - if (request->hasArg("web_pass")) { - jsonWriteStr(configSetup, "web_pass", request->getParam("web_pass")->value()); - } - saveConfig(); // Функция сохранения данных во Flash - //Web_server_init(); - request->send(200, "text/text", "OK"); // отправляем ответ о выполнении - }); - - server.on("/restart", HTTP_GET, [](AsyncWebServerRequest * request) { - if (request->hasArg("device")) { - if (request->getParam("device")->value() == "ok") ESP.restart(); - } - request->send(200, "text/text", "OK"); // отправляем ответ о выполнении - }); - ROUTER_Connecting(); -} - void ROUTER_Connecting() { - - led_blink("slow"); + led_blink("slow"); + WiFi.mode(WIFI_STA); byte tries = 20; @@ -94,11 +47,9 @@ void ROUTER_Connecting() { Serial.print(WiFi.localIP()); Serial.println(""); jsonWriteStr(configJson, "ip", WiFi.localIP().toString()); - led_blink("off"); - //add_dev_in_list("dev.txt", chipID, WiFi.localIP().toString()); - + MQTT_init(); } } @@ -117,17 +68,16 @@ bool StartAPMode() { Serial.println(myIP); jsonWriteStr(configJson, "ip", myIP.toString()); - if (jsonReadInt(optionJson, "pass_status") != 1) { + //if (jsonReadInt(optionJson, "pass_status") != 1) { ts.add(ROUTER_SEARCHING, 10 * 1000, [&](void*) { Serial.println("->try find router"); if (RouterFind(jsonReadStr(configSetup, "ssid"))) { ts.remove(ROUTER_SEARCHING); WiFi.scanDelete(); ROUTER_Connecting(); - MQTT_init(); } }, nullptr, true); - } + //} return true; } diff --git a/data/config.json b/data/config.json index 180bdcd3..c78bdfd1 100644 --- a/data/config.json +++ b/data/config.json @@ -3,8 +3,8 @@ "chipID": "", "ssidAP": "WiFi2", "passwordAP": "", - "ssid": "rise", - "password": "hostel3333", + "ssid": "VOLODYA", + "password": "BELCHENKO", "timezone": 2, "ntp": "pool.ntp.org", "mqttServer": "91.204.228.124", @@ -12,7 +12,7 @@ "mqttPrefix": "/rise", "mqttUser": "test", "mqttPass": "test", - "scenario": "1", + "scen": "1", "pushingbox_id": "v7C133E426B0C69E", "web_login": "admin", "web_pass": "admin", diff --git a/data/index.json b/data/index.json index 26adcc1a..2f430b87 100644 --- a/data/index.json +++ b/data/index.json @@ -41,8 +41,8 @@ { "type": "link", "title": "Конфигурация устройства", - "action": "/?configuration", - "class": "btn btn-block btn-primary" + "action": "/?set.device", + "class": "btn btn-block btn-default" }, { "type": "hr" @@ -50,32 +50,32 @@ { "type": "link", "title": "Список других устройств в сети", - "action": "/?dev", - "class": "btn btn-block btn-success" + "action": "/?set.udp", + "class": "btn btn-block btn-default" }, { "type": "link", "title": "Конфигурация WIFI", - "action": "/?setup", - "class": "btn btn-block btn-success" + "action": "/?set.wifi", + "class": "btn btn-block btn-default" }, { "type": "link", "title": "Конфигурация MQTT", - "action": "/?mqtt", - "class": "btn btn-block btn-success" + "action": "/?set.mqtt", + "class": "btn btn-block btn-default" }, { "type": "link", "title": "Конфигурация push", - "action": "/?pushingbox", - "class": "btn btn-block btn-success" + "action": "/?set.push", + "class": "btn btn-block btn-default" }, { "type": "link", "title": "Утилиты", - "action": "/?utilities", - "class": "btn btn-block btn-success" + "action": "/?set.utilities", + "class": "btn btn-block btn-default" }, { "type": "h3", @@ -91,7 +91,7 @@ "title": "Обновить прошивку", "action": "/check", "response": "[[my-block]]", - "class": "btn btn-block btn-danger" + "class": "btn btn-block btn-default" }, { "type": "hr" @@ -100,13 +100,13 @@ "type": "link", "title": "Скачать приложение IoT Manager для android", "action": "https://play.google.com/store/apps/details?id=ru.esp8266.iotmanager", - "class": "btn btn-block btn-warning" + "class": "btn btn-block btn-default" }, { "type": "link", "title": "Скачать приложение IoT Manager для iphone", "action": "https://apps.apple.com/ru/app/iot-manager/id1155934877", - "class": "btn btn-block btn-warning" + "class": "btn btn-block btn-default" } ] } diff --git a/data/lang/lang.ru.json b/data/lang/lang.ru.json new file mode 100644 index 00000000..881f9556 --- /dev/null +++ b/data/lang/lang.ru.json @@ -0,0 +1,6 @@ +{ + "SetDevConf": "Конфигурация устройства", + "SetDevPreset": "Выберите из выпадающего списка подходящий пресет кофигураций", + "SetUDPList": "Список других устройств в сети:", + "SetUDPWarn1": "После нажатия на кнопку 'Переформировать список устройств' ждите примерно минуту, а затем обновите страницу и список появится вновь" +} \ No newline at end of file diff --git a/data/configuration.json b/data/set.device.json similarity index 85% rename from data/configuration.json rename to data/set.device.json index fb4381dd..99b9cee8 100644 --- a/data/configuration.json +++ b/data/set.device.json @@ -2,7 +2,8 @@ "configs": [ "/config.live.json", "/config.setup.json", - "/config.option.json" + "/config.option.json", + "/lang/lang.ru.json" ], "class": "col-sm-offset-1 col-sm-10", "content": [ @@ -33,10 +34,10 @@ { "type": "dropdown", "name": "help-url", - "class": "btn btn-warning btn-lg", + "class": "btn btn-default", "style": "display:inline", "title": { - "#": "Выбирите то, во что Вы хотите превратить это устройство ", + "#": "{{SetDevPreset}}", "/preset?arg=1": "1.Вкл. выкл. локального реле", "/preset?arg=2": "2.Вкл. выкл. локального реле в определенное время", "/preset?arg=3": "3.Вкл. выкл. локального реле на определенный период времени", @@ -60,21 +61,21 @@ }, { "type": "h2", - "title": "Конфигурация устройства" + "title": "{{SetDevConf}}" }, { "type": "file", "state": "firmware.c.txt", "style": "width:100%;height:400px", "title": "Сохранить", - "action": "/init?arg=2", - "class": "btn btn-block btn-success" + "action": "/set?devinit", + "class": "btn btn-block btn-default" }, { "type": "link", - "title": "Подробная инструкция", + "title": "Инструкция", "action": "https://github.com/DmitryBorisenko33/esp32-esp8266_iot-manager_modules_firmware/wiki/Instruction", - "class": "btn btn-block btn-primary" + "class": "btn btn-block btn-default" }, { "type": "h2", @@ -82,21 +83,17 @@ }, { "type": "checkbox", - "name": "scenario", + "name": "scen", "title": "Включить сценарии", - "action": "/init?arg=[[scenario]]", - "state": "{{scenario}}" - }, - { - "type": "h6", - "title": "" + "action": "/set?scen=[[scen]]", + "state": "{{scen}}" }, { "type": "file", "state": "firmware.s.txt", "style": "width:100%;height:400px", "title": "Сохранить", - "action": "/init?arg=4", + "action": "/set?sceninit", "class": "btn btn-block btn-success" }, { @@ -105,7 +102,7 @@ { "type": "link", "title": "Очистить логи сенсоров", - "action": "/init?arg=3", + "action": "/set?cleanlog", "class": "btn btn-block btn-success" }, { diff --git a/data/mqtt.json b/data/set.mqtt.json similarity index 100% rename from data/mqtt.json rename to data/set.mqtt.json diff --git a/data/pushingbox.json b/data/set.push.json similarity index 100% rename from data/pushingbox.json rename to data/set.push.json diff --git a/data/dev.json b/data/set.udp.json similarity index 69% rename from data/dev.json rename to data/set.udp.json index 9b474644..d65056dd 100644 --- a/data/dev.json +++ b/data/set.udp.json @@ -1,7 +1,8 @@ { "configs": [ "/config.live.json", - "/config.setup.json" + "/config.setup.json", + "/lang/lang.ru.json" ], "title": "Главная", "class": "col-sm-offset-1 col-sm-10 col-md-offset-2 col-md-8 col-lg-offset-3 col-lg-6", @@ -13,7 +14,7 @@ }, { "type": "h3", - "title": "Список других устройств в сети:" + "title": "{{SetUDPList}}" }, { "type": "hr" @@ -35,22 +36,22 @@ { "type": "link", "title": "Переформировать список устройств", - "action": "udp?arg=3", - "class": "btn btn-block btn-success" + "action": "set?updatelist", + "class": "btn btn-block btn-default" }, { "type": "link", "title": "Обновить страницу", - "action": "udp?arg=4", - "class": "btn btn-block btn-success" + "action": "set?updatepage", + "class": "btn btn-block btn-default" }, { "type": "hr" }, { "type": "text", - "class": "alert alert-warning", - "title": "После нажатия на кнопку 'Переформировать список устройств' ждите примерно минуту, а затем обновите страницу и список появится вновь" + "title": "

{{SetUDPWarn1}}

", + "style": "width:100%;float:left;" }, { "type": "h3", @@ -67,7 +68,7 @@ "type": "button", "title": "Сохранить", "action": "name?arg=[[dev_name]]", - "class": "btn btn-block btn-success" + "class": "btn btn-block btn-default" }, { "type": "hr" @@ -76,7 +77,7 @@ "type": "checkbox", "name": "udponoff", "title": "Включить обмен данными между устройствами", - "action": "/udp?arg=[[udponoff]]", + "action": "/set?udponoff=[[udponoff]]", "state": "{{udponoff}}" }, { @@ -86,7 +87,7 @@ "type": "link", "title": "Главная", "action": "/", - "class": "btn btn-block btn-danger" + "class": "btn btn-block btn-default" } ] } \ No newline at end of file diff --git a/data/utilities.json b/data/set.utilities.json similarity index 100% rename from data/utilities.json rename to data/set.utilities.json diff --git a/data/setup.json b/data/set.wifi.json similarity index 100% rename from data/setup.json rename to data/set.wifi.json diff --git a/esp32-esp8266_iot-manager_modules_firmware.ino b/esp32-esp8266_iot-manager_modules_firmware.ino index 005f0a38..78377923 100644 --- a/esp32-esp8266_iot-manager_modules_firmware.ino +++ b/esp32-esp8266_iot-manager_modules_firmware.ino @@ -14,8 +14,8 @@ void setup() { All_init(); Serial.println("[V] All_init"); //-------------------------------------------------------------- - WIFI_init(); - Serial.println("[V] WIFI_init"); + ROUTER_Connecting(); + Serial.println("[V] ROUTER_Connecting"); //-------------------------------------------------------------- statistics_init(); Serial.println("[V] statistics_init"); @@ -26,17 +26,12 @@ void setup() { Web_server_init(); Serial.println("[V] Web_server_init"); //-------------------------------------------------------------- - MQTT_init(); - Serial.println("[V] MQTT_init"); + //web_init(); + Serial.println("[V] web_init"); //-------------------------------------------------------------- Time_Init(); Serial.println("[V] Time_Init"); //-------------------------------------------------------------- -#ifdef push_enable - Push_init(); - Serial.println("[V] Push_init"); -#endif - //-------------------------------------------------------------- #ifdef UDP_enable UDP_init(); Serial.println("[V] UDP_init"); diff --git a/mqtt.ino b/mqtt.ino index 4a877914..9d38e247 100644 --- a/mqtt.ino +++ b/mqtt.ino @@ -1,6 +1,5 @@ //===============================================ИНИЦИАЛИЗАЦИЯ================================================ void MQTT_init() { - ts.add(WIFI_MQTT_CONNECTION_CHECK, wifi_mqtt_reconnecting, [&](void*) { up_time(); if (WiFi.status() == WL_CONNECTED) { @@ -19,39 +18,6 @@ void MQTT_init() { StartAPMode(); } }, nullptr, true); - - - server.on("/mqttSave", HTTP_GET, [](AsyncWebServerRequest * request) { - if (request->hasArg("mqttServer")) { - jsonWriteStr(configSetup, "mqttServer", request->getParam("mqttServer")->value()); - } - if (request->hasArg("mqttPort")) { - int port = (request->getParam("mqttPort")->value()).toInt(); - jsonWriteInt(configSetup, "mqttPort", port); - } - if (request->hasArg("mqttPrefix")) { - jsonWriteStr(configSetup, "mqttPrefix", request->getParam("mqttPrefix")->value()); - } - if (request->hasArg("mqttUser")) { - jsonWriteStr(configSetup, "mqttUser", request->getParam("mqttUser")->value()); - } - if (request->hasArg("mqttPass")) { - jsonWriteStr(configSetup, "mqttPass", request->getParam("mqttPass")->value()); - } - saveConfig(); - mqtt_connection = true; - - request->send(200, "text/text", "ok"); - }); - - server.on("/mqttCheck", HTTP_GET, [](AsyncWebServerRequest * request) { - String tmp = "{}"; - jsonWriteStr(tmp, "title", "" + stateMQTT()); - jsonWriteStr(tmp, "class", "pop-up"); - request->send(200, "text/text", tmp); - }); - - } @@ -284,7 +250,7 @@ String stateMQTT() { /*void scenario_devices_topiks_subscribe() { //SCENARIO ANALOG > 5 800324-1458415 rel1 0 - if (jsonReadStr(configSetup, "scenario") == "1") { + if (jsonReadStr(configSetup, "scen") == "1") { //String all_text = readFile("firmware.s.txt", 1024) + "\r\n"; String all_text = scenario + "\r\n"; all_text.replace("\r\n", "\n"); @@ -303,7 +269,7 @@ String stateMQTT() { */ /*void scenario_devices_test_msg_send() { - if (jsonReadStr(configSetup, "scenario") == "1") { + if (jsonReadStr(configSetup, "scen") == "1") { String all_text = scenario + "\r\n"; all_text.replace("\r\n", "\n"); diff --git a/push_pushingbox.ino b/push_pushingbox.ino index 6d5ddcb3..169b6c33 100644 --- a/push_pushingbox.ino +++ b/push_pushingbox.ino @@ -1,17 +1,4 @@ #ifdef push_enable -void Push_init() { - server.on("/pushingboxDate", HTTP_GET, [](AsyncWebServerRequest * request) { - - if (request->hasArg("pushingbox_id")) { - jsonWriteStr(configSetup, "pushingbox_id", request->getParam("pushingbox_id")->value()); - } - - saveConfig(); - - request->send(200, "text/text", "ok"); // отправляем ответ о выполнении - }); -} - void pushControl() { String title = sCmd.next(); diff --git a/udp.ino b/udp.ino index 7b5d6928..94c99d23 100644 --- a/udp.ino +++ b/udp.ino @@ -1,40 +1,6 @@ #ifdef UDP_enable void UDP_init() { - server.on("/udp", HTTP_GET, [](AsyncWebServerRequest * request) { - String value; - if (request->hasArg("arg")) { - value = request->getParam("arg")->value(); - } - if (value == "0") { - jsonWriteStr(configSetup, "udponoff", value); - request->send(200, "text/text", "ok"); - } - if (value == "1") { - jsonWriteStr(configSetup, "udponoff", value); - request->send(200, "text/text", "ok"); - } - if (value == "2") { - mqtt_send_settings_to_udp = true; - request->send(200, "text/text", "ok"); - } - if (value == "3") { - SPIFFS.remove("/dev.csv"); - addFile("dev.csv", "device id;device name;ip address"); - request->redirect("/?dev"); - } - if (value == "4") { - request->redirect("/?dev"); - } - }); - server.on("/name", HTTP_GET, [](AsyncWebServerRequest * request) { - if (request->hasArg("arg")) { - jsonWriteStr(configSetup, "name", request->getParam("arg")->value()); - jsonWriteStr(configJson, "name", request->getParam("arg")->value()); - saveConfig(); - } - request->send(200, "text/text", "OK"); - }); - + SPIFFS.remove("/dev.csv"); addFile("dev.csv", "device id;device name;ip address"); From e79be004b94e8f046bcec44f204534de0aab0cea Mon Sep 17 00:00:00 2001 From: Dmitry Borisenko <49808844+DmitryBorisenko33@users.noreply.github.com> Date: Thu, 4 Jun 2020 01:08:08 +0200 Subject: [PATCH 4/6] some changes --- data/config.json | 4 +- data/css/build.css.gz | Bin 15607 -> 15178 bytes data/index.htm.gz | Bin 1976 -> 1444 bytes data/index.json | 2 +- data/js/build.chart.js.gz | Bin 12758 -> 12758 bytes data/js/function.js.gz | Bin 19860 -> 17521 bytes data/lang/lang.ru.json | 18 +++- data/set.device.json | 3 +- data/set.udp.json | 21 +++-- ...2-esp8266_iot-manager_modules_firmware.ino | 2 +- main.ino | 79 ++++++++++++++++++ sync.ffs_db | Bin 182 -> 484 bytes 12 files changed, 112 insertions(+), 17 deletions(-) diff --git a/data/config.json b/data/config.json index c78bdfd1..daf66cda 100644 --- a/data/config.json +++ b/data/config.json @@ -3,8 +3,8 @@ "chipID": "", "ssidAP": "WiFi2", "passwordAP": "", - "ssid": "VOLODYA", - "password": "BELCHENKO", + "ssid": "rise", + "password": "hostel3333", "timezone": 2, "ntp": "pool.ntp.org", "mqttServer": "91.204.228.124", diff --git a/data/css/build.css.gz b/data/css/build.css.gz index fc58d776669a70f0f4a2a6f1a1615fd4d2dabff0..4bf6e06001ba59fb28f775adfad194fffa985f28 100644 GIT binary patch literal 15178 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 E0O(?Z-~a#s delta 15611 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 L*>aDB0S5XXFI1CK diff --git a/data/index.htm.gz b/data/index.htm.gz index 0e9eb07009732d5d4eceb41176264f1db8bef789..139f0040889174476a6bea5be844dae04d7ea073 100644 GIT binary patch literal 1444 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 diff --git a/data/index.json b/data/index.json index 2f430b87..bd0b9d88 100644 --- a/data/index.json +++ b/data/index.json @@ -9,7 +9,7 @@ { "type": "h5", "title": "{{name}}", - "class": "alert-warning" + "class": "alert-default" }, { "type": "h4", diff --git a/data/js/build.chart.js.gz b/data/js/build.chart.js.gz index bb94fbc947e0700e157bf190bdafdfc173049ad4..ac021668f0edf424e2fb22d4a8fe7ba6388bb3da 100644 GIT binary patch delta 17 ZcmcbXd@Y$nzMF&N!Sb~+8#&Gy0sutp2Ymnl delta 17 YcmcbXd@Y$nzMF&Nb@;xxjU49;0YiibO8@`> diff --git a/data/js/function.js.gz b/data/js/function.js.gz index 7e661ff6e29542314bda1c757bee5e25ed3e1fde..443fbca2101295756f788b4771ce9a9c1e023b20 100644 GIT binary patch literal 17521 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 M1Nbs_X6-rw00Qs^$p8QV literal 19860 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

{{SetUDPWarn2}}

" + }, { "type": "hr" }, { "type": "link", - "title": "Главная", + "title": "{{ButMainPage}}", "action": "/", "class": "btn btn-block btn-default" } diff --git a/esp32-esp8266_iot-manager_modules_firmware.ino b/esp32-esp8266_iot-manager_modules_firmware.ino index 78377923..675d6a53 100644 --- a/esp32-esp8266_iot-manager_modules_firmware.ino +++ b/esp32-esp8266_iot-manager_modules_firmware.ino @@ -26,7 +26,7 @@ void setup() { Web_server_init(); Serial.println("[V] Web_server_init"); //-------------------------------------------------------------- - //web_init(); + web_init(); Serial.println("[V] web_init"); //-------------------------------------------------------------- Time_Init(); diff --git a/main.ino b/main.ino index 01d90421..3f505ae8 100644 --- a/main.ino +++ b/main.ino @@ -89,6 +89,85 @@ uint16_t hexStringToUint16(String hex) { return tmp; } } + +String u16toStr(uint16_t u16Input) +{ + char tmp[16]; + sprintf(tmp, "0x%.4X", u16Input); + return tmp; +} + +String u8toStr(uint8_t u8Input) +{ + char tmp[8]; + sprintf(tmp, "0x%.2X", u8Input); + return tmp; +} + +String u64toStr(uint64_t input) +{ + String result = "";// + uint8_t base = 16; //hex 10 dec + + do { + char c = input % base; input /= base; + if (c < 10) { + c += '0'; + } else { + c += 'A' - 10; + } + result = c + result; + } while (input); + switch (result.length()) { + case 1: { + result = "000000000000000" + result; + } break; + case 2: { + result = "00000000000000" + result; + } break; + case 3: { + result = "0000000000000" + result; + } break; + case 4: { + result = "000000000000" + result; + } break; + case 5: { + result = "00000000000" + result; + } break; + case 6: { + result = "0000000000" + result; + } break; + case 7: { + result = "000000000" + result; + } break; + case 8: { + result = "00000000" + result; + } break; + case 9: { + result = "0000000" + result; + } break; + case 10: { + result = "000000" + result; + } break; + case 11: { + result = "00000" + result; + } break; + case 12: { + result = "0000" + result; + } break; + case 13: { + result = "000" + result; + } break; + case 14: { + result = "00" + result; + } break; + case 15: { + result = "0" + result; + } break; + } + return result; +} + //============================================================================================================== //=============================================CONFIG=========================================================== void saveConfig () { diff --git a/sync.ffs_db b/sync.ffs_db index d62dff32630ce887e71c80413c564154868496a9..9249e09a97ba77dd7366a574457de7beffc51178 100644 GIT binary patch delta 152 zcmdnS_=MTmttd6sEi)%IxH2!9ft!JWff2vus$8{Xl`vy7R7Lqj<18anAg2O|L7*ZoIi;aNbstFA`pwKm gznkS<=FXOMTM}zMnXwKi2(q+jqH!h5*0lYa07CgGYXATM delta 72 zcmaFDyp7S=ttd6sEi)%IxH2!9ft!JWff0xWfcTud3zKc^e21R*+n+QXl~rSG0SYn$ XamB>bSrg|9a5gk#lxw`mY2OY2^%54P From be5bd3ede491a7e77e9fe0a120bd93b97a06b44a Mon Sep 17 00:00:00 2001 From: Dmitry Borisenko <49808844+DmitryBorisenko33@users.noreply.github.com> Date: Thu, 11 Jun 2020 22:51:34 +0200 Subject: [PATCH 5/6] web interface changed --- Cmd.ino | 86 ++-- FS.ino | 20 +- Init.ino | 48 +- Logging.ino | 12 +- Scenario.ino | 32 +- Sensors.ino | 76 ++-- Time.ino | 8 +- Timers.ino | 18 +- Upgrade.ino | 8 +- Web.ino | 423 +++++++++--------- Web_server.ino | 13 +- WiFi.ino | 30 +- bus.ino | 4 +- data/config.json | 14 +- data/configs/{relay.c.txt => 1-relay.c.txt} | 0 data/configs/{analog.s.txt => 1-relay.s.txt} | 0 data/configs/{dht22.c.txt => 10-dht22.c.txt} | 0 data/configs/{dallas.s.txt => 10-dht22.s.txt} | 0 .../configs/{analog.c.txt => 11-analog.c.txt} | 0 data/configs/{dht11.s.txt => 11-analog.s.txt} | 0 .../configs/{dallas.c.txt => 12-dallas.c.txt} | 0 data/configs/{dht22.s.txt => 12-dallas.s.txt} | 0 .../{termostat.c.txt => 13-termostat.c.txt} | 0 .../{termostat.s.txt => 13-termostat.s.txt} | 0 data/configs/{level.c.txt => 14-level.c.txt} | 0 data/configs/{level.s.txt => 14-level.s.txt} | 0 .../{moution_r.c.txt => 15-moution.c.txt} | 0 .../{moution_r.s.txt => 15-moution.s.txt} | 0 .../{moution_s.c.txt => 16-moution.c.txt} | 0 .../{moution_s.s.txt => 16-moution.s.txt} | 0 .../{stepper.c.txt => 17-stepper.c.txt} | 0 .../{stepper.s.txt => 17-stepper.s.txt} | 0 data/configs/{servo.c.txt => 18-servo.c.txt} | 0 data/configs/{servo.s.txt => 18-servo.s.txt} | 0 data/configs/{relay_t.c.txt => 2-relay.c.txt} | 0 data/configs/{relay_t.s.txt => 2-relay.s.txt} | 0 data/configs/{relay_c.c.txt => 3-relay.c.txt} | 0 data/configs/{relay_c.s.txt => 3-relay.s.txt} | 0 data/configs/{relay_s.c.txt => 4-relay.c.txt} | 0 data/configs/{relay_s.s.txt => 4-relay.s.txt} | 0 .../configs/{relay_sw.c.txt => 5-relay.c.txt} | 0 .../configs/{relay_sw.s.txt => 5-relay.s.txt} | 0 .../configs/{relay_br.c.txt => 6-relay.c.txt} | 0 .../configs/{relay_br.s.txt => 6-relay.s.txt} | 0 .../configs/{relay_sr.c.txt => 7-relay.c.txt} | 0 .../configs/{relay_sr.s.txt => 7-relay.s.txt} | 0 data/configs/{pwm.c.txt => 8-pwm.c.txt} | 0 data/configs/{pwm.s.txt => 8-pwm.s.txt} | 0 data/configs/{dht11.c.txt => 9-dht11.c.txt} | 0 data/configs/{relay.s.txt => 9-dht11.s.txt} | 0 data/configs/relay_rm.c.txt | 3 - data/configs/relay_rm.s.txt | 3 - data/icon.jpeg | Bin 0 -> 15396 bytes data/index.json | 55 +-- data/lang/lang.ru.json | 22 +- data/set.device.json | 97 ++-- data/set.mqtt.json | 104 +++-- data/set.push.json | 95 ++-- data/set.udp.json | 30 +- data/set.utilities.json | 24 +- data/set.wifi.json | 125 +++--- ...2-esp8266_iot-manager_modules_firmware.ino | 2 +- main.ino | 6 +- mqtt.ino | 33 +- push_pushingbox.ino | 2 +- set.h | 15 +- udp.ino | 30 +- 67 files changed, 718 insertions(+), 720 deletions(-) rename data/configs/{relay.c.txt => 1-relay.c.txt} (100%) rename data/configs/{analog.s.txt => 1-relay.s.txt} (100%) rename data/configs/{dht22.c.txt => 10-dht22.c.txt} (100%) rename data/configs/{dallas.s.txt => 10-dht22.s.txt} (100%) rename data/configs/{analog.c.txt => 11-analog.c.txt} (100%) rename data/configs/{dht11.s.txt => 11-analog.s.txt} (100%) rename data/configs/{dallas.c.txt => 12-dallas.c.txt} (100%) rename data/configs/{dht22.s.txt => 12-dallas.s.txt} (100%) rename data/configs/{termostat.c.txt => 13-termostat.c.txt} (100%) rename data/configs/{termostat.s.txt => 13-termostat.s.txt} (100%) rename data/configs/{level.c.txt => 14-level.c.txt} (100%) rename data/configs/{level.s.txt => 14-level.s.txt} (100%) rename data/configs/{moution_r.c.txt => 15-moution.c.txt} (100%) rename data/configs/{moution_r.s.txt => 15-moution.s.txt} (100%) rename data/configs/{moution_s.c.txt => 16-moution.c.txt} (100%) rename data/configs/{moution_s.s.txt => 16-moution.s.txt} (100%) rename data/configs/{stepper.c.txt => 17-stepper.c.txt} (100%) rename data/configs/{stepper.s.txt => 17-stepper.s.txt} (100%) rename data/configs/{servo.c.txt => 18-servo.c.txt} (100%) rename data/configs/{servo.s.txt => 18-servo.s.txt} (100%) rename data/configs/{relay_t.c.txt => 2-relay.c.txt} (100%) rename data/configs/{relay_t.s.txt => 2-relay.s.txt} (100%) rename data/configs/{relay_c.c.txt => 3-relay.c.txt} (100%) rename data/configs/{relay_c.s.txt => 3-relay.s.txt} (100%) rename data/configs/{relay_s.c.txt => 4-relay.c.txt} (100%) rename data/configs/{relay_s.s.txt => 4-relay.s.txt} (100%) rename data/configs/{relay_sw.c.txt => 5-relay.c.txt} (100%) rename data/configs/{relay_sw.s.txt => 5-relay.s.txt} (100%) rename data/configs/{relay_br.c.txt => 6-relay.c.txt} (100%) rename data/configs/{relay_br.s.txt => 6-relay.s.txt} (100%) rename data/configs/{relay_sr.c.txt => 7-relay.c.txt} (100%) rename data/configs/{relay_sr.s.txt => 7-relay.s.txt} (100%) rename data/configs/{pwm.c.txt => 8-pwm.c.txt} (100%) rename data/configs/{pwm.s.txt => 8-pwm.s.txt} (100%) rename data/configs/{dht11.c.txt => 9-dht11.c.txt} (100%) rename data/configs/{relay.s.txt => 9-dht11.s.txt} (100%) delete mode 100644 data/configs/relay_rm.c.txt delete mode 100644 data/configs/relay_rm.s.txt create mode 100644 data/icon.jpeg diff --git a/Cmd.ino b/Cmd.ino index 9001fb42..41d8af9e 100644 --- a/Cmd.ino +++ b/Cmd.ino @@ -99,8 +99,8 @@ void button() { String start_state = sCmd.next(); String page_number = sCmd.next(); - jsonWriteStr(optionJson, "button_param" + button_number, button_param); - jsonWriteStr(configJson, "button" + button_number, start_state); + jsonWriteStr(configOptionJson, "button_param" + button_number, button_param); + jsonWriteStr(configLiveJson, "button" + button_number, start_state); if (isDigitStr (button_param)) { pinMode(button_param.toInt(), OUTPUT); @@ -108,7 +108,7 @@ void button() { } if (button_param == "scen") { - jsonWriteStr(configSetup, "scen", start_state); + jsonWriteStr(configSetupJson, "scen", start_state); Scenario_init(); saveConfig(); } @@ -133,14 +133,14 @@ void buttonSet() { String button_number = sCmd.next(); String button_state = sCmd.next(); - String button_param = jsonReadStr(optionJson, "button_param" + button_number); + String button_param = jsonReadStr(configOptionJson, "button_param" + button_number); if (button_param != "na" || button_param != "scen" || button_param.indexOf("line") != -1) { digitalWrite(button_param.toInt(), button_state.toInt()); } if (button_param == "scen") { - jsonWriteStr(configSetup, "scen", button_state); + jsonWriteStr(configSetupJson, "scen", button_state); Scenario_init(); saveConfig(); } @@ -161,20 +161,20 @@ void buttonSet() { eventGen ("button", button_number); - jsonWriteStr(configJson, "button" + button_number, button_state); + jsonWriteStr(configLiveJson, "button" + button_number, button_state); sendSTATUS("button" + button_number, button_state); } void buttonChange() { String button_number = sCmd.next(); - String current_state = jsonReadStr(configJson, "button" + button_number); + String current_state = jsonReadStr(configLiveJson, "button" + button_number); if (current_state == "1") { current_state = "0"; } else if (current_state == "0") { current_state = "1"; } order_loop += "buttonSet " + button_number + " " + current_state + ","; - jsonWriteStr(configJson, "button" + button_number, current_state); + jsonWriteStr(configLiveJson, "button" + button_number, current_state); sendSTATUS("button" + button_number, current_state); } @@ -205,11 +205,11 @@ void pwm() { uint8_t pwm_pin_int = pwm_pin.toInt(); - jsonWriteStr(optionJson, "pwm_pin" + pwm_number, pwm_pin); + jsonWriteStr(configOptionJson, "pwm_pin" + pwm_number, pwm_pin); pinMode(pwm_pin_int, INPUT); analogWrite(pwm_pin_int, start_state.toInt()); //analogWriteFreq(32000); - jsonWriteStr(configJson, "pwm" + pwm_number, start_state); + jsonWriteStr(configLiveJson, "pwm" + pwm_number, start_state); createWidget (widget_name, page_name, page_number, "widgets/widget.range.json", "pwm" + pwm_number); } @@ -220,12 +220,12 @@ void pwmSet() { String pwm_state = sCmd.next(); int pwm_state_int = pwm_state.toInt(); - int pin = jsonReadInt(optionJson, "pwm_pin" + pwm_number); + int pin = jsonReadInt(configOptionJson, "pwm_pin" + pwm_number); analogWrite(pin, pwm_state_int); eventGen ("pwm", pwm_number); - jsonWriteStr(configJson, "pwm" + pwm_number, pwm_state); + jsonWriteStr(configLiveJson, "pwm" + pwm_number, pwm_state); sendSTATUS("pwm" + pwm_number, pwm_state); } //================================================================================================================== @@ -251,13 +251,13 @@ void handleButton() { eventGen ("switch", String(switch_number)); - jsonWriteStr(configJson, "switch" + String(switch_number), "1"); + jsonWriteStr(configLiveJson, "switch" + String(switch_number), "1"); } if (buttons[switch_number].rose()) { eventGen ("switch", String(switch_number)); - jsonWriteStr(configJson, "switch" + String(switch_number), "0"); + jsonWriteStr(configLiveJson, "switch" + String(switch_number), "0"); } } switch_number++; @@ -275,13 +275,13 @@ void inputDigit() { page_name.replace("#", " "); String start_state = sCmd.next(); String page_number = sCmd.next(); - jsonWriteStr(configJson, "digit" + number, start_state); + jsonWriteStr(configLiveJson, "digit" + number, start_state); createWidget (widget_name, page_name, page_number, "widgets/widget.inputNum.json", "digit" + number); } void digitSet() { String number = sCmd.next(); String value = sCmd.next(); - jsonWriteStr(configJson, "digit" + number, value); + jsonWriteStr(configLiveJson, "digit" + number, value); sendSTATUS("digit" + number, value); } //===================================================================================================================================== @@ -295,13 +295,13 @@ void inputTime() { page_name.replace("#", " "); String start_state = sCmd.next(); String page_number = sCmd.next(); - jsonWriteStr(configJson, "time" + number, start_state); + jsonWriteStr(configLiveJson, "time" + number, start_state); createWidget (widget_name, page_name, page_number, "widgets/widget.inputTime.json", "time" + number); } void timeSet() { String number = sCmd.next(); String value = sCmd.next(); - jsonWriteStr(configJson, "time" + number, value); + jsonWriteStr(configLiveJson, "time" + number, value); sendSTATUS("time" + number, value); } @@ -309,9 +309,9 @@ void handle_time_init() { ts.add(TIME, 1000, [&](void*) { String tmp = GetTime(); - jsonWriteStr(configJson, "time", tmp); + jsonWriteStr(configLiveJson, "time", tmp); tmp.replace(":", "-"); - jsonWriteStr(configJson, "timenow", tmp); + jsonWriteStr(configLiveJson, "timenow", tmp); eventGen ("timenow", ""); }, nullptr, true); @@ -344,7 +344,7 @@ void textSet() { text = text + " " + GetDataDigital() + " " + time; } - jsonWriteStr(configJson, "text" + number, text); + jsonWriteStr(configLiveJson, "text" + number, text); sendSTATUS("text" + number, text); } //===================================================================================================================================== @@ -356,7 +356,7 @@ void stepper() { String pin_step = sCmd.next(); String pin_dir = sCmd.next(); - jsonWriteStr(optionJson, "stepper" + stepper_number, pin_step + " " + pin_dir); + jsonWriteStr(configOptionJson, "stepper" + stepper_number, pin_step + " " + pin_dir); pinMode(pin_step.toInt(), OUTPUT); pinMode(pin_dir.toInt(), OUTPUT); } @@ -365,20 +365,20 @@ void stepper() { void stepperSet() { String stepper_number = sCmd.next(); String steps = sCmd.next(); - jsonWriteStr(optionJson, "steps" + stepper_number, steps); + jsonWriteStr(configOptionJson, "steps" + stepper_number, steps); String stepper_speed = sCmd.next(); - String pin_step = selectToMarker (jsonReadStr(optionJson, "stepper" + stepper_number), " "); - String pin_dir = deleteBeforeDelimiter (jsonReadStr(optionJson, "stepper" + stepper_number), " "); + String pin_step = selectToMarker (jsonReadStr(configOptionJson, "stepper" + stepper_number), " "); + String pin_dir = deleteBeforeDelimiter (jsonReadStr(configOptionJson, "stepper" + stepper_number), " "); Serial.println(pin_step); Serial.println(pin_dir); if (steps.toInt() > 0) digitalWrite(pin_dir.toInt(), HIGH); if (steps.toInt() < 0) digitalWrite(pin_dir.toInt(), LOW); if (stepper_number == "1") { ts.add(STEPPER1, stepper_speed.toInt(), [&](void*) { - int steps_int = abs(jsonReadInt(optionJson, "steps1") * 2); + int steps_int = abs(jsonReadInt(configOptionJson, "steps1") * 2); static int count; count++; - String pin_step = selectToMarker (jsonReadStr(optionJson, "stepper1"), " "); + String pin_step = selectToMarker (jsonReadStr(configOptionJson, "stepper1"), " "); digitalWrite(pin_step.toInt(), !digitalRead(pin_step.toInt())); yield(); if (count > steps_int) { @@ -390,10 +390,10 @@ void stepperSet() { } if (stepper_number == "2") { ts.add(STEPPER2, stepper_speed.toInt(), [&](void*) { - int steps_int = abs(jsonReadInt(optionJson, "steps2") * 2); + int steps_int = abs(jsonReadInt(configOptionJson, "steps2") * 2); static int count; count++; - String pin_step = selectToMarker (jsonReadStr(optionJson, "stepper2"), " "); + String pin_step = selectToMarker (jsonReadStr(configOptionJson, "stepper2"), " "); digitalWrite(pin_step.toInt(), !digitalRead(pin_step.toInt())); yield(); if (count > steps_int) { @@ -425,7 +425,7 @@ void servo_() { String page_number = sCmd.next(); - jsonWriteStr(optionJson, "servo_pin" + servo_number, servo_pin); + jsonWriteStr(configOptionJson, "servo_pin" + servo_number, servo_pin); start_state_int = map(start_state_int, min_value.toInt(), max_value.toInt(), min_deg.toInt(), max_deg.toInt()); if (servo_number == "1") { @@ -450,12 +450,12 @@ void servo_() { #endif } - jsonWriteStr(optionJson, "s_min_val" + servo_number, min_value); - jsonWriteStr(optionJson, "s_max_val" + servo_number, max_value); - jsonWriteStr(optionJson, "s_min_deg" + servo_number, min_deg); - jsonWriteStr(optionJson, "s_max_deg" + servo_number, max_deg); + jsonWriteStr(configOptionJson, "s_min_val" + servo_number, min_value); + jsonWriteStr(configOptionJson, "s_max_val" + servo_number, max_value); + jsonWriteStr(configOptionJson, "s_min_deg" + servo_number, min_deg); + jsonWriteStr(configOptionJson, "s_max_deg" + servo_number, max_deg); - jsonWriteStr(configJson, "servo" + servo_number, start_state); + jsonWriteStr(configLiveJson, "servo" + servo_number, start_state); createWidgetParam (widget_name, page_name, page_number, "widgets/widget.range.json", "servo" + servo_number, "min", min_value, "max", max_value, "k", "1"); } @@ -465,13 +465,13 @@ void servoSet() { String servo_state = sCmd.next(); int servo_state_int = servo_state.toInt(); - int pin = jsonReadInt(optionJson, "servo_pin" + servo_number); + int pin = jsonReadInt(configOptionJson, "servo_pin" + servo_number); servo_state_int = map(servo_state_int, - jsonReadInt(optionJson, "s_min_val" + servo_number), - jsonReadInt(optionJson, "s_max_val" + servo_number), - jsonReadInt(optionJson, "s_min_deg" + servo_number), - jsonReadInt(optionJson, "s_max_deg" + servo_number)); + jsonReadInt(configOptionJson, "s_min_val" + servo_number), + jsonReadInt(configOptionJson, "s_max_val" + servo_number), + jsonReadInt(configOptionJson, "s_min_deg" + servo_number), + jsonReadInt(configOptionJson, "s_max_deg" + servo_number)); if (servo_number == "1") { #ifdef ESP8266 @@ -495,7 +495,7 @@ void servoSet() { eventGen ("servo", servo_number); - jsonWriteStr(configJson, "servo" + servo_number, servo_state); + jsonWriteStr(configLiveJson, "servo" + servo_number, servo_state); sendSTATUS("servo" + servo_number, servo_state); } #endif @@ -523,7 +523,7 @@ void mqttOrderSend() { String id = sCmd.next(); String order = sCmd.next(); - String all_line = jsonReadStr(configSetup, "mqttPrefix") + "/" + id + "/order"; + String all_line = jsonReadStr(configSetupJson, "mqttPrefix") + "/" + id + "/order"; //Serial.print(all_line); //Serial.print("->"); //Serial.println(order); @@ -547,7 +547,7 @@ void firmware() { String widget_name = sCmd.next(); String page_name = sCmd.next(); String page_number = sCmd.next(); - jsonWriteStr(configJson, "firm1", firmware_version); + jsonWriteStr(configLiveJson, "firm1", firmware_version); choose_widget_and_create(widget_name, page_name, page_number, "any-data", "firm1"); } diff --git a/FS.ino b/FS.ino index 5b4b5ee6..54b4ec54 100644 --- a/FS.ino +++ b/FS.ino @@ -5,29 +5,29 @@ void File_system_init() { Serial.println("--------------started----------------"); //-------------------------------------------------------------- SPIFFS.begin(); - configSetup = readFile("config.json", 4096); - configSetup.replace(" ", ""); - configSetup.replace("\r\n", ""); - Serial.println(configSetup); - jsonWriteStr(configJson, "name", jsonReadStr(configSetup, "name")); - jsonWriteStr(configJson, "lang", jsonReadStr(configSetup, "lang")); + configSetupJson = readFile("config.json", 4096); + configSetupJson.replace(" ", ""); + configSetupJson.replace("\r\n", ""); + Serial.println(configSetupJson); + //jsonWriteStr(configLiveJson, "name", jsonReadStr(configSetupJson, "name")); + //jsonWriteStr(configLiveJson, "lang", jsonReadStr(configSetupJson, "lang")); #ifdef ESP32 uint32_t chipID_u = ESP.getEfuseMac(); chipID = String(chipID_u); - jsonWriteStr(configSetup, "chipID", chipID); + jsonWriteStr(configSetupJson, "chipID", chipID); #endif #ifdef ESP8266 chipID = String( ESP.getChipId() ) + "-" + String(ESP.getFlashChipId()); - jsonWriteStr(configSetup, "chipID", chipID); + jsonWriteStr(configSetupJson, "chipID", chipID); Serial.setDebugOutput(0); #endif - jsonWriteStr(configSetup, "firmware_version", firmware_version); + jsonWriteStr(configSetupJson, "firmware_version", firmware_version); - prex = jsonReadStr(configSetup, "mqttPrefix") + "/" + chipID; + prex = jsonReadStr(configSetupJson, "mqttPrefix") + "/" + chipID; Serial.println(chipID); } diff --git a/Init.ino b/Init.ino index 4465b97f..c5dd153d 100644 --- a/Init.ino +++ b/Init.ino @@ -5,7 +5,7 @@ void All_init() { } void Device_init() { - + logging_value_names_list = ""; enter_to_logging_counter = LOG1 - 1; @@ -47,47 +47,27 @@ void Device_init() { //-------------------------------сценарии----------------------------------------------------- void Scenario_init() { - if (jsonReadStr(configSetup, "scen") == "1") { + if (jsonReadStr(configSetupJson, "scen") == "1") { scenario = readFile("firmware.s.txt", 2048); } } -void up_time() { - uint32_t ss = millis() / 1000; - uint32_t mm = ss / 60; - uint32_t hh = mm / 60; - uint32_t dd = hh / 24; - - String out = ""; - - if (ss != 0) { - out = "[i] uptime = " + String(ss) + " sec"; - jsonWriteStr(configJson, "uptime", String(ss) + " sec"); - } - if (mm != 0) { - out = "[i] uptime = " + String(mm) + " min"; - jsonWriteStr(configJson, "uptime", String(mm) + " min"); - } - if (hh != 0) { - out = "[i] uptime = " + String(hh) + " hours"; - jsonWriteStr(configJson, "uptime", String(hh) + " hours"); - } - if (dd != 0) { - out = "[i] uptime = " + String(dd) + " days"; - jsonWriteStr(configJson, "uptime", String(dd) + " days"); - } - Serial.println(out + ", mqtt_lost_error: " + String(mqtt_lost_error) + ", wifi_lost_error: " + String(wifi_lost_error)); -} - -void statistics_init() { +void uptime_init() { + ts.add(UPTIME, 5000, [&](void*) { + handle_uptime(); + }, nullptr, true); ts.add(STATISTICS, statistics_update, [&](void*) { - - statistics(); - + handle_statistics(); }, nullptr, true); } -void statistics() { +void handle_uptime() { + if (myUpTime.check()) { + jsonWriteStr(configSetupJson, "uptime", uptime_as_string()); + } +} + +void handle_statistics() { if (WiFi.status() == WL_CONNECTED) { String urls = "http://backup.privet.lv/visitors/?"; //----------------------------------------------------------------- diff --git a/Logging.ino b/Logging.ino index 8f25bad1..0becb878 100644 --- a/Logging.ino +++ b/Logging.ino @@ -11,40 +11,40 @@ void logging() { String page_number = sCmd.next(); logging_value_names_list += value_name + ","; enter_to_logging_counter++; //считаем количество входов в эту функцию - jsonWriteStr(optionJson, value_name + "_c", maxCount); //создаем в файловой системе переменную количества точек на графике с отметкой _c что значит count + jsonWriteStr(configOptionJson, value_name + "_c", maxCount); //создаем в файловой системе переменную количества точек на графике с отметкой _c что значит count createChart (widget_name, page_name, page_number, "widgets/widget.chart.json", value_name + "_ch", maxCount); //создаем график в приложении с топиком _ch /prefix/3234045-1589487/value_name_ch if (enter_to_logging_counter == LOG1) { ts.add(LOG1, period_min.toInt() * 1000 * 60, [&](void*) { String tmp_buf_1 = selectFromMarkerToMarker(logging_value_names_list, ",", 0); - deleteOldDate("log." + tmp_buf_1 + ".txt", jsonReadInt(optionJson, tmp_buf_1 + "_c"), jsonReadStr(configJson, tmp_buf_1)); + deleteOldDate("log." + tmp_buf_1 + ".txt", jsonReadInt(configOptionJson, tmp_buf_1 + "_c"), jsonReadStr(configLiveJson, tmp_buf_1)); Serial.println("[i] LOGGING for sensor '" + tmp_buf_1 + "' done"); }, nullptr, false); } if (enter_to_logging_counter == LOG2) { ts.add(LOG2, period_min.toInt() * 1000 * 60, [&](void*) { String tmp_buf_2 = selectFromMarkerToMarker(logging_value_names_list, ",", 1); - deleteOldDate("log." + tmp_buf_2 + ".txt", jsonReadInt(optionJson, tmp_buf_2 + "_c"), jsonReadStr(configJson, tmp_buf_2)); + deleteOldDate("log." + tmp_buf_2 + ".txt", jsonReadInt(configOptionJson, tmp_buf_2 + "_c"), jsonReadStr(configLiveJson, tmp_buf_2)); Serial.println("[i] LOGGING for sensor '" + tmp_buf_2 + "' done"); }, nullptr, false); } if (enter_to_logging_counter == LOG3) { ts.add(LOG3, period_min.toInt() * 1000 * 60, [&](void*) { String tmp_buf_3 = selectFromMarkerToMarker(logging_value_names_list, ",", 2); - deleteOldDate("log." + tmp_buf_3 + ".txt", jsonReadInt(optionJson, tmp_buf_3 + "_c"), jsonReadStr(configJson, tmp_buf_3)); + deleteOldDate("log." + tmp_buf_3 + ".txt", jsonReadInt(configOptionJson, tmp_buf_3 + "_c"), jsonReadStr(configLiveJson, tmp_buf_3)); Serial.println("[i] LOGGING for sensor '" + tmp_buf_3 + "' done"); }, nullptr, false); } if (enter_to_logging_counter == LOG4) { ts.add(LOG4, period_min.toInt() * 1000 * 60, [&](void*) { String tmp_buf_4 = selectFromMarkerToMarker(logging_value_names_list, ",", 3); - deleteOldDate("log." + tmp_buf_4 + ".txt", jsonReadInt(optionJson, tmp_buf_4 + "_c"), jsonReadStr(configJson, tmp_buf_4)); + deleteOldDate("log." + tmp_buf_4 + ".txt", jsonReadInt(configOptionJson, tmp_buf_4 + "_c"), jsonReadStr(configLiveJson, tmp_buf_4)); Serial.println("[i] LOGGING for sensor '" + tmp_buf_4 + "' done"); }, nullptr, false); } if (enter_to_logging_counter == LOG5) { ts.add(LOG5, period_min.toInt() * 1000 * 60, [&](void*) { String tmp_buf_5 = selectFromMarkerToMarker(logging_value_names_list, ",", 4); - deleteOldDate("log." + tmp_buf_5 + ".txt", jsonReadInt(optionJson, tmp_buf_5 + "_c"), jsonReadStr(configJson, tmp_buf_5)); + deleteOldDate("log." + tmp_buf_5 + ".txt", jsonReadInt(configOptionJson, tmp_buf_5 + "_c"), jsonReadStr(configLiveJson, tmp_buf_5)); Serial.println("[i] LOGGING for sensor '" + tmp_buf_5 + "' done"); }, nullptr, false); } diff --git a/Scenario.ino b/Scenario.ino index 8422b0fa..96411b48 100644 --- a/Scenario.ino +++ b/Scenario.ino @@ -1,7 +1,7 @@ void handleScenario() { - if (jsonReadStr(configSetup, "scen") == "1") { - if ((jsonReadStr(optionJson, "scenario_status") != "")) { + if (jsonReadStr(configSetupJson, "scen") == "1") { + if ((jsonReadStr(configOptionJson, "scenario_status") != "")) { int i = 0; String str = scenario; //читаем переменную с сценариями (то что из файла на странице) str += "\n"; @@ -17,7 +17,7 @@ void handleScenario() { //Serial.println(i); String condition = selectToMarker (tmp, "\n"); //выделяем первую строку самого сценария button1 = 1 (условие) String param_name = selectFromMarkerToMarker(condition, " " , 0); - String order = jsonReadStr(optionJson, "scenario_status"); //читаем весь файл событий + String order = jsonReadStr(configOptionJson, "scenario_status"); //читаем весь файл событий String param = selectToMarker (order, ","); //читаем первое событие из файла событий if (param_name == param) { //если поступившее событие равно событию заданному buttonSet1 в файле начинаем его обработку @@ -25,30 +25,30 @@ void handleScenario() { String value = selectFromMarkerToMarker(condition, " " , 2); //читаем значение (1) if (value.indexOf("digit") != -1) { // value = add_set(value); - value = jsonReadStr(configJson, value); + value = jsonReadStr(configLiveJson, value); } if (value.indexOf("time") != -1) { // value = add_set(value); - value = jsonReadStr(configJson, value); + value = jsonReadStr(configLiveJson, value); } boolean flag = false; //если одно из значений совпало то только тогда начинаем выполнять комнады if (sign == "=") { - if (jsonReadStr(configJson, param_name) == value) flag = true; + if (jsonReadStr(configLiveJson, param_name) == value) flag = true; } if (sign == "!=") { - if (jsonReadStr(configJson, param_name) != value) flag = true; + if (jsonReadStr(configLiveJson, param_name) != value) flag = true; } if (sign == "<") { - if (jsonReadStr(configJson, param_name).toInt() < value.toInt()) flag = true; + if (jsonReadStr(configLiveJson, param_name).toInt() < value.toInt()) flag = true; } if (sign == ">") { - if (jsonReadStr(configJson, param_name).toInt() > value.toInt()) flag = true; + if (jsonReadStr(configLiveJson, param_name).toInt() > value.toInt()) flag = true; } if (sign == ">=") { - if (jsonReadStr(configJson, param_name).toInt() >= value.toInt()) flag = true; + if (jsonReadStr(configLiveJson, param_name).toInt() >= value.toInt()) flag = true; } if (sign == "<=") { - if (jsonReadStr(configJson, param_name).toInt() <= value.toInt()) flag = true; + if (jsonReadStr(configLiveJson, param_name).toInt() <= value.toInt()) flag = true; } if (flag) { @@ -63,9 +63,9 @@ void handleScenario() { str = deleteBeforeDelimiter(str, "end\n"); //удаляем первый сценарий //----------------------------------------------------------------------------------------------------------------------- } - String tmp2 = jsonReadStr(optionJson, "scenario_status"); //читаем файл событий + String tmp2 = jsonReadStr(configOptionJson, "scenario_status"); //читаем файл событий tmp2 = deleteBeforeDelimiter(tmp2, ","); //удаляем выполненное событие - jsonWriteStr(optionJson, "scenario_status", tmp2); //записываем обновленный файл событий + jsonWriteStr(configOptionJson, "scenario_status", tmp2); //записываем обновленный файл событий i = 0; } } @@ -73,10 +73,10 @@ void handleScenario() { void eventGen (String event_name, String number) { //событие выглядит как имя плюс set плюс номер: button+Set+1 - if (jsonReadStr(configSetup, "scen") == "1") { - String tmp = jsonReadStr(optionJson, "scenario_status") ; //генерирование события + if (jsonReadStr(configSetupJson, "scen") == "1") { + String tmp = jsonReadStr(configOptionJson, "scenario_status") ; //генерирование события //Serial.println(event_name); - jsonWriteStr(optionJson, "scenario_status", tmp + event_name + number + ","); + jsonWriteStr(configOptionJson, "scenario_status", tmp + event_name + number + ","); } } diff --git a/Sensors.ino b/Sensors.ino index 822949a0..9a837b89 100644 --- a/Sensors.ino +++ b/Sensors.ino @@ -57,10 +57,10 @@ void level() { String full_level = sCmd.next(); String page_number = sCmd.next(); level_value_name = value_name; - jsonWriteStr(optionJson, "e_lev", empty_level); - jsonWriteStr(optionJson, "f_lev", full_level); - jsonWriteStr(optionJson, "trig", trig); - jsonWriteStr(optionJson, "echo", echo); + jsonWriteStr(configOptionJson, "e_lev", empty_level); + jsonWriteStr(configOptionJson, "f_lev", full_level); + jsonWriteStr(configOptionJson, "trig", trig); + jsonWriteStr(configOptionJson, "echo", echo); pinMode(trig.toInt(), OUTPUT); pinMode(echo.toInt(), INPUT); choose_widget_and_create(widget_name, page_name, page_number, type, value_name); @@ -72,8 +72,8 @@ void level_reading() { int distance_cm; int level; static int counter; - int trig = jsonReadInt(optionJson, "trig"); - int echo = jsonReadInt(optionJson, "echo"); + int trig = jsonReadInt(configOptionJson, "trig"); + int echo = jsonReadInt(configOptionJson, "echo"); digitalWrite(trig, LOW); delayMicroseconds(2); digitalWrite(trig, HIGH); @@ -86,9 +86,9 @@ void level_reading() { if (counter > tank_level_times_to_send) { counter = 0; level = map(distance_cm, - jsonReadInt(optionJson, "e_lev"), - jsonReadInt(optionJson, "f_lev"), 0, 100); - jsonWriteInt(configJson, level_value_name, level); + jsonReadInt(configOptionJson, "e_lev"), + jsonReadInt(configOptionJson, "f_lev"), 0, 100); + jsonWriteInt(configLiveJson, level_value_name, level); eventGen (level_value_name, ""); sendSTATUS(level_value_name, String(level)); Serial.println("[i] sensor '" + level_value_name + "' data: " + String(level)); @@ -112,10 +112,10 @@ void analog() { String page_number = sCmd.next(); analog_value_names_list += value_name + ","; enter_to_analog_counter++; - jsonWriteStr(optionJson, value_name + "_st", analog_start); - jsonWriteStr(optionJson, value_name + "_end", analog_end); - jsonWriteStr(optionJson, value_name + "_st_out", analog_start_out); - jsonWriteStr(optionJson, value_name + "_end_out", analog_end_out); + jsonWriteStr(configOptionJson, value_name + "_st", analog_start); + jsonWriteStr(configOptionJson, value_name + "_end", analog_end); + jsonWriteStr(configOptionJson, value_name + "_st_out", analog_start_out); + jsonWriteStr(configOptionJson, value_name + "_end_out", analog_end_out); choose_widget_and_create(widget_name, page_name, page_number, type, value_name); if (enter_to_analog_counter == 1) { sensors_reading_map[1] = 1; @@ -134,11 +134,11 @@ void analog_reading1() { int analog_in = analogRead(A0); #endif int analog = map(analog_in, - jsonReadInt(optionJson, value_name + "_st") , - jsonReadInt(optionJson, value_name + "_end"), - jsonReadInt(optionJson, value_name + "_st_out"), - jsonReadInt(optionJson, value_name + "_end_out")); - jsonWriteInt(configJson, value_name, analog); + jsonReadInt(configOptionJson, value_name + "_st") , + jsonReadInt(configOptionJson, value_name + "_end"), + jsonReadInt(configOptionJson, value_name + "_st_out"), + jsonReadInt(configOptionJson, value_name + "_end_out")); + jsonWriteInt(configLiveJson, value_name, analog); eventGen (value_name, ""); sendSTATUS(value_name, String(analog)); Serial.println("[i] sensor '" + value_name + "' data: " + String(analog)); @@ -153,11 +153,11 @@ void analog_reading2() { int analog_in = analogRead(A0); #endif int analog = map(analog_in, - jsonReadInt(optionJson, value_name + "_st") , - jsonReadInt(optionJson, value_name + "_end"), - jsonReadInt(optionJson, value_name + "_st_out"), - jsonReadInt(optionJson, value_name + "_end_out")); - jsonWriteInt(configJson, value_name, analog); + jsonReadInt(configOptionJson, value_name + "_st") , + jsonReadInt(configOptionJson, value_name + "_end"), + jsonReadInt(configOptionJson, value_name + "_st_out"), + jsonReadInt(configOptionJson, value_name + "_end_out")); + jsonWriteInt(configLiveJson, value_name, analog); eventGen (value_name, ""); sendSTATUS(value_name, String(analog)); Serial.println("[i] sensor '" + value_name + "' data: " + String(analog)); @@ -186,7 +186,7 @@ void dallas_reading() { float temp = 0; sensors.requestTemperatures(); temp = sensors.getTempCByIndex(0); - jsonWriteStr(configJson, "dallas", String(temp)); + jsonWriteStr(configLiveJson, "dallas", String(temp)); eventGen ("dallas", ""); sendSTATUS("dallas", String(temp)); Serial.println("[i] sensor 'dallas' send date " + String(temp)); @@ -226,7 +226,7 @@ void dhtT_reading() { value = dht.getTemperature(); if (String(value) != "nan") { eventGen (dhtT_value_name, ""); - jsonWriteStr(configJson, dhtT_value_name, String(value)); + jsonWriteStr(configLiveJson, dhtT_value_name, String(value)); sendSTATUS(dhtT_value_name, String(value)); Serial.println("[i] sensor '" + dhtT_value_name + "' data: " + String(value)); } @@ -264,7 +264,7 @@ void dhtH_reading() { value = dht.getHumidity(); if (String(value) != "nan") { eventGen (dhtH_value_name, ""); - jsonWriteStr(configJson, dhtH_value_name, String(value)); + jsonWriteStr(configLiveJson, dhtH_value_name, String(value)); sendSTATUS(dhtH_value_name, String(value)); Serial.println("[i] sensor '" + dhtH_value_name + "' data: " + String(value)); } @@ -285,9 +285,9 @@ void dhtP_reading() { if (dht.getStatus() != 0) { sendSTATUS("dhtPerception", String(dht.getStatusString())); } else { - value = dht.computePerception(jsonReadStr(configJson, dhtT_value_name).toFloat(), jsonReadStr(configJson, dhtH_value_name).toFloat(), false); + value = dht.computePerception(jsonReadStr(configLiveJson, dhtT_value_name).toFloat(), jsonReadStr(configLiveJson, dhtH_value_name).toFloat(), false); String final_line = perception(value); - jsonWriteStr(configJson, "dhtPerception", final_line); + jsonWriteStr(configLiveJson, "dhtPerception", final_line); eventGen ("dhtPerception", ""); sendSTATUS("dhtPerception", final_line); if (client_mqtt.connected()) { @@ -322,9 +322,9 @@ void dhtC_reading() { if (dht.getStatus() != 0) { sendSTATUS("dhtComfort", String(dht.getStatusString())); } else { - value = dht.getComfortRatio(cf, jsonReadStr(configJson, dhtT_value_name).toFloat(), jsonReadStr(configJson, dhtH_value_name).toFloat(), false); + value = dht.getComfortRatio(cf, jsonReadStr(configLiveJson, dhtT_value_name).toFloat(), jsonReadStr(configLiveJson, dhtH_value_name).toFloat(), false); String final_line = get_comfort_status(cf); - jsonWriteStr(configJson, "dhtComfort", final_line); + jsonWriteStr(configLiveJson, "dhtComfort", final_line); eventGen ("dhtComfort", ""); sendSTATUS("dhtComfort", final_line); Serial.println("[i] sensor 'dhtComfort' send date " + final_line); @@ -383,8 +383,8 @@ void dhtD_reading() { if (dht.getStatus() != 0) { sendSTATUS("dhtDewpoint", String(dht.getStatusString())); } else { - value = dht.computeDewPoint(jsonReadStr(configJson, dhtT_value_name).toFloat(), jsonReadStr(configJson, dhtH_value_name).toFloat(), false); - jsonWriteInt(configJson, "dhtDewpoint", value); + value = dht.computeDewPoint(jsonReadStr(configLiveJson, dhtT_value_name).toFloat(), jsonReadStr(configLiveJson, dhtH_value_name).toFloat(), false); + jsonWriteInt(configLiveJson, "dhtDewpoint", value); eventGen ("dhtDewpoint", ""); sendSTATUS("dhtDewpoint", String(value)); Serial.println("[i] sensor 'dhtDewpoint' data: " + String(value)); @@ -420,7 +420,7 @@ void bmp280T_rading() { sensors_event_t temp_event, pressure_event; bmp_temp->getEvent(&temp_event); value = temp_event.temperature; - jsonWriteStr(configJson, bmp280T_value_name, String(value)); + jsonWriteStr(configLiveJson, bmp280T_value_name, String(value)); eventGen(bmp280T_value_name, ""); sendSTATUS(bmp280T_value_name, String(value)); Serial.println("[i] sensor '" + bmp280T_value_name + "' data: " + String(value)); @@ -452,7 +452,7 @@ void bmp280P_reading() { bmp_pressure->getEvent(&pressure_event); value = pressure_event.pressure; value = value / 1.333224; - jsonWriteStr(configJson, bmp280P_value_name, String(value)); + jsonWriteStr(configLiveJson, bmp280P_value_name, String(value)); eventGen(bmp280P_value_name, ""); sendSTATUS(bmp280P_value_name, String(value)); Serial.println("[i] sensor '" + bmp280P_value_name + "' data: " + String(value)); @@ -478,7 +478,7 @@ void bme280T() { void bme280T_reading() { float value = 0; value = bme.readTemperature(); - jsonWriteStr(configJson, bme280T_value_name, String(value)); + jsonWriteStr(configLiveJson, bme280T_value_name, String(value)); eventGen(bme280T_value_name, ""); sendSTATUS(bme280T_value_name, String(value)); Serial.println("[i] sensor '" + bme280T_value_name + "' data: " + String(value)); @@ -501,7 +501,7 @@ void bme280P() { void bme280P_reading() { float value = 0; value = bme.readPressure(); - jsonWriteStr(configJson, bme280P_value_name, String(value)); + jsonWriteStr(configLiveJson, bme280P_value_name, String(value)); eventGen(bme280P_value_name, ""); sendSTATUS(bme280P_value_name, String(value)); Serial.println("[i] sensor '" + bme280P_value_name + "' data: " + String(value)); @@ -524,7 +524,7 @@ void bme280H() { void bme280H_reading() { float value = 0; value = bme.readHumidity(); - jsonWriteStr(configJson, bme280H_value_name, String(value)); + jsonWriteStr(configLiveJson, bme280H_value_name, String(value)); eventGen(bme280H_value_name, ""); sendSTATUS(bme280H_value_name, String(value)); Serial.println("[i] sensor '" + bme280H_value_name + "' data: " + String(value)); @@ -547,7 +547,7 @@ void bme280A() { void bme280A_reading() { float value = 0; value = bme.readAltitude(1013.25); - jsonWriteStr(configJson, bme280A_value_name, String(value)); + jsonWriteStr(configLiveJson, bme280A_value_name, String(value)); eventGen(bme280A_value_name, ""); sendSTATUS(bme280A_value_name, String(value)); Serial.println("[i] sensor '" + bme280A_value_name + "' data: " + String(value)); diff --git a/Time.ino b/Time.ino index b1fc9b66..6eb6d43e 100644 --- a/Time.ino +++ b/Time.ino @@ -13,7 +13,7 @@ void time_check() { void reconfigTime() { if (WiFi.status() == WL_CONNECTED) { - String ntp = jsonReadStr(configSetup, "ntp"); + String ntp = jsonReadStr(configSetupJson, "ntp"); configTime(0, 0, ntp.c_str()); int i = 0; Serial.println("[i] Awaiting for time "); @@ -57,7 +57,7 @@ String GetTimeUnix() { // Получение текущего времени String GetTime() { time_t now = time(nullptr); // получаем время с помощью библиотеки time.h - int zone = 3600 * jsonReadStr(configSetup, "timezone").toInt(); + int zone = 3600 * jsonReadStr(configSetupJson, "timezone").toInt(); now = now + zone; String Time = ""; // Строка для результатов времени Time += ctime(&now); // Преобразуем время в строку формата Thu Jan 19 00:55:35 2017 @@ -68,7 +68,7 @@ String GetTime() { String GetTimeWOsec() { time_t now = time(nullptr); // получаем время с помощью библиотеки time.h - int zone = 3600 * jsonReadStr(configSetup, "timezone").toInt(); + int zone = 3600 * jsonReadStr(configSetupJson, "timezone").toInt(); now = now + zone; String Time = ""; // Строка для результатов времени Time += ctime(&now); // Преобразуем время в строку формата Thu Jan 19 00:55:35 2017 @@ -80,7 +80,7 @@ String GetTimeWOsec() { // Получение даты String GetDate() { time_t now = time(nullptr); // получаем время с помощью библиотеки time.h - int zone = 3600 * jsonReadStr(configSetup, "timezone").toInt(); + int zone = 3600 * jsonReadStr(configSetupJson, "timezone").toInt(); now = now + zone; String Data = ""; // Строка для результатов времени Data += ctime(&now); // Преобразуем время в строку формата Thu Jan 19 00:55:35 2017 diff --git a/Timers.ino b/Timers.ino index 941f0c0d..a744a310 100644 --- a/Timers.ino +++ b/Timers.ino @@ -4,7 +4,7 @@ void Timer_countdown_init() { ts.add(TIMER_COUNTDOWN, 1000, [&](void*) { - String old_line = jsonReadStr(optionJson, "timers"); + String old_line = jsonReadStr(configOptionJson, "timers"); if (old_line != "") { //Serial.println(old_line); int i = 0; @@ -17,7 +17,7 @@ void Timer_countdown_init() { int time = readTimer(number); if (time == 0) { delTimer (String (number)); - jsonWriteStr(configJson, "timer" + String(number), "0"); + jsonWriteStr(configLiveJson, "timer" + String(number), "0"); eventGen ("timer", String(number)); } else { time--; @@ -35,16 +35,16 @@ void timerStart() { String type = sCmd.next(); if (period_of_time.indexOf("digit") != -1) { //period_of_time = add_set(period_of_time); - period_of_time = jsonReadStr(configJson, period_of_time); + period_of_time = jsonReadStr(configLiveJson, period_of_time); } if (type == "sec") period_of_time = period_of_time; if (type == "min") period_of_time = String(period_of_time.toInt() * 60); if (type == "hours") period_of_time = String(period_of_time.toInt() * 60 * 60); addTimer(number, period_of_time); - jsonWriteStr(configJson, "timer" + number, "1"); + jsonWriteStr(configLiveJson, "timer" + number, "1"); } void addTimer(String number, String time) { - String tmp = jsonReadStr(optionJson, "timers"); //1:60,2:120, + String tmp = jsonReadStr(configOptionJson, "timers"); //1:60,2:120, String new_timer = number + ":" + time; int psn1 = tmp.indexOf(number + ":"); //0 ищем позицию таймера который надо заменить if (psn1 != -1) { //если он есть @@ -56,7 +56,7 @@ void addTimer(String number, String time) { } else { //если его нет tmp += new_timer + ","; } - jsonWriteStr(optionJson, "timers", tmp); + jsonWriteStr(configOptionJson, "timers", tmp); //Serial.println("ura"); } @@ -66,18 +66,18 @@ void timerStop() { } void delTimer (String number) { - String tmp = jsonReadStr(optionJson, "timers"); //1:60,2:120, + String tmp = jsonReadStr(configOptionJson, "timers"); //1:60,2:120, int psn1 = tmp.indexOf(number + ":"); //0 ищем позицию таймера который надо удалить if (psn1 != -1) { //если он есть int psn2 = tmp.indexOf(",", psn1); //4 от этой позиции находим позицию запятой String timer = tmp.substring(psn1, psn2) + ","; //1:60, выделяем таймер который надо удалить tmp.replace(timer, ""); //удаляем таймер - jsonWriteStr(optionJson, "timers", tmp); + jsonWriteStr(configOptionJson, "timers", tmp); } } int readTimer(int number) { - String tmp = jsonReadStr(optionJson, "timers"); //1:60,2:120, + String tmp = jsonReadStr(configOptionJson, "timers"); //1:60,2:120, int psn1 = tmp.indexOf(String(number) + ":"); //0 ищем позицию таймера который надо прочитать String timer; if (psn1 != -1) { //если он есть diff --git a/Upgrade.ino b/Upgrade.ino index 6154acfe..ddd5de95 100644 --- a/Upgrade.ino +++ b/Upgrade.ino @@ -5,7 +5,7 @@ void initUpgrade() { #ifdef ESP32 if (WiFi.status() == WL_CONNECTED) last_version = getURL("http://91.204.228.124:1100/update/esp32/version.txt"); #endif - jsonWriteStr(configSetup, "last_version", last_version); + jsonWriteStr(configSetupJson, "last_version", last_version); Serial.print("[i] Last firmware version: "); Serial.println(last_version); } @@ -15,11 +15,11 @@ void do_upgrade_url() { upgrade_url = false; #ifdef ESP32 last_version = getURL("http://91.204.228.124:1100/update/esp32/version.txt"); - jsonWriteStr(configSetup, "last_version", last_version); + jsonWriteStr(configSetupJson, "last_version", last_version); #endif #ifdef ESP8266 last_version = getURL("http://91.204.228.124:1100/update/esp8266/version.txt"); - jsonWriteStr(configSetup, "last_version", last_version); + jsonWriteStr(configSetupJson, "last_version", last_version); #endif } } @@ -31,7 +31,7 @@ void upgrade_firmware() { String configSetup_for_update; scenario_for_update = readFile("firmware.s.txt", 4000); config_for_update = readFile("firmware.c.txt", 4000); - configSetup_for_update = configSetup; + configSetup_for_update = configSetupJson; Serial.println("Start upgrade SPIFFS, please wait..."); diff --git a/Web.ino b/Web.ino index fc4c9b11..72f3aad6 100644 --- a/Web.ino +++ b/Web.ino @@ -1,35 +1,117 @@ void web_init() { - /****************************************************************************** - **********************************INITIALIZATION******************************* - ******************************************************************************/ server.on("/set", HTTP_GET, [](AsyncWebServerRequest * request) { String value; //============================device settings===================================== + if (request->hasArg("preset")) { + //-------------------------------------------------------------------------------- + String value; + value = request->getParam("preset")->value(); + if (value == "1") { + writeFile("firmware.c.txt", readFile("configs/1-relay.c.txt", 2048)); + writeFile("firmware.s.txt", readFile("configs/1-relay.s.txt", 2048)); + } + if (value == "2") { + writeFile("firmware.c.txt", readFile("configs/2-relay.c.txt", 2048)); + writeFile("firmware.s.txt", readFile("configs/2-relay.s.txt", 2048)); + } + if (value == "3") { + writeFile("firmware.c.txt", readFile("configs/3-relay.c.txt", 2048)); + writeFile("firmware.s.txt", readFile("configs/3-relay.s.txt", 2048)); + } + if (value == "4") { + writeFile("firmware.c.txt", readFile("configs/4-relay.c.txt", 2048)); + writeFile("firmware.s.txt", readFile("configs/4-relay.s.txt", 2048)); + } + if (value == "5") { + writeFile("firmware.c.txt", readFile("configs/5-relay.c.txt", 2048)); + writeFile("firmware.s.txt", readFile("configs/5-relay.s.txt", 2048)); + } + if (value == "6") { + writeFile("firmware.c.txt", readFile("configs/6-relay.c.txt", 2048)); + writeFile("firmware.s.txt", readFile("configs/6-relay.s.txt", 2048)); + } + if (value == "7") { + writeFile("firmware.c.txt", readFile("configs/7-relay.c.txt", 2048)); + writeFile("firmware.s.txt", readFile("configs/7-relay.s.txt", 2048)); + } + if (value == "8") { + writeFile("firmware.c.txt", readFile("configs/8-pwm.c.txt", 2048)); + writeFile("firmware.s.txt", readFile("configs/8-pwm.s.txt", 2048)); + } + if (value == "9") { + writeFile("firmware.c.txt", readFile("configs/9-dht11.c.txt", 2048)); + writeFile("firmware.s.txt", readFile("configs/9-dht11.s.txt", 2048)); + } + if (value == "10") { + writeFile("firmware.c.txt", readFile("configs/10-dht22.c.txt", 2048)); + writeFile("firmware.s.txt", readFile("configs/10-dht22.s.txt", 2048)); + } + if (value == "11") { + writeFile("firmware.c.txt", readFile("configs/11-analog.c.txt", 2048)); + writeFile("firmware.s.txt", readFile("configs/11-analog.s.txt", 2048)); + } + if (value == "12") { + writeFile("firmware.c.txt", readFile("configs/12-dallas.c.txt", 2048)); + writeFile("firmware.s.txt", readFile("configs/12-dallas.s.txt", 2048)); + } + if (value == "13") { + writeFile("firmware.c.txt", readFile("configs/13-termostat.c.txt", 2048)); + writeFile("firmware.s.txt", readFile("configs/13-termostat.s.txt", 2048)); + } + if (value == "14") { + writeFile("firmware.c.txt", readFile("configs/14-level.c.txt", 2048)); + writeFile("firmware.s.txt", readFile("configs/14-level.s.txt", 2048)); + } + if (value == "15") { + writeFile("firmware.c.txt", readFile("configs/15-moution.c.txt", 2048)); + writeFile("firmware.s.txt", readFile("configs/15-moution.s.txt", 2048)); + } + if (value == "16") { + writeFile("firmware.c.txt", readFile("configs/16-moution.c.txt", 2048)); + writeFile("firmware.s.txt", readFile("configs/16-moution.s.txt", 2048)); + } + if (value == "17") { + writeFile("firmware.c.txt", readFile("configs/17-stepper.c.txt", 2048)); + writeFile("firmware.s.txt", readFile("configs/17-stepper.s.txt", 2048)); + } + if (value == "18") { + writeFile("firmware.c.txt", readFile("configs/18-servo.c.txt", 2048)); + writeFile("firmware.s.txt", readFile("configs/18-servo.s.txt", 2048)); + } + if (value == "19") { + writeFile("firmware.c.txt", readFile("configs/firmware.c.txt", 2048)); + writeFile("firmware.s.txt", readFile("configs/firmware.s.txt", 2048)); + } + Device_init(); + Scenario_init(); + request->redirect("/?set.device"); + } + //-------------------------------------------------------------------------------- if (request->hasArg("devinit")) { Device_init(); request->send(200, "text/text", "OK"); } - + //-------------------------------------------------------------------------------- if (request->hasArg("scen")) { value = request->getParam("scen")->value(); if (value == "0") { - jsonWriteStr(configSetup, "scen", value); + jsonWriteStr(configSetupJson, "scen", value); saveConfig(); Scenario_init(); } if (value == "1") { - jsonWriteStr(configSetup, "scen", value); + jsonWriteStr(configSetupJson, "scen", value); saveConfig(); Scenario_init(); } request->send(200, "text/text", "OK"); } - + //-------------------------------------------------------------------------------- if (request->hasArg("sceninit")) { Scenario_init(); request->send(200, "text/text", "OK"); } - + //-------------------------------------------------------------------------------- if (request->hasArg("cleanlog")) { #ifdef logging_enable clean_log_date(); @@ -39,58 +121,143 @@ void web_init() { if (request->hasArg("udponoff")) { value = request->getParam("udponoff")->value(); if (value == "0") { - jsonWriteStr(configSetup, "udponoff", value); + jsonWriteStr(configSetupJson, "udponoff", value); saveConfig(); Scenario_init(); } if (value == "1") { - jsonWriteStr(configSetup, "udponoff", value); + jsonWriteStr(configSetupJson, "udponoff", value); saveConfig(); Scenario_init(); } request->send(200, "text/text", "OK"); } - + //-------------------------------------------------------------------------------- if (request->hasArg("updatelist")) { SPIFFS.remove("/dev.csv"); addFile("dev.csv", "device id;device name;ip address"); request->redirect("/?set.udp"); } - + //-------------------------------------------------------------------------------- if (request->hasArg("updatepage")) { request->redirect("/?set.udp"); } - - - - - /*if (value == "5") { - i2c_scanning = true; - request->redirect("/?utilities"); - }*/ - - /*if (value == "2") { - mqtt_send_settings_to_udp = true; - request->send(200, "text/text", "ok"); - }*/ - }); - /****************************************************************************** - **********************************TIME***************************************** - ******************************************************************************/ - server.on("/time", HTTP_GET, [](AsyncWebServerRequest * request) { + //-------------------------------------------------------------------------------- + if (request->hasArg("devname")) { + jsonWriteStr(configSetupJson, "name", request->getParam("devname")->value()); + saveConfig(); + request->send(200, "text/text", "OK"); + } + //==============================wifi settings============================================= + if (request->hasArg("routerssid")) { + jsonWriteStr(configSetupJson, "routerssid", request->getParam("routerssid")->value()); + saveConfig(); + request->send(200, "text/text", "OK"); + } + if (request->hasArg("routerpass")) { + jsonWriteStr(configSetupJson, "routerpass", request->getParam("routerpass")->value()); + saveConfig(); + request->send(200, "text/text", "OK"); + } + //-------------------------------------------------------------------------------- + if (request->hasArg("apssid")) { + jsonWriteStr(configSetupJson, "apssid", request->getParam("apssid")->value()); + saveConfig(); + request->send(200, "text/text", "OK"); + } + if (request->hasArg("appass")) { + jsonWriteStr(configSetupJson, "appass", request->getParam("appass")->value()); + saveConfig(); + request->send(200, "text/text", "OK"); + } + //-------------------------------------------------------------------------------- + if (request->hasArg("weblogin")) { + jsonWriteStr(configSetupJson, "weblogin", request->getParam("weblogin")->value()); + saveConfig(); + request->send(200, "text/text", "OK"); + } + if (request->hasArg("webpass")) { + jsonWriteStr(configSetupJson, "webpass", request->getParam("webpass")->value()); + saveConfig(); + request->send(200, "text/text", "OK"); + } + //-------------------------------------------------------------------------------- if (request->hasArg("timezone")) { - jsonWriteStr(configSetup, "timezone", request->getParam("timezone")->value()); + jsonWriteStr(configSetupJson, "timezone", request->getParam("timezone")->value()); + saveConfig(); + reconfigTime(); + request->send(200, "text/text", "OK"); } if (request->hasArg("ntp")) { - jsonWriteStr(configSetup, "ntp", request->getParam("ntp")->value()); + jsonWriteStr(configSetupJson, "ntp", request->getParam("ntp")->value()); + saveConfig(); + reconfigTime(); + request->send(200, "text/text", "OK"); + } + //-------------------------------------------------------------------------------- + if (request->hasArg("device")) { + if (request->getParam("device")->value() == "ok") ESP.restart(); + request->send(200, "text/text", "OK"); + } + //==============================mqtt settings============================================= + if (request->hasArg("mqttServer")) { + jsonWriteStr(configSetupJson, "mqttServer", request->getParam("mqttServer")->value()); + saveConfig(); + mqtt_connection = true; + request->send(200, "text/text", "ok"); + } + if (request->hasArg("mqttPort")) { + int port = (request->getParam("mqttPort")->value()).toInt(); + jsonWriteInt(configSetupJson, "mqttPort", port); + saveConfig(); + mqtt_connection = true; + request->send(200, "text/text", "ok"); + } + if (request->hasArg("mqttPrefix")) { + jsonWriteStr(configSetupJson, "mqttPrefix", request->getParam("mqttPrefix")->value()); + saveConfig(); + mqtt_connection = true; + request->send(200, "text/text", "ok"); + } + if (request->hasArg("mqttUser")) { + jsonWriteStr(configSetupJson, "mqttUser", request->getParam("mqttUser")->value()); + saveConfig(); + mqtt_connection = true; + request->send(200, "text/text", "ok"); + } + if (request->hasArg("mqttPass")) { + jsonWriteStr(configSetupJson, "mqttPass", request->getParam("mqttPass")->value()); + saveConfig(); + mqtt_connection = true; + request->send(200, "text/text", "ok"); + } + //-------------------------------------------------------------------------------- + if (request->hasArg("mqttsend")) { + mqtt_send_settings_to_udp = true; + request->send(200, "text/text", "ok"); + } + //-------------------------------------------------------------------------------- + if (request->hasArg("mqttcheck")) { + String tmp = "{}"; + jsonWriteStr(tmp, "title", "" + stateMQTT()); + jsonWriteStr(tmp, "class", "pop-up"); + request->send(200, "text/text", tmp); + } + //==============================push settings============================================= +#ifdef push_enable + if (request->hasArg("pushingboxid")) { + jsonWriteStr(configSetupJson, "pushingboxid", request->getParam("pushingboxid")->value()); } saveConfig(); - reconfigTime(); - request->send(200, "text/text", "OK"); // отправляем ответ о выполнении + request->send(200, "text/text", "ok"); +#endif + //==============================utilities settings============================================= + if (request->hasArg("itoc")) { + i2c_scanning = true; + request->redirect("/?set.utilities"); + } }); - /****************************************************************************** - **********************************UPDATE*************************************** - ******************************************************************************/ + //==============================upgrade settings============================================= server.on("/check", HTTP_GET, [](AsyncWebServerRequest * request) { upgrade_url = true; Serial.print("[i] Last firmware version: "); @@ -125,191 +292,9 @@ void web_init() { } request->send(200, "text/text", tmp); }); - server.on("/upgrade", HTTP_GET, [](AsyncWebServerRequest * request) { upgrade = true; String tmp = "{}"; request->send(200, "text/text", "ok"); }); - /****************************************************************************** - **********************************WIFI***************************************** - ******************************************************************************/ - server.on("/ssid", HTTP_GET, [](AsyncWebServerRequest * request) { - if (request->hasArg("ssid")) { - jsonWriteStr(configSetup, "ssid", request->getParam("ssid")->value()); - } - if (request->hasArg("password")) { - jsonWriteStr(configSetup, "password", request->getParam("password")->value()); - } - saveConfig(); - request->send(200, "text/text", "OK"); - }); - server.on("/ssidap", HTTP_GET, [](AsyncWebServerRequest * request) { - if (request->hasArg("ssidAP")) { - jsonWriteStr(configSetup, "ssidAP", request->getParam("ssidAP")->value()); - } - if (request->hasArg("passwordAP")) { - jsonWriteStr(configSetup, "passwordAP", request->getParam("passwordAP")->value()); - } - saveConfig(); - request->send(200, "text/text", "OK"); - }); - server.on("/web", HTTP_GET, [](AsyncWebServerRequest * request) { - if (request->hasArg("web_login")) { - jsonWriteStr(configSetup, "web_login", request->getParam("web_login")->value()); - } - if (request->hasArg("web_pass")) { - jsonWriteStr(configSetup, "web_pass", request->getParam("web_pass")->value()); - } - saveConfig(); - //Web_server_init(); - request->send(200, "text/text", "OK"); - }); - server.on("/restart", HTTP_GET, [](AsyncWebServerRequest * request) { - if (request->hasArg("device")) { - if (request->getParam("device")->value() == "ok") ESP.restart(); - } - request->send(200, "text/text", "OK"); - }); - /****************************************************************************** - **********************************MQTT**************************************** - ******************************************************************************/ - server.on("/mqttSave", HTTP_GET, [](AsyncWebServerRequest * request) { - if (request->hasArg("mqttServer")) { - jsonWriteStr(configSetup, "mqttServer", request->getParam("mqttServer")->value()); - } - if (request->hasArg("mqttPort")) { - int port = (request->getParam("mqttPort")->value()).toInt(); - jsonWriteInt(configSetup, "mqttPort", port); - } - if (request->hasArg("mqttPrefix")) { - jsonWriteStr(configSetup, "mqttPrefix", request->getParam("mqttPrefix")->value()); - } - if (request->hasArg("mqttUser")) { - jsonWriteStr(configSetup, "mqttUser", request->getParam("mqttUser")->value()); - } - if (request->hasArg("mqttPass")) { - jsonWriteStr(configSetup, "mqttPass", request->getParam("mqttPass")->value()); - } - saveConfig(); - mqtt_connection = true; - request->send(200, "text/text", "ok"); - }); - server.on("/mqttCheck", HTTP_GET, [](AsyncWebServerRequest * request) { - String tmp = "{}"; - jsonWriteStr(tmp, "title", "" + stateMQTT()); - jsonWriteStr(tmp, "class", "pop-up"); - request->send(200, "text/text", tmp); - }); - /****************************************************************************** - **********************************PUSH***************************************** - ******************************************************************************/ -#ifdef push_enable - server.on("/pushingboxDate", HTTP_GET, [](AsyncWebServerRequest * request) { - if (request->hasArg("pushingbox_id")) { - jsonWriteStr(configSetup, "pushingbox_id", request->getParam("pushingbox_id")->value()); - } - saveConfig(); - request->send(200, "text/text", "ok"); - }); -#endif - /****************************************************************************** - **********************************PRESETS************************************** - ******************************************************************************/ - server.on("/preset", HTTP_GET, [](AsyncWebServerRequest * request) { - String value; - if (request->hasArg("arg")) { - value = request->getParam("arg")->value(); - } - if (value == "1") { - writeFile("firmware.c.txt", readFile("configs/relay.c.txt", 2048)); - writeFile("firmware.s.txt", readFile("configs/relay.s.txt", 2048)); - } - if (value == "2") { - writeFile("firmware.c.txt", readFile("configs/relay_t.c.txt", 2048)); - writeFile("firmware.s.txt", readFile("configs/relay_t.s.txt", 2048)); - } - if (value == "3") { - writeFile("firmware.c.txt", readFile("configs/relay_c.c.txt", 2048)); - writeFile("firmware.s.txt", readFile("configs/relay_c.s.txt", 2048)); - } - if (value == "4") { - writeFile("firmware.c.txt", readFile("configs/relay_s.c.txt", 2048)); - writeFile("firmware.s.txt", readFile("configs/relay_s.s.txt", 2048)); - } - if (value == "5") { - writeFile("firmware.c.txt", readFile("configs/relay_sw.c.txt", 2048)); - writeFile("firmware.s.txt", readFile("configs/relay_sw.s.txt", 2048)); - } - if (value == "6") { - writeFile("firmware.c.txt", readFile("configs/relay_br.c.txt", 2048)); - writeFile("firmware.s.txt", readFile("configs/relay_br.s.txt", 2048)); - } - if (value == "7") { - writeFile("firmware.c.txt", readFile("configs/relay_sr.c.txt", 2048)); - writeFile("firmware.s.txt", readFile("configs/relay_sr.s.txt", 2048)); - } - if (value == "8") { - writeFile("firmware.c.txt", readFile("configs/pwm.c.txt", 2048)); - writeFile("firmware.s.txt", readFile("configs/pwm.s.txt", 2048)); - } - if (value == "9") { - writeFile("firmware.c.txt", readFile("configs/dht11.c.txt", 2048)); - writeFile("firmware.s.txt", readFile("configs/dht11.s.txt", 2048)); - } - if (value == "10") { - writeFile("firmware.c.txt", readFile("configs/dht22.c.txt", 2048)); - writeFile("firmware.s.txt", readFile("configs/dht22.s.txt", 2048)); - } - if (value == "11") { - writeFile("firmware.c.txt", readFile("configs/analog.c.txt", 2048)); - writeFile("firmware.s.txt", readFile("configs/analog.s.txt", 2048)); - } - if (value == "12") { - writeFile("firmware.c.txt", readFile("configs/dallas.c.txt", 2048)); - writeFile("firmware.s.txt", readFile("configs/dallas.s.txt", 2048)); - } - if (value == "13") { - writeFile("firmware.c.txt", readFile("configs/termostat.c.txt", 2048)); - writeFile("firmware.s.txt", readFile("configs/termostat.s.txt", 2048)); - } - if (value == "14") { - writeFile("firmware.c.txt", readFile("configs/level.c.txt", 2048)); - writeFile("firmware.s.txt", readFile("configs/level.s.txt", 2048)); - } - if (value == "15") { - writeFile("firmware.c.txt", readFile("configs/moution_r.c.txt", 2048)); - writeFile("firmware.s.txt", readFile("configs/moution_r.s.txt", 2048)); - } - if (value == "16") { - writeFile("firmware.c.txt", readFile("configs/moution_s.c.txt", 2048)); - writeFile("firmware.s.txt", readFile("configs/moution_s.s.txt", 2048)); - } - if (value == "17") { - writeFile("firmware.c.txt", readFile("configs/stepper.c.txt", 2048)); - writeFile("firmware.s.txt", readFile("configs/stepper.s.txt", 2048)); - } - if (value == "18") { - writeFile("firmware.c.txt", readFile("configs/servo.c.txt", 2048)); - writeFile("firmware.s.txt", readFile("configs/servo.s.txt", 2048)); - } - if (value == "19") { - writeFile("firmware.c.txt", readFile("configs/firmware.c.txt", 2048)); - writeFile("firmware.s.txt", readFile("configs/firmware.s.txt", 2048)); - } - Device_init(); - Scenario_init(); - request->redirect("/?configuration"); - }); - /****************************************************************************** - **********************************UDP****************************************** - ******************************************************************************/ - server.on("/name", HTTP_GET, [](AsyncWebServerRequest * request) { - if (request->hasArg("arg")) { - jsonWriteStr(configSetup, "name", request->getParam("arg")->value()); - jsonWriteStr(configJson, "name", request->getParam("arg")->value()); - saveConfig(); - } - request->send(200, "text/text", "OK"); - }); } diff --git a/Web_server.ino b/Web_server.ino index f4e01087..b9d77cf6 100644 --- a/Web_server.ino +++ b/Web_server.ino @@ -48,9 +48,9 @@ void Web_server_init() { **************************************WEB**************************************** *********************************************************************************/ #ifdef ESP32 - server.addHandler(new SPIFFSEditor(SPIFFS, jsonReadStr(configSetup, "web_login").c_str(), jsonReadStr(configSetup, "web_pass").c_str())); + server.addHandler(new SPIFFSEditor(SPIFFS, jsonReadStr(configSetupJson, "web_login").c_str(), jsonReadStr(configSetupJson, "web_pass").c_str())); #elif defined(ESP8266) - server.addHandler(new SPIFFSEditor(jsonReadStr(configSetup, "web_login").c_str(), jsonReadStr(configSetup, "web_pass").c_str())); + server.addHandler(new SPIFFSEditor(jsonReadStr(configSetupJson, "web_login").c_str(), jsonReadStr(configSetupJson, "web_pass").c_str())); #endif /* server.on("/heap", HTTP_GET, [](AsyncWebServerRequest * request) { @@ -60,9 +60,10 @@ void Web_server_init() { server.serveStatic("/css/", SPIFFS, "/css/").setCacheControl("max-age=31536000"); server.serveStatic("/js/", SPIFFS, "/js/").setCacheControl("max-age=31536000"); server.serveStatic("/favicon.ico", SPIFFS, "/favicon.ico").setCacheControl("max-age=31536000"); + server.serveStatic("/icon.jpeg", SPIFFS, "/icon.jpeg").setCacheControl("max-age=31536000"); server.serveStatic("/", SPIFFS, "/").setDefaultFile("index.htm") - .setAuthentication(jsonReadStr(configSetup, "web_login").c_str(), jsonReadStr(configSetup, "web_pass").c_str()); + .setAuthentication(jsonReadStr(configSetupJson, "web_login").c_str(), jsonReadStr(configSetupJson, "web_pass").c_str()); server.onNotFound([](AsyncWebServerRequest * request) { Serial.printf("NOT_FOUND: "); @@ -133,15 +134,15 @@ void Web_server_init() { // --------------------Выдаем данные configJson //config.live.json - динамические данные server.on("/config.live.json", HTTP_GET, [](AsyncWebServerRequest * request) { - request->send(200, "application/json", configJson); + request->send(200, "application/json", configLiveJson); }); // --------------------Выдаем данные optionJson //config.option.json - данные не являющиеся событиями server.on("/config.option.json", HTTP_GET, [](AsyncWebServerRequest * request) { - request->send(200, "application/json", optionJson); + request->send(200, "application/json", configOptionJson); }); // -------------------Выдаем данные configSetup //config.setup.json - для хранения постоянных данных server.on("/config.setup.json", HTTP_GET, [](AsyncWebServerRequest * request) { - request->send(200, "application/json", configSetup); + request->send(200, "application/json", configSetupJson); }); // ------------------Выполнение команды из запроса diff --git a/WiFi.ino b/WiFi.ino index a4af35cd..dddf59b6 100644 --- a/WiFi.ino +++ b/WiFi.ino @@ -5,8 +5,8 @@ void ROUTER_Connecting() { WiFi.mode(WIFI_STA); byte tries = 20; - String _ssid = jsonReadStr(configSetup, "ssid"); - String _password = jsonReadStr(configSetup, "password"); + String _ssid = jsonReadStr(configSetupJson, "routerssid"); + String _password = jsonReadStr(configSetupJson, "routerpass"); //WiFi.persistent(false); if (_ssid == "" && _password == "") { @@ -24,7 +24,7 @@ void ROUTER_Connecting() { if (WiFi.status() == WL_CONNECT_FAILED) { Serial.println("[E] password is not correct"); tries = 1; - jsonWriteInt(optionJson, "pass_status", 1); + jsonWriteInt(configOptionJson, "pass_status", 1); } Serial.print("."); delay(1000); @@ -46,7 +46,7 @@ void ROUTER_Connecting() { Serial.print("[V] IP address: http://"); Serial.print(WiFi.localIP()); Serial.println(""); - jsonWriteStr(configJson, "ip", WiFi.localIP().toString()); + jsonWriteStr(configSetupJson, "ip", WiFi.localIP().toString()); led_blink("off"); //add_dev_in_list("dev.txt", chipID, WiFi.localIP().toString()); MQTT_init(); @@ -59,19 +59,19 @@ bool StartAPMode() { WiFi.mode(WIFI_AP); - String _ssidAP = jsonReadStr(configSetup, "ssidAP"); - String _passwordAP = jsonReadStr(configSetup, "passwordAP"); + String _ssidAP = jsonReadStr(configSetupJson, "apssid"); + String _passwordAP = jsonReadStr(configSetupJson, "appass"); WiFi.softAP(_ssidAP.c_str(), _passwordAP.c_str()); IPAddress myIP = WiFi.softAPIP(); led_blink("on"); Serial.print("AP IP address: "); Serial.println(myIP); - jsonWriteStr(configJson, "ip", myIP.toString()); + jsonWriteStr(configSetupJson, "ip", myIP.toString()); - //if (jsonReadInt(optionJson, "pass_status") != 1) { + //if (jsonReadInt(configOptionJson, "pass_status") != 1) { ts.add(ROUTER_SEARCHING, 10 * 1000, [&](void*) { Serial.println("->try find router"); - if (RouterFind(jsonReadStr(configSetup, "ssid"))) { + if (RouterFind(jsonReadStr(configSetupJson, "routerssid"))) { ts.remove(ROUTER_SEARCHING); WiFi.scanDelete(); ROUTER_Connecting(); @@ -132,12 +132,12 @@ boolean RouterFind(String ssid) { for (uint8_t i = 0; i < n; i++) { JsonObject& data = networks.createNestedObject(); String ssidMy = WiFi.SSID(i); - data["ssid"] = ssidMy; + data["routerssid"] = ssidMy; data["pass"] = (WiFi.encryptionType(i) == ENC_TYPE_NONE) ? "" : "*"; int8_t dbm = WiFi.RSSI(i); data["dbm"] = dbm; - if (ssidMy == jsonReadStr(configSetup, "ssid")) { - jsonWriteStr(configJson, "dbm", dbm); + if (ssidMy == jsonReadStr(configSetupJson, "routerssid")) { + jsonWriteStr(configLiveJson, "dbm", dbm); } } String root; @@ -149,14 +149,14 @@ boolean RouterFind(String ssid) { { "type":"wifi", "title":"{{LangWiFi1}}", - "name":"ssid", + "name":"routerssid", "state":"{{ssid}}", "pattern":".{1,}" }, { - "type":"password", + "type":"routerpass", "title":"{{LangPass}}", - "name":"ssidPass", + "name":"routerpass", "state":"{{ssidPass}}", "pattern":".{8,}" }, diff --git a/bus.ino b/bus.ino index 17486aab..447c5c78 100644 --- a/bus.ino +++ b/bus.ino @@ -5,10 +5,10 @@ void do_i2c_scanning() { if (tmp == "error") { tmp = i2c_scan(); Serial.println(tmp); - jsonWriteStr(configJson, "i2c", tmp); + jsonWriteStr(configLiveJson, "i2c", tmp); } else { Serial.println(tmp); - jsonWriteStr(configJson, "i2c", tmp); + jsonWriteStr(configLiveJson, "i2c", tmp); } } } diff --git a/data/config.json b/data/config.json index daf66cda..bd69a709 100644 --- a/data/config.json +++ b/data/config.json @@ -1,10 +1,10 @@ { "name": "IoTmanager", "chipID": "", - "ssidAP": "WiFi2", - "passwordAP": "", - "ssid": "rise", - "password": "hostel3333", + "apssid": "IoTmanager", + "appass": "", + "routerssid": "rise", + "routerpass": "hostel3333", "timezone": 2, "ntp": "pool.ntp.org", "mqttServer": "91.204.228.124", @@ -13,8 +13,8 @@ "mqttUser": "test", "mqttPass": "test", "scen": "1", - "pushingbox_id": "v7C133E426B0C69E", - "web_login": "admin", - "web_pass": "admin", + "pushingboxid": "v7C133E426B0C69E", + "weblogin": "admin", + "webpass": "admin", "udponoff": "1" } \ No newline at end of file diff --git a/data/configs/relay.c.txt b/data/configs/1-relay.c.txt similarity index 100% rename from data/configs/relay.c.txt rename to data/configs/1-relay.c.txt diff --git a/data/configs/analog.s.txt b/data/configs/1-relay.s.txt similarity index 100% rename from data/configs/analog.s.txt rename to data/configs/1-relay.s.txt diff --git a/data/configs/dht22.c.txt b/data/configs/10-dht22.c.txt similarity index 100% rename from data/configs/dht22.c.txt rename to data/configs/10-dht22.c.txt diff --git a/data/configs/dallas.s.txt b/data/configs/10-dht22.s.txt similarity index 100% rename from data/configs/dallas.s.txt rename to data/configs/10-dht22.s.txt diff --git a/data/configs/analog.c.txt b/data/configs/11-analog.c.txt similarity index 100% rename from data/configs/analog.c.txt rename to data/configs/11-analog.c.txt diff --git a/data/configs/dht11.s.txt b/data/configs/11-analog.s.txt similarity index 100% rename from data/configs/dht11.s.txt rename to data/configs/11-analog.s.txt diff --git a/data/configs/dallas.c.txt b/data/configs/12-dallas.c.txt similarity index 100% rename from data/configs/dallas.c.txt rename to data/configs/12-dallas.c.txt diff --git a/data/configs/dht22.s.txt b/data/configs/12-dallas.s.txt similarity index 100% rename from data/configs/dht22.s.txt rename to data/configs/12-dallas.s.txt diff --git a/data/configs/termostat.c.txt b/data/configs/13-termostat.c.txt similarity index 100% rename from data/configs/termostat.c.txt rename to data/configs/13-termostat.c.txt diff --git a/data/configs/termostat.s.txt b/data/configs/13-termostat.s.txt similarity index 100% rename from data/configs/termostat.s.txt rename to data/configs/13-termostat.s.txt diff --git a/data/configs/level.c.txt b/data/configs/14-level.c.txt similarity index 100% rename from data/configs/level.c.txt rename to data/configs/14-level.c.txt diff --git a/data/configs/level.s.txt b/data/configs/14-level.s.txt similarity index 100% rename from data/configs/level.s.txt rename to data/configs/14-level.s.txt diff --git a/data/configs/moution_r.c.txt b/data/configs/15-moution.c.txt similarity index 100% rename from data/configs/moution_r.c.txt rename to data/configs/15-moution.c.txt diff --git a/data/configs/moution_r.s.txt b/data/configs/15-moution.s.txt similarity index 100% rename from data/configs/moution_r.s.txt rename to data/configs/15-moution.s.txt diff --git a/data/configs/moution_s.c.txt b/data/configs/16-moution.c.txt similarity index 100% rename from data/configs/moution_s.c.txt rename to data/configs/16-moution.c.txt diff --git a/data/configs/moution_s.s.txt b/data/configs/16-moution.s.txt similarity index 100% rename from data/configs/moution_s.s.txt rename to data/configs/16-moution.s.txt diff --git a/data/configs/stepper.c.txt b/data/configs/17-stepper.c.txt similarity index 100% rename from data/configs/stepper.c.txt rename to data/configs/17-stepper.c.txt diff --git a/data/configs/stepper.s.txt b/data/configs/17-stepper.s.txt similarity index 100% rename from data/configs/stepper.s.txt rename to data/configs/17-stepper.s.txt diff --git a/data/configs/servo.c.txt b/data/configs/18-servo.c.txt similarity index 100% rename from data/configs/servo.c.txt rename to data/configs/18-servo.c.txt diff --git a/data/configs/servo.s.txt b/data/configs/18-servo.s.txt similarity index 100% rename from data/configs/servo.s.txt rename to data/configs/18-servo.s.txt diff --git a/data/configs/relay_t.c.txt b/data/configs/2-relay.c.txt similarity index 100% rename from data/configs/relay_t.c.txt rename to data/configs/2-relay.c.txt diff --git a/data/configs/relay_t.s.txt b/data/configs/2-relay.s.txt similarity index 100% rename from data/configs/relay_t.s.txt rename to data/configs/2-relay.s.txt diff --git a/data/configs/relay_c.c.txt b/data/configs/3-relay.c.txt similarity index 100% rename from data/configs/relay_c.c.txt rename to data/configs/3-relay.c.txt diff --git a/data/configs/relay_c.s.txt b/data/configs/3-relay.s.txt similarity index 100% rename from data/configs/relay_c.s.txt rename to data/configs/3-relay.s.txt diff --git a/data/configs/relay_s.c.txt b/data/configs/4-relay.c.txt similarity index 100% rename from data/configs/relay_s.c.txt rename to data/configs/4-relay.c.txt diff --git a/data/configs/relay_s.s.txt b/data/configs/4-relay.s.txt similarity index 100% rename from data/configs/relay_s.s.txt rename to data/configs/4-relay.s.txt diff --git a/data/configs/relay_sw.c.txt b/data/configs/5-relay.c.txt similarity index 100% rename from data/configs/relay_sw.c.txt rename to data/configs/5-relay.c.txt diff --git a/data/configs/relay_sw.s.txt b/data/configs/5-relay.s.txt similarity index 100% rename from data/configs/relay_sw.s.txt rename to data/configs/5-relay.s.txt diff --git a/data/configs/relay_br.c.txt b/data/configs/6-relay.c.txt similarity index 100% rename from data/configs/relay_br.c.txt rename to data/configs/6-relay.c.txt diff --git a/data/configs/relay_br.s.txt b/data/configs/6-relay.s.txt similarity index 100% rename from data/configs/relay_br.s.txt rename to data/configs/6-relay.s.txt diff --git a/data/configs/relay_sr.c.txt b/data/configs/7-relay.c.txt similarity index 100% rename from data/configs/relay_sr.c.txt rename to data/configs/7-relay.c.txt diff --git a/data/configs/relay_sr.s.txt b/data/configs/7-relay.s.txt similarity index 100% rename from data/configs/relay_sr.s.txt rename to data/configs/7-relay.s.txt diff --git a/data/configs/pwm.c.txt b/data/configs/8-pwm.c.txt similarity index 100% rename from data/configs/pwm.c.txt rename to data/configs/8-pwm.c.txt diff --git a/data/configs/pwm.s.txt b/data/configs/8-pwm.s.txt similarity index 100% rename from data/configs/pwm.s.txt rename to data/configs/8-pwm.s.txt diff --git a/data/configs/dht11.c.txt b/data/configs/9-dht11.c.txt similarity index 100% rename from data/configs/dht11.c.txt rename to data/configs/9-dht11.c.txt diff --git a/data/configs/relay.s.txt b/data/configs/9-dht11.s.txt similarity index 100% rename from data/configs/relay.s.txt rename to data/configs/9-dht11.s.txt diff --git a/data/configs/relay_rm.c.txt b/data/configs/relay_rm.c.txt deleted file mode 100644 index 92abc26d..00000000 --- a/data/configs/relay_rm.c.txt +++ /dev/null @@ -1,3 +0,0 @@ -switch 1 0 10 - -//физическая кнопка номер 1 подключенная к пину 0, задержка от дребезга 10 мс \ No newline at end of file diff --git a/data/configs/relay_rm.s.txt b/data/configs/relay_rm.s.txt deleted file mode 100644 index 827e1495..00000000 --- a/data/configs/relay_rm.s.txt +++ /dev/null @@ -1,3 +0,0 @@ -switch1 = 1 -mqtt 3233662-1589489 buttonChange_1 -end \ No newline at end of file diff --git a/data/icon.jpeg b/data/icon.jpeg new file mode 100644 index 0000000000000000000000000000000000000000..abdd18c00ecd49330a896317621726204bdf4bac GIT binary patch literal 15396 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 literal 0 HcmV?d00001 diff --git a/data/index.json b/data/index.json index bd0b9d88..1b6413ad 100644 --- a/data/index.json +++ b/data/index.json @@ -1,7 +1,8 @@ { "configs": [ "/config.live.json", - "/config.setup.json" + "/config.setup.json", + "/lang/lang.ru.json" ], "title": "Главная", "class": "col-sm-offset-1 col-sm-10 col-md-offset-2 col-md-8 col-lg-offset-3 col-lg-6", @@ -12,41 +13,16 @@ "class": "alert-default" }, { - "type": "h4", - "title": "Device ID: {{chipID}}" - }, - { - "type": "h4", - "title": "IP address: {{ip}}" - }, - { - "type": "h4", - "title": "Uptime: {{uptime}}" - }, - { - "type": "h4", - "title": "Time: {{time}}" - }, - { - "type": "h4", - "title": "Build version: {{firmware_version}}" - }, - { - "type": "h4", - "title": "SPIFFS version: 2.3.3" - }, - { - "type": "hr" - }, + "type": "text", + "class": "alert alert-light", + "title": "
IoT Manager
" + }, { "type": "link", "title": "Конфигурация устройства", "action": "/?set.device", "class": "btn btn-block btn-default" }, - { - "type": "hr" - }, { "type": "link", "title": "Список других устройств в сети", @@ -77,25 +53,6 @@ "action": "/?set.utilities", "class": "btn btn-block btn-default" }, - { - "type": "h3", - "name": "my-block", - "style": "position:fixed;top:50%;left:50%;width:400px;margin-left:-200px;text-align:center;", - "class": "hidden" - }, - { - "type": "hr" - }, - { - "type": "button", - "title": "Обновить прошивку", - "action": "/check", - "response": "[[my-block]]", - "class": "btn btn-block btn-default" - }, - { - "type": "hr" - }, { "type": "link", "title": "Скачать приложение IoT Manager для android", diff --git a/data/lang/lang.ru.json b/data/lang/lang.ru.json index 9b80f156..9d4d1929 100644 --- a/data/lang/lang.ru.json +++ b/data/lang/lang.ru.json @@ -7,14 +7,32 @@ "SetUDPList": "Список других устройств в сети:", - "SetUDPWarn1": "После нажатия на кнопку 'Переформировать список устройств' ждите примерно минуту, а затем обновите страницу и список появится вновь", + "SetUDPWarn1": "После нажатия на кнопку переформировать список устройств ждите примерно минуту, а затем обновите страницу и список появится вновь", "SetUDPUpdateList":"Переформировать список устройств", "SetUDPUpdatePage":"Обновить страницу", "SetUDPNameOfDev":"Имя этого устройства:", "SetUDPDateExchange":"Включить обмен данными между устройствами", - "SetUDPWarn2":"Если обмен данными включен, то устройства будут обмениваться широковещательными пакетами udp для формирования списка устройств и для осуществления посылки настроек mqtt. Данный обмен создает дополнительную нагрузку на wifi сеть." + "SetUDPWarn2":"Если обмен данными включен, то устройства будут обмениваться широковещательными пакетами udp для формирования списка устройств и для осуществления посылки настроек mqtt. Данный обмен создает дополнительную нагрузку на wifi сеть.", + "SetWiFiNameOfDev":"Имя устройства:", + "SetWiFiRouterConnect":"Подключение к WiFi роутеру:", + "SetWiFiAccessPoint":"Точка доступа:", + "SetWiFiWeb":"Логин и пароль web interface:", + "SetWiFiTimeZone":"Временная зона:", + "SetWiFiNTP":"Сервер NTP:", + "SetWiFiWarn1":"Имя устройства должно состоять из английских букв и иметь длинну от 6 до 12 символов", + "SetWiFiWarn2":"После того как вы введете логин пароль от вашего wifi роутера необходимо нажать кнопку сохранить, а затем обязательно нажать кнопку перезагрузить устройство внизу этой страницы", + "SetWiFiWarn3":"Устройство постоянно сканирует сеть на наличие wifi. Если роутер отключен, то устройство автоматически перейдет в режим точки доступа. Когда wifi появится устройство автоматически подключится к роутеру снова, и выключит точку доступа", + "SetWiFiWarn4":"После изменения поля NTP сервер необходимо перезагрузить устройство", + "SetMQTTServerName":"Имя сервера:", + "SetMQTTPort":"Номер порта:", + "SetMQTTPrefix":"Префикс:", + "SetMQTTUserName":"Имя пользователя:", + "SetMQTTPassword":"Пароль:", + "SetMQTTSendSettings":"Отправить настройки MQTT с этого устройства на все остальные", + "SetMQTTWarn1":"Обратите внимание что поле префикс может состоять только из одного слова и одного разделителя: /prefix, вариант вида: /prefix1/prefix2 работать не будет. После изменения поля prefix необходимо перезагрузить устройство", + "SetMQTTWarn2":"Прежде чем нажимать на кнопку Отправить настройки MQTT сохрание их, если Вы их меняли. Настройки получат и перезапишут все устройства в локальной сети" } \ No newline at end of file diff --git a/data/set.device.json b/data/set.device.json index c35189ec..2cb731a6 100644 --- a/data/set.device.json +++ b/data/set.device.json @@ -2,6 +2,7 @@ "configs": [ "/config.setup.json", "/config.option.json", + "/config.live.json", "/lang/lang.ru.json" ], "class": "col-sm-offset-1 col-sm-10", @@ -11,6 +12,15 @@ "title": "{{name}}", "class": "alert-default" }, + { + "type": "link", + "title": "{{ButMainPage}}", + "action": "/", + "class": "btn btn-block btn-default" + }, + { + "type": "hr" + }, { "type": "h4", "title": "Device ID: {{chipID}}" @@ -19,13 +29,21 @@ "type": "h4", "title": "IP address: {{ip}}" }, + { + "type": "h4", + "title": "Time: {{time}}" + }, { "type": "h4", "title": "Uptime: {{uptime}}" }, { "type": "h4", - "title": "Time: {{time}}" + "title": "Build version: {{firmware_version}}" + }, + { + "type": "h4", + "title": "SPIFFS version: 2.3.3" }, { "type": "hr" @@ -37,25 +55,25 @@ "style": "display:inline", "title": { "#": "{{SetDevPreset}}", - "/preset?arg=1": "1.Вкл. выкл. локального реле", - "/preset?arg=2": "2.Вкл. выкл. локального реле в определенное время", - "/preset?arg=3": "3.Вкл. выкл. локального реле на определенный период времени", - "/preset?arg=4": "4.Вкл. выкл. нескольких локальных реле кнопкой в приложении", - "/preset?arg=5": "5.Вкл. выкл. локального реле физической кнопкой и кнопкой в приложении параллельно (для выключателя света)", - "/preset?arg=6": "6.Вкл. выкл. нескольких удаленных реле кнопкой в приложении (нужно указать Device ID)", - "/preset?arg=7": "7.Вкл. выкл. нескольких удаленных реле физической кнопкой (нужно указать Device ID)", - "/preset?arg=8": "8.Широтно импульсная модуляция", - "/preset?arg=9": "9.Сенсор DHT11 и логгирование", - "/preset?arg=10": "10.Сенсор DHT22, DHT33, DHT44, AM2302, RHT03 и логгирование", - "/preset?arg=11": "11.Аналоговый сенсор и логгирование", - "/preset?arg=12": "12.Сенсор DS18B20 и логгирование", - "/preset?arg=13": "13.Термостат на DS18B20 с переключением в ручной режим и логгированием", - "/preset?arg=14": "14.Контроль уровня в баке на сенсорах: JSN-SR04T, HC-SR04, HY-SRF05 и логгирование (управление насосом)", - "/preset?arg=15": "15.Датчик движения включающий свет", - "/preset?arg=16": "16.Охранный датчик движения", - "/preset?arg=17": "17.Система управления шаговыми двигателями на основе драйвера A4988 (открытие закрытие штор)", - "/preset?arg=18": "18.Система управления сервоприводами", - "/preset?arg=19": "Настройки по умолчанию" + "/set?preset=1": "1.Вкл. выкл. локального реле", + "/set?preset=2": "2.Вкл. выкл. локального реле в определенное время", + "/set?preset=3": "3.Вкл. выкл. локального реле на определенный период времени", + "/set?preset=4": "4.Вкл. выкл. нескольких локальных реле кнопкой в приложении", + "/set?preset=5": "5.Вкл. выкл. локального реле физической кнопкой и кнопкой в приложении параллельно (для выключателя света)", + "/set?preset=6": "6.Вкл. выкл. нескольких удаленных реле кнопкой в приложении (нужно указать Device ID)", + "/set?preset=7": "7.Вкл. выкл. нескольких удаленных реле физической кнопкой (нужно указать Device ID)", + "/set?preset=8": "8.Широтно импульсная модуляция", + "/set?preset=9": "9.Сенсор DHT11 и логгирование", + "/set?preset=10": "10.Сенсор DHT22, DHT33, DHT44, AM2302, RHT03 и логгирование", + "/set?preset=11": "11.Аналоговый сенсор и логгирование", + "/set?preset=12": "12.Сенсор DS18B20 и логгирование", + "/set?preset=13": "13.Термостат на DS18B20 с переключением в ручной режим и логгированием", + "/set?preset=14": "14.Контроль уровня в баке на сенсорах: JSN-SR04T, HC-SR04, HY-SRF05 и логгирование (управление насосом)", + "/set?preset=15": "15.Датчик движения включающий свет", + "/set?preset=16": "16.Охранный датчик движения", + "/set?preset=17": "17.Система управления шаговыми двигателями на основе драйвера A4988 (открытие закрытие штор)", + "/set?preset=18": "18.Система управления сервоприводами", + "/set?preset=19": "Настройки по умолчанию" } }, { @@ -65,17 +83,11 @@ { "type": "file", "state": "firmware.c.txt", - "style": "width:100%;height:400px", + "style": "width:100%;height:350px", "title": "Сохранить", "action": "/set?devinit", "class": "btn btn-block btn-default" }, - { - "type": "link", - "title": "Инструкция", - "action": "https://github.com/DmitryBorisenko33/esp32-esp8266_iot-manager_modules_firmware/wiki/Instruction", - "class": "btn btn-block btn-default" - }, { "type": "h2", "title": "Сценарии" @@ -90,25 +102,40 @@ { "type": "file", "state": "firmware.s.txt", - "style": "width:100%;height:400px", + "style": "width:100%;height:350px", "title": "Сохранить", "action": "/set?sceninit", - "class": "btn btn-block btn-success" + "class": "btn btn-block btn-default" }, + { - "type": "hr" + "type": "link", + "title": "Инструкция к системе автоматизации", + "action": "https://github.com/DmitryBorisenko33/esp32-esp8266_iot-manager_modules_firmware/wiki/Instruction", + "class": "btn btn-block btn-default" }, { "type": "link", "title": "Очистить логи сенсоров", "action": "/set?cleanlog", - "class": "btn btn-block btn-success" + "class": "btn btn-block btn-default" }, { - "type": "link", - "title": "Главная", - "action": "/", - "class": "btn btn-block btn-danger btn-sm" + "type": "hr" + }, + { + "type": "h3", + "name": "my-block", + "style": "position:fixed;top:50%;left:50%;width:400px;margin-left:-200px;text-align:center;", + "class": "hidden" + }, + + { + "type": "button", + "title": "Обновить прошивку устройства", + "action": "/check", + "response": "[[my-block]]", + "class": "btn btn-block btn-default" } ] } \ No newline at end of file diff --git a/data/set.mqtt.json b/data/set.mqtt.json index 0bd4acc5..a088c2dc 100644 --- a/data/set.mqtt.json +++ b/data/set.mqtt.json @@ -1,68 +1,85 @@ { "configs": [ - "/config.setup.json" + "/config.setup.json", + "/lang/lang.ru.json" ], "class": "col-sm-offset-1 col-sm-10 col-md-offset-2 col-md-8 col-lg-offset-3 col-lg-6", "content": [ { "type": "h5", "title": "{{name}}", - "class": "alert-warning" + "class": "alert-default" + }, { - "type": "text", - "class": "alert alert-warning", - "title": "Обратите внимание что поле prefix может состоять только из одного слова и одного разделителя: /prefix, вариант вида: /prefix1/prefix2 работать не будет. После изменения поля prefix необходимо перезагрузить устройство" + "type": "link", + "title": "{{ButMainPage}}", + "action": "/", + "class": "btn btn-block btn-default" }, + { + "type": "hr" + }, + { "type": "h4", - "title": "Server name:" + "title": "{{SetMQTTServerName}}", + "style": "width:60%;float:left;" }, { "type": "input", "title": "", - "name": "1", - "state": "{{mqttServer}}" + "name": "mqttServer-arg", + "state": "{{mqttServer}}", + "style": "width:40%;float:right" }, { "type": "h4", - "title": "Port:" + "title": "{{SetMQTTPort}}", + "style": "width:60%;float:left;" }, { "type": "input", "title": "", - "name": "2", - "state": "{{mqttPort}}" + "name": "mqttPort-arg", + "state": "{{mqttPort}}", + "style": "width:40%;float:right" }, { "type": "h4", - "title": "Prefix:" + "title": "{{SetMQTTPrefix}}", + "style": "width:60%;float:left;" }, { "type": "input", "title": "", - "name": "3", - "state": "{{mqttPrefix}}" + "name": "mqttPrefix-arg", + "state": "{{mqttPrefix}}", + "style": "width:40%;float:right" }, { "type": "h4", - "title": "User name:" + "title": "{{SetMQTTUserName}}", + "style": "width:60%;float:left;" }, { "type": "input", "title": "", - "name": "4", - "state": "{{mqttUser}}" + "name": "mqttUser-arg", + "state": "{{mqttUser}}", + "style": "width:40%;float:right" }, { "type": "h4", - "title": "Password:" + "title": "{{SetMQTTPassword}}", + "style": "width:60%;float:left;" }, { "type": "input", "title": "", - "name": "5", - "state": "{{mqttPass}}" + "name": "mqttPass-arg", + "state": "{{mqttPass}}", + "style": "width:40%;float:right" }, { "type": "h3", @@ -70,42 +87,47 @@ "style": "position:fixed;top:30%;left:50%;width:400px;margin-left:-200px;text-align:center;", "class": "hidden" }, + { - "type": "text", - "class": "alert alert-warning", - "title": "Прежде чем нажимать на кнопку 'Отправить настройки MQTT' сохрание их, если Вы их меняли. Настройки получат и перезапишут все устройства в локальной сети" + "type": "button", + "title": "{{ButSave}}", + "style": "width:100%;float:left;", + "action": "set?mqttServer=[[mqttServer-arg]]&mqttPort=[[mqttPort-arg]]&mqttPrefix=[[mqttPrefix-arg]]&mqttUser=[[mqttUser-arg]]&mqttPass=[[mqttPass-arg]]", + "class": "btn btn-block btn-default" }, { "type": "button", - "title": "Сохранить", - "action": "mqttSave?mqttServer=[[1]]&mqttPort=[[2]]&mqttPrefix=[[3]]&mqttUser=[[4]]&mqttPass=[[5]]", - "class": "btn btn-block btn-success" - }, - { - "type": "button", - "title": "Отправить настройки MQTT с этого устройства на все остальные", - "action": "udp?arg=2", - "class": "btn btn-block btn-success" + "style": "width:100%;float:left;", + "title": "{{SetMQTTSendSettings}}", + "action": "set?mqttsend", + "class": "btn btn-block btn-default" }, { "type": "button", + "style": "width:100%;float:left;", "title": "Проверить соединение с MQTT", - "action": "mqttCheck", + "action": "set?mqttcheck", "response": "[[my-block]]", - "class": "btn btn-block btn-success" + "class": "btn btn-block btn-default" + }, + { + "type": "text", + "style": "width:100%;float:left;", + "title": "

{{SetMQTTWarn1}}

" + + }, + { + "type": "text", + "style": "width:100%;float:left;", + "title": "

{{SetMQTTWarn2}}

" }, { "type": "link", + "style": "width:100%;float:left;", "title": "Перезагрузить устройство", "action": "javascript:if(confirm(renameBlock(jsonResponse,'Перезагрузить?'))){send_request(this,'/restart?device=ok');}", - "class": "btn btn-block btn-success" - }, - { - "type": "link", - "title": "Главная", - "action": "/", - "class": "btn btn-block btn-danger btn-sm" + "class": "btn btn-block btn-danger" } ] } \ No newline at end of file diff --git a/data/set.push.json b/data/set.push.json index eac5a080..555797e4 100644 --- a/data/set.push.json +++ b/data/set.push.json @@ -1,46 +1,51 @@ { - "configs": [ -"/config.setup.json" - ], - "class":"col-sm-offset-1 col-sm-10 col-md-offset-2 col-md-8 col-lg-offset-3 col-lg-6", - "content": [ - { - "type": "h5", - "title": "{{name}}", - "class":"alert-warning" - }, - { - "type": "h4", - "title": "Device id:" - }, -{ - "type": "input", - "title": "", - "name":"1", - "state": "{{pushingbox_id}}" - }, - -{ - "type": "button", - "title":"Сохранить", - "action": "pushingboxDate?pushingbox_id=[[1]]", - "class": "btn btn-block btn-success", - "style": "width:100%;display:inline" - }, -{ - "type": "hr" - }, - { - "type": "link", - "title": "Перезагрузить устройство", - "action": "javascript:if(confirm(renameBlock(jsonResponse,'Перезагрузить?'))){send_request(this,'/restart?device=ok');}", - "class": "btn btn-block btn-warning" - }, - { - "type": "link", - "title": "Главная", - "action": "/", - "class": "btn btn-block btn-danger btn-sm" - } - ] -} + "configs": [ + "/config.setup.json", + "/lang/lang.ru.json" + ], + "class": "col-sm-offset-1 col-sm-10 col-md-offset-2 col-md-8 col-lg-offset-3 col-lg-6", + "content": [ + { + "type": "h5", + "title": "{{name}}", + "class": "alert-default" + }, + { + "type": "link", + "title": "{{ButMainPage}}", + "action": "/", + "class": "btn btn-block btn-default" + }, + { + "type": "hr" + }, + { + "type": "h4", + "style": "width:60%;float:left;", + "title": "Device id:" + }, + { + "type": "input", + "title": "", + "name": "push-arg", + "style": "width:40%;float:right", + "state": "{{pushingboxid}}" + }, + { + "type": "button", + "title": "{{ButSave}}", + "action": "set?pushingboxid=[[push-arg]]", + "class": "btn btn-block btn-default", + "style": "width:100%;display:inline" + }, + { + "type": "hr" + }, + { + "type": "link", + "title": "Перезагрузить устройство", + "action": "javascript:if(confirm(renameBlock(jsonResponse,'Перезагрузить?'))){send_request(this,'/restart?device=ok');}", + "class": "btn btn-block btn-danger" + } + ] +} \ No newline at end of file diff --git a/data/set.udp.json b/data/set.udp.json index 7619150c..6bea3042 100644 --- a/data/set.udp.json +++ b/data/set.udp.json @@ -11,6 +11,15 @@ "title": "{{name}}", "class": "alert-default" }, + { + "type": "link", + "title": "{{ButMainPage}}", + "action": "/", + "class": "btn btn-block btn-default" + }, + { + "type": "hr" + }, { "type": "h3", "title": "{{SetUDPList}}" @@ -35,13 +44,13 @@ { "type": "link", "title": "{{SetUDPUpdateList}}", - "action": "set?updatelist", + "action": "/set?updatelist", "class": "btn btn-block btn-default" }, { "type": "link", "title": "{{SetUDPUpdatePage}}", - "action": "set?updatepage", + "action": "/set?updatepage", "class": "btn btn-block btn-default" }, { @@ -49,7 +58,7 @@ }, { "type": "text", - "title": "

{{SetUDPWarn1}}

", + "title": "

{{SetUDPWarn1}}

", "style": "width:100%;float:left;" }, { @@ -59,14 +68,14 @@ { "type": "input", "title": "{{SetUDPNameOfDev}}", - "name": "dev_name", + "name": "devname-arg", "state": "{{name}}", "pattern": "[A-Za-z0-9]{6,12}" }, { "type": "button", "title": "{{ButSave}}", - "action": "name?arg=[[dev_name]]", + "action": "/set?devname=[[devname-arg]]", "class": "btn btn-block btn-default" }, { @@ -81,16 +90,7 @@ }, { "type": "text", - "title": "

{{SetUDPWarn2}}

" - }, - { - "type": "hr" - }, - { - "type": "link", - "title": "{{ButMainPage}}", - "action": "/", - "class": "btn btn-block btn-default" + "title": "

{{SetUDPWarn2}}

" } ] } \ No newline at end of file diff --git a/data/set.utilities.json b/data/set.utilities.json index ee82a0c0..92769f85 100644 --- a/data/set.utilities.json +++ b/data/set.utilities.json @@ -1,7 +1,8 @@ { "configs": [ "/config.live.json", - "/config.setup.json" + "/config.setup.json", + "/lang/lang.ru.json" ], "title": "Главная", "class": "col-sm-offset-1 col-sm-10 col-md-offset-2 col-md-8 col-lg-offset-3 col-lg-6", @@ -9,7 +10,13 @@ { "type": "h5", "title": "{{name}}", - "class": "alert-warning" + "class": "alert-default" + }, + { + "type": "link", + "title": "{{ButMainPage}}", + "action": "/", + "class": "btn btn-block btn-default" }, { "type": "hr" @@ -25,17 +32,8 @@ { "type": "link", "title": "Сканировать", - "action": "/init?arg=5", - "class": "btn btn-block btn-success" - }, - { - "type": "hr" - }, - { - "type": "link", - "title": "Главная", - "action": "/", - "class": "btn btn-block btn-danger" + "action": "/set?itoc", + "class": "btn btn-block btn-default" } ] } \ No newline at end of file diff --git a/data/set.wifi.json b/data/set.wifi.json index 18ebf108..01e5054b 100644 --- a/data/set.wifi.json +++ b/data/set.wifi.json @@ -1,6 +1,7 @@ { "configs": [ - "/config.setup.json" + "/config.setup.json", + "/lang/lang.ru.json" ], "title": "Конфигурация", "class": "col-sm-offset-1 col-sm-10 col-md-offset-2 col-md-8 col-lg-offset-3 col-lg-6", @@ -8,146 +9,154 @@ { "type": "h5", "title": "{{name}}", - "class": "alert-warning" + "class": "alert-default" }, { "type": "link", - "title": "Главная", + "title": "{{ButMainPage}}", "action": "/", - "class": "btn btn-block btn-danger" + "class": "btn btn-block btn-default" }, { "type": "hr" }, { - "type": "h2", - "title": "Имя устройства" + "type": "h3", + "title": "{{SetWiFiNameOfDev}}" }, { "type": "input", - "title": "Имя устройства", - "name": "dev_name", + "title": "{{SetWiFiNameOfDev}}", + "name": "devname-arg", "state": "{{name}}", "pattern": "[A-Za-z0-9]{6,12}" }, { "type": "button", - "title": "Сохранить", - "action": "name?arg=[[dev_name]]", - "class": "btn btn-block btn-success" + "title": "{{ButSave}}", + "action": "set?devname=[[devname-arg]]", + "class": "btn btn-block btn-default" + }, + { + "type": "text", + "title": "

{{SetWiFiWarn1}}

" }, { "type": "hr" }, { - "type": "h2", - "title": "Подключение к Wi-Fi роутеру" + "type": "h3", + "title": "{{SetWiFiRouterConnect}}" }, { "type": "input", - "title": "Сеть", - "name": "ssid", - "state": "{{ssid}}" + "title": "", + "name": "routerssid-arg", + "state": "{{routerssid}}" }, { "type": "password", - "title": "Введите пароль", - "name": "ssidPass", - "state": "{{password}}" + "title": "", + "name": "routerpass-arg", + "state": "{{routerpass}}" }, { "type": "button", - "title": "Сохранить", - "class": "btn btn-block btn-success", - "action": "ssid?ssid=[[ssid]]&password=[[ssidPass]]" + "title": "{{ButSave}}", + "class": "btn btn-block btn-default", + "action": "set?routerssid=[[routerssid-arg]]&routerpass=[[routerpass-arg]]" + }, + { + "type": "text", + "title": "

{{SetWiFiWarn2}}

" }, { "type": "hr" }, { - "type": "h2", - "title": "Точка доступа" + "type": "h3", + "title": "{{SetWiFiAccessPoint}}" }, { "type": "input", - "title": "Имя WI-FI сети", - "name": "ssidap", - "state": "{{ssidAP}}", + "title": "", + "name": "apssid-arg", + "state": "{{apssid}}", "pattern": ".{1,20}" }, { "type": "password", - "title": "Пароль", - "name": "ssidApPass", - "state": "{{passwordAP}}", + "title": "", + "name": "appass-arg", + "state": "{{appass}}", "pattern": ".{8,20}" }, { "type": "button", - "title": "Сохранить", - "action": "ssidap?ssidAP=[[ssidap]]&passwordAP=[[ssidApPass]]", - "class": "btn btn-block btn-success" + "title": "{{ButSave}}", + "action": "set?apssid=[[apssid-arg]]&appass=[[appass-arg]]", + "class": "btn btn-block btn-default" + }, + { + "type": "text", + "title": "

{{SetWiFiWarn3}}

" }, { "type": "hr" }, { - "type": "h2", - "title": "Логин и пароль web interface" + "type": "h3", + "title": "{{SetWiFiWeb}}" }, { "type": "input", "title": "Логин", - "name": "web-login", - "state": "{{web_login}}", + "name": "weblogin-arg", + "state": "{{weblogin}}", "pattern": ".{1,20}" }, { "type": "password", "title": "Пароль", - "name": "web-pass", - "state": "{{web_pass}}", + "name": "webpass-arg", + "state": "{{webpass}}", "pattern": ".{1,20}" }, { "type": "button", - "title": "Сохранить", - "action": "web?web_login=[[web-login]]&web_pass=[[web-pass]]", - "class": "btn btn-block btn-success" + "title": "{{ButSave}}", + "action": "set?weblogin=[[weblogin-arg]]&webpass=[[webpass-arg]]", + "class": "btn btn-block btn-default" }, { "type": "hr" }, { - "type": "h2", - "title": "Временная зона" + "type": "h3", + "title": "{{SetWiFiTimeZone}}" }, { "type": "input", - "title": "Временная зона", - "name": "1", + "title": "", + "name": "timezone-arg", "state": "{{timezone}}", "pattern": ".{1,20}" }, { "type": "input", - "title": "Название ntp сервера", - "name": "2", + "title": "", + "name": "ntp-arg", "state": "{{ntp}}" }, { "type": "button", - "title": "Сохранить", - "action": "time?timezone=[[1]]&ntp=[[2]]", - "class": "btn btn-block btn-success" - }, - { - "type": "hr" + "title": "{{ButSave}}", + "action": "set?timezone=[[timezone-arg]]&ntp=[[ntp-arg]]", + "class": "btn btn-block btn-default" }, { "type": "text", - "class": "alert alert-warning", - "title": "После изменения поля 'NTP сервер' необходимо перезагрузить устройство" + "title": "

{{SetWiFiWarn4}}

" }, { "type": "hr" @@ -155,8 +164,8 @@ { "type": "link", "title": "Перезагрузить устройство", - "action": "javascript:if(confirm(renameBlock(jsonResponse,'Перезагрузить?'))){send_request(this,'/restart?device=ok');}", - "class": "btn btn-block btn-warning" + "action": "javascript:if(confirm(renameBlock(jsonResponse,'Перезагрузить?'))){send_request(this,'/set?device=ok');}", + "class": "btn btn-block btn-danger" } ] } \ No newline at end of file diff --git a/esp32-esp8266_iot-manager_modules_firmware.ino b/esp32-esp8266_iot-manager_modules_firmware.ino index 675d6a53..77f73704 100644 --- a/esp32-esp8266_iot-manager_modules_firmware.ino +++ b/esp32-esp8266_iot-manager_modules_firmware.ino @@ -17,7 +17,7 @@ void setup() { ROUTER_Connecting(); Serial.println("[V] ROUTER_Connecting"); //-------------------------------------------------------------- - statistics_init(); + uptime_init(); Serial.println("[V] statistics_init"); //-------------------------------------------------------------- initUpgrade(); diff --git a/main.ino b/main.ino index 3f505ae8..f9c47149 100644 --- a/main.ino +++ b/main.ino @@ -171,7 +171,7 @@ String u64toStr(uint64_t input) //============================================================================================================== //=============================================CONFIG=========================================================== void saveConfig () { - writeFile("config.json", configSetup); + writeFile("config.json", configSetupJson); } //============================================================================================================== //=============================================STRING=========================================================== @@ -286,7 +286,7 @@ String safeDataToFile(String data, String Folder) { fileName = Folder + "/" + fileName + ".txt"; // addFile(fileName, GetTime() + "/" + data); Serial.println(fileName); - jsonWriteStr(configJson, "test", fileName); + jsonWriteStr(configLiveJson, "test", fileName); } // ------------- Чтение файла в строку ------------------------------------------------------------------------------- String readFile(String fileName, size_t len ) { @@ -350,7 +350,7 @@ String readFileString(String fileName, String found) { //=======================================УПРАВЛЕНИЕ ВИДЖЕТАМИ MQTT========================================================= void sendCONFIG(String topik, String widgetConfig, String key, String date) { yield(); - topik = jsonReadStr(configSetup, "mqttPrefix") + "/" + chipID + "/" + topik + "/status"; + topik = jsonReadStr(configSetupJson, "mqttPrefix") + "/" + chipID + "/" + topik + "/status"; String outer = "{\"widgetConfig\":"; String inner = "{\""; inner = inner + key; diff --git a/mqtt.ino b/mqtt.ino index 9d38e247..abc25564 100644 --- a/mqtt.ino +++ b/mqtt.ino @@ -1,7 +1,6 @@ //===============================================ИНИЦИАЛИЗАЦИЯ================================================ void MQTT_init() { ts.add(WIFI_MQTT_CONNECTION_CHECK, wifi_mqtt_reconnecting, [&](void*) { - up_time(); if (WiFi.status() == WL_CONNECTED) { Serial.println("[VV] WiFi-ok"); if (client_mqtt.connected()) { @@ -41,21 +40,21 @@ void handleMQTT() { } //===============================================ПОДКЛЮЧЕНИЕ======================================================== boolean MQTT_Connecting() { - String mqtt_server = jsonReadStr(configSetup, "mqttServer"); + String mqtt_server = jsonReadStr(configSetupJson, "mqttServer"); if ((mqtt_server != "")) { Serial.println("[E] Lost MQTT connection, start reconnecting"); led_blink("fast"); - client_mqtt.setServer(mqtt_server.c_str(), jsonReadInt(configSetup, "mqttPort")); + client_mqtt.setServer(mqtt_server.c_str(), jsonReadInt(configSetupJson, "mqttPort")); if (WiFi.status() == WL_CONNECTED) { if (!client_mqtt.connected()) { Serial.println("[V] Connecting to MQTT server commenced"); - if (client_mqtt.connect(chipID.c_str(), jsonReadStr(configSetup, "mqttUser").c_str(), jsonReadStr(configSetup, "mqttPass").c_str())) { + if (client_mqtt.connect(chipID.c_str(), jsonReadStr(configSetupJson, "mqttUser").c_str(), jsonReadStr(configSetupJson, "mqttPass").c_str())) { Serial.println("[VV] MQTT connected"); led_blink("off"); client_mqtt.setCallback(callback); - client_mqtt.subscribe(jsonReadStr(configSetup, "mqttPrefix").c_str()); // Для приема получения HELLOW и подтверждения связи - client_mqtt.subscribe((jsonReadStr(configSetup, "mqttPrefix") + "/" + chipID + "/+/control").c_str()); // Подписываемся на топики control - client_mqtt.subscribe((jsonReadStr(configSetup, "mqttPrefix") + "/" + chipID + "/order").c_str()); // Подписываемся на топики order + client_mqtt.subscribe(jsonReadStr(configSetupJson, "mqttPrefix").c_str()); // Для приема получения HELLOW и подтверждения связи + client_mqtt.subscribe((jsonReadStr(configSetupJson, "mqttPrefix") + "/" + chipID + "/+/control").c_str()); // Подписываемся на топики control + client_mqtt.subscribe((jsonReadStr(configSetupJson, "mqttPrefix") + "/" + chipID + "/order").c_str()); // Подписываемся на топики order Serial.println("[V] Callback set, subscribe done"); return true; } else { @@ -123,34 +122,34 @@ void outcoming_date() { //======================================CONFIG================================================== boolean sendMQTT(String end_of_topik, String data) { - String topik = jsonReadStr(configSetup, "mqttPrefix") + "/" + chipID + "/" + end_of_topik; + String topik = jsonReadStr(configSetupJson, "mqttPrefix") + "/" + chipID + "/" + end_of_topik; boolean send_status = client_mqtt.beginPublish(topik.c_str(), data.length(), false); client_mqtt.print(data); client_mqtt.endPublish(); return send_status; } boolean sendCHART(String topik, String data) { - topik = jsonReadStr(configSetup, "mqttPrefix") + "/" + chipID + "/" + topik + "/" + "status"; + topik = jsonReadStr(configSetupJson, "mqttPrefix") + "/" + chipID + "/" + topik + "/" + "status"; boolean send_status = client_mqtt.beginPublish(topik.c_str(), data.length(), false); client_mqtt.print(data); client_mqtt.endPublish(); return send_status; } boolean sendCHART_test(String topik, String data) { - topik = jsonReadStr(configSetup, "mqttPrefix") + "/" + chipID + "/" + topik + "/" + "status"; + topik = jsonReadStr(configSetupJson, "mqttPrefix") + "/" + chipID + "/" + topik + "/" + "status"; boolean send_status = client_mqtt.publish (topik.c_str(), data.c_str(), false); return send_status; } //======================================STATUS================================================== void sendSTATUS(String topik, String state) { - topik = jsonReadStr(configSetup, "mqttPrefix") + "/" + chipID + "/" + topik + "/" + "status"; + topik = jsonReadStr(configSetupJson, "mqttPrefix") + "/" + chipID + "/" + topik + "/" + "status"; String json_ = "{}"; jsonWriteStr(json_, "status", state); int send_status = client_mqtt.publish (topik.c_str(), json_.c_str(), false); } //======================================CONTROL================================================== void sendCONTROL(String id, String topik, String state) { - String all_line = jsonReadStr(configSetup, "mqttPrefix") + "/" + id + "/" + topik + "/control"; + String all_line = jsonReadStr(configSetupJson, "mqttPrefix") + "/" + id + "/" + topik + "/control"; int send_status = client_mqtt.publish (all_line.c_str(), state.c_str(), false); } @@ -197,7 +196,7 @@ void sendAllWigets() { //=====================================================ОТПРАВЛЯЕМ ДАННЫЕ В ВИДЖЕТЫ ПРИ ОБНОВЛЕНИИ СТРАНИЦЫ======================================================== void sendAllData() { //берет строку json и ключи превращает в топики а значения колючей в них посылает - String current_config = configJson; //{"name":"MODULES","lang":"","ip":"192.168.43.60","DS":"34.00","rel1":"1","rel2":"1"} + String current_config = configLiveJson; //{"name":"MODULES","lang":"","ip":"192.168.43.60","DS":"34.00","rel1":"1","rel2":"1"} getMemoryLoad("[i] after send all date"); current_config.replace("{", ""); current_config.replace("}", ""); //"name":"MODULES","lang":"","ip":"192.168.43.60","DS":"34.00","rel1":"1","rel2":"1" @@ -250,7 +249,7 @@ String stateMQTT() { /*void scenario_devices_topiks_subscribe() { //SCENARIO ANALOG > 5 800324-1458415 rel1 0 - if (jsonReadStr(configSetup, "scen") == "1") { + if (jsonReadStr(configSetupJson, "scen") == "1") { //String all_text = readFile("firmware.s.txt", 1024) + "\r\n"; String all_text = scenario + "\r\n"; all_text.replace("\r\n", "\n"); @@ -259,7 +258,7 @@ String stateMQTT() { String line_ = selectToMarker (all_text, "\n"); String id = selectFromMarkerToMarker(line_, " ", 4); if (id != "not found") { - client_mqtt.subscribe((jsonReadStr(configSetup, "mqttPrefix") + "/" + id + "/+/status").c_str(), 0); + client_mqtt.subscribe((jsonReadStr(configSetupJson, "mqttPrefix") + "/" + id + "/+/status").c_str(), 0); Serial.println("subscribed to device, id: " + id); } all_text = deleteBeforeDelimiter(all_text, "\n"); @@ -269,7 +268,7 @@ String stateMQTT() { */ /*void scenario_devices_test_msg_send() { - if (jsonReadStr(configSetup, "scen") == "1") { + if (jsonReadStr(configSetupJson, "scen") == "1") { String all_text = scenario + "\r\n"; all_text.replace("\r\n", "\n"); @@ -279,7 +278,7 @@ String stateMQTT() { String id = selectFromMarkerToMarker(line_, " ", 4); if (id != "not found") { //Serial.println(); - Serial.println(client_mqtt.publish ((jsonReadStr(configSetup, "mqttPrefix") + "/" + id).c_str(), "CHECK", true)); + Serial.println(client_mqtt.publish ((jsonReadStr(configSetupJson, "mqttPrefix") + "/" + id).c_str(), "CHECK", true)); } all_text = deleteBeforeDelimiter(all_text, "\n"); diff --git a/push_pushingbox.ino b/push_pushingbox.ino index 169b6c33..9cb062c4 100644 --- a/push_pushingbox.ino +++ b/push_pushingbox.ino @@ -9,7 +9,7 @@ void pushControl() { static String body_old; const char* logServer = "api.pushingbox.com"; - String deviceId = jsonReadStr(configSetup, "pushingbox_id"); + String deviceId = jsonReadStr(configSetupJson, "pushingboxid"); Serial.println("- starting client"); diff --git a/set.h b/set.h index 18f53186..d32c3576 100644 --- a/set.h +++ b/set.h @@ -1,7 +1,7 @@ /******************************************************************* **********************FIRMWARE SETTINGS**************************** ******************************************************************/ - //dev +//dev String firmware_version = "2.3.3"; boolean mb_4_of_memory = true; //#define OTA_enable @@ -97,9 +97,12 @@ AsyncEventSource events("/events"); #include #include -enum {ROUTER_SEARCHING, WIFI_MQTT_CONNECTION_CHECK, SENSORS, STEPPER1, STEPPER2, LOG1, LOG2, LOG3, LOG4, LOG5, TIMER_COUNTDOWN, TIME, TIME_SYNC, STATISTICS, UDP, UDP_DB, TEST }; +enum {ROUTER_SEARCHING, WIFI_MQTT_CONNECTION_CHECK, SENSORS, STEPPER1, STEPPER2, LOG1, LOG2, LOG3, LOG4, LOG5, TIMER_COUNTDOWN, TIME, TIME_SYNC, STATISTICS, UPTIME, UDP, UDP_DB, TEST }; TickerScheduler ts(TEST + 1); +#include +uptime_interval myUpTime(10); + #include WiFiClient espClient; PubSubClient client_mqtt(espClient); @@ -124,7 +127,7 @@ OneWire *oneWire; DallasTemperature sensors; #endif -#ifdef dht_enable +#ifdef dht_enable #include DHTesp dht; #endif @@ -154,9 +157,9 @@ Adafruit_Sensor *bme_humidity = bme.getHumiditySensor(); boolean just_load = true; const char* hostName = "IoT Manager"; //JSON -String configSetup = "{}"; -String configJson = "{}"; -String optionJson = "{}"; +String configSetupJson = "{}"; //все настройки +String configLiveJson = "{}"; //все данные с датчиков (связан с mqtt) +String configOptionJson = "{}"; //для трансфера //MQTT String chipID = ""; String prex; diff --git a/udp.ino b/udp.ino index 94c99d23..88d36725 100644 --- a/udp.ino +++ b/udp.ino @@ -14,10 +14,10 @@ void UDP_init() { udp_period = random(50000, 60000); ts.add(UDP, udp_period, [&](void*) { - if (jsonReadStr(configSetup, "udponoff") == "1") { + if (jsonReadStr(configSetupJson, "udponoff") == "1") { if (WiFi.status() == WL_CONNECTED) { if (!udp_busy) { - String line_to_send = "iotm;" + chipID + ";" + jsonReadStr(configSetup, "name"); + String line_to_send = "iotm;" + chipID + ";" + jsonReadStr(configSetupJson, "name"); #ifdef ESP8266 Udp.beginPacketMulticast(udp_multicastIP, udp_port, WiFi.localIP()); Udp.write(line_to_send.c_str()); @@ -35,7 +35,7 @@ void UDP_init() { void handleUdp() { #ifdef ESP8266 - if (jsonReadStr(configSetup, "udponoff") == "1") { + if (jsonReadStr(configSetupJson, "udponoff") == "1") { if (WiFi.status() == WL_CONNECTED) { int packetSize = Udp.parsePacket(); if (packetSize) { @@ -66,7 +66,7 @@ void handleUdp_esp32() { udp.onPacket([](AsyncUDPPacket packet) { received_udp_line = (char*)packet.data(); received_ip = packet.remoteIP().toString(); - if (jsonReadStr(configSetup, "udponoff") == "1") { + if (jsonReadStr(configSetupJson, "udponoff") == "1") { if (received_udp_line.indexOf("iotm;") >= 0) { udp_data_parse = true; @@ -88,11 +88,11 @@ void do_udp_data_parse() { Serial.print(" "); Serial.println(received_udp_line); if (received_udp_line.indexOf("mqttServer") >= 0) { - jsonWriteStr(configSetup, "mqttServer", jsonReadStr(received_udp_line, "mqttServer")); - jsonWriteInt(configSetup, "mqttPort", jsonReadInt(received_udp_line, "mqttPort")); - jsonWriteStr(configSetup, "mqttPrefix", jsonReadStr(received_udp_line, "mqttPrefix")); - jsonWriteStr(configSetup, "mqttUser", jsonReadStr(received_udp_line, "mqttUser")); - jsonWriteStr(configSetup, "mqttPass", jsonReadStr(received_udp_line, "mqttPass")); + jsonWriteStr(configSetupJson, "mqttServer", jsonReadStr(received_udp_line, "mqttServer")); + jsonWriteInt(configSetupJson, "mqttPort", jsonReadInt(received_udp_line, "mqttPort")); + jsonWriteStr(configSetupJson, "mqttPrefix", jsonReadStr(received_udp_line, "mqttPrefix")); + jsonWriteStr(configSetupJson, "mqttUser", jsonReadStr(received_udp_line, "mqttUser")); + jsonWriteStr(configSetupJson, "mqttPass", jsonReadStr(received_udp_line, "mqttPass")); saveConfig(); Serial.println("[V] new mqtt setting received from udp and saved"); mqtt_connection = true; @@ -111,15 +111,15 @@ void add_dev_in_list(String fileName, String id, String dev_name, String ip) { } void send_mqtt_to_udp() { - if (jsonReadStr(configSetup, "udponoff") == "1") { + if (jsonReadStr(configSetupJson, "udponoff") == "1") { if (WiFi.status() == WL_CONNECTED) { udp_busy = true; String mqtt_data = "{}"; - jsonWriteStr(mqtt_data, "mqttServer", jsonReadStr(configSetup, "mqttServer")); - jsonWriteInt(mqtt_data, "mqttPort", jsonReadInt(configSetup, "mqttPort")); - jsonWriteStr(mqtt_data, "mqttPrefix", jsonReadStr(configSetup, "mqttPrefix")); - jsonWriteStr(mqtt_data, "mqttUser", jsonReadStr(configSetup, "mqttUser")); - jsonWriteStr(mqtt_data, "mqttPass", jsonReadStr(configSetup, "mqttPass")); + jsonWriteStr(mqtt_data, "mqttServer", jsonReadStr(configSetupJson, "mqttServer")); + jsonWriteInt(mqtt_data, "mqttPort", jsonReadInt(configSetupJson, "mqttPort")); + jsonWriteStr(mqtt_data, "mqttPrefix", jsonReadStr(configSetupJson, "mqttPrefix")); + jsonWriteStr(mqtt_data, "mqttUser", jsonReadStr(configSetupJson, "mqttUser")); + jsonWriteStr(mqtt_data, "mqttPass", jsonReadStr(configSetupJson, "mqttPass")); Serial.println(mqtt_data); #ifdef ESP8266 Udp.beginPacketMulticast(udp_multicastIP, udp_port, WiFi.localIP()); From 83d153126723b3ee6238705bfe6987fb40324520 Mon Sep 17 00:00:00 2001 From: Dmitry Borisenko <49808844+DmitryBorisenko33@users.noreply.github.com> Date: Fri, 12 Jun 2020 15:34:30 +0200 Subject: [PATCH 6/6] add led blink --- Upgrade.ino | 5 +- Web.ino | 136 ++++++++++++------ WiFi.ino | 3 +- data/config.json | 3 +- data/configs/12-bmp280.c.txt | 6 + .../{12-dallas.s.txt => 12-bmp280.s.txt} | 0 data/configs/13-bme280.c.txt | 9 ++ data/configs/13-bme280.s.txt | 1 + .../{12-dallas.c.txt => 14-dallas.c.txt} | 0 data/configs/14-dallas.s.txt | 1 + ...{13-termostat.c.txt => 15-termostat.c.txt} | 0 ...{13-termostat.s.txt => 15-termostat.s.txt} | 0 .../{14-level.c.txt => 16-level.c.txt} | 0 .../{14-level.s.txt => 16-level.s.txt} | 0 .../{15-moution.c.txt => 17-moution.c.txt} | 0 .../{15-moution.s.txt => 17-moution.s.txt} | 0 .../{16-moution.c.txt => 18-moution.c.txt} | 0 .../{16-moution.s.txt => 18-moution.s.txt} | 0 .../{17-stepper.c.txt => 19-stepper.c.txt} | 0 .../{17-stepper.s.txt => 19-stepper.s.txt} | 0 .../{18-servo.c.txt => 20-servo.c.txt} | 0 .../{18-servo.s.txt => 20-servo.s.txt} | 0 data/lang/lang.ru.json | 1 + data/set.device.json | 22 +-- data/set.wifi.json | 14 ++ main.ino | 22 +-- mqtt.ino | 2 - set.h | 5 +- 28 files changed, 157 insertions(+), 73 deletions(-) create mode 100644 data/configs/12-bmp280.c.txt rename data/configs/{12-dallas.s.txt => 12-bmp280.s.txt} (100%) create mode 100644 data/configs/13-bme280.c.txt create mode 100644 data/configs/13-bme280.s.txt rename data/configs/{12-dallas.c.txt => 14-dallas.c.txt} (100%) create mode 100644 data/configs/14-dallas.s.txt rename data/configs/{13-termostat.c.txt => 15-termostat.c.txt} (100%) rename data/configs/{13-termostat.s.txt => 15-termostat.s.txt} (100%) rename data/configs/{14-level.c.txt => 16-level.c.txt} (100%) rename data/configs/{14-level.s.txt => 16-level.s.txt} (100%) rename data/configs/{15-moution.c.txt => 17-moution.c.txt} (100%) rename data/configs/{15-moution.s.txt => 17-moution.s.txt} (100%) rename data/configs/{16-moution.c.txt => 18-moution.c.txt} (100%) rename data/configs/{16-moution.s.txt => 18-moution.s.txt} (100%) rename data/configs/{17-stepper.c.txt => 19-stepper.c.txt} (100%) rename data/configs/{17-stepper.s.txt => 19-stepper.s.txt} (100%) rename data/configs/{18-servo.c.txt => 20-servo.c.txt} (100%) rename data/configs/{18-servo.s.txt => 20-servo.s.txt} (100%) diff --git a/Upgrade.ino b/Upgrade.ino index ddd5de95..b5290308 100644 --- a/Upgrade.ino +++ b/Upgrade.ino @@ -15,12 +15,11 @@ void do_upgrade_url() { upgrade_url = false; #ifdef ESP32 last_version = getURL("http://91.204.228.124:1100/update/esp32/version.txt"); - jsonWriteStr(configSetupJson, "last_version", last_version); #endif #ifdef ESP8266 last_version = getURL("http://91.204.228.124:1100/update/esp8266/version.txt"); - jsonWriteStr(configSetupJson, "last_version", last_version); #endif + jsonWriteStr(configSetupJson, "last_version", last_version); } } @@ -66,7 +65,7 @@ void upgrade_firmware() { #endif if (ret == HTTP_UPDATE_OK) { - + Serial.println("BUILD upgrade done!"); Serial.println("Restart ESP...."); ESP.restart(); diff --git a/Web.ino b/Web.ino index 72f3aad6..00022fb4 100644 --- a/Web.ino +++ b/Web.ino @@ -51,34 +51,42 @@ void web_init() { writeFile("firmware.s.txt", readFile("configs/11-analog.s.txt", 2048)); } if (value == "12") { - writeFile("firmware.c.txt", readFile("configs/12-dallas.c.txt", 2048)); - writeFile("firmware.s.txt", readFile("configs/12-dallas.s.txt", 2048)); + writeFile("firmware.c.txt", readFile("configs/12-bmp280.c.txt", 2048)); + writeFile("firmware.s.txt", readFile("configs/12-bmp280.s.txt", 2048)); } if (value == "13") { - writeFile("firmware.c.txt", readFile("configs/13-termostat.c.txt", 2048)); - writeFile("firmware.s.txt", readFile("configs/13-termostat.s.txt", 2048)); + writeFile("firmware.c.txt", readFile("configs/13-bme280.c.txt", 2048)); + writeFile("firmware.s.txt", readFile("configs/13-bme280.s.txt", 2048)); } if (value == "14") { - writeFile("firmware.c.txt", readFile("configs/14-level.c.txt", 2048)); - writeFile("firmware.s.txt", readFile("configs/14-level.s.txt", 2048)); + writeFile("firmware.c.txt", readFile("configs/14-dallas.c.txt", 2048)); + writeFile("firmware.s.txt", readFile("configs/14-dallas.s.txt", 2048)); } if (value == "15") { - writeFile("firmware.c.txt", readFile("configs/15-moution.c.txt", 2048)); - writeFile("firmware.s.txt", readFile("configs/15-moution.s.txt", 2048)); + writeFile("firmware.c.txt", readFile("configs/15-termostat.c.txt", 2048)); + writeFile("firmware.s.txt", readFile("configs/15-termostat.s.txt", 2048)); } if (value == "16") { - writeFile("firmware.c.txt", readFile("configs/16-moution.c.txt", 2048)); - writeFile("firmware.s.txt", readFile("configs/16-moution.s.txt", 2048)); + writeFile("firmware.c.txt", readFile("configs/16-level.c.txt", 2048)); + writeFile("firmware.s.txt", readFile("configs/16-level.s.txt", 2048)); } if (value == "17") { - writeFile("firmware.c.txt", readFile("configs/17-stepper.c.txt", 2048)); - writeFile("firmware.s.txt", readFile("configs/17-stepper.s.txt", 2048)); + writeFile("firmware.c.txt", readFile("configs/17-moution.c.txt", 2048)); + writeFile("firmware.s.txt", readFile("configs/17-moution.s.txt", 2048)); } if (value == "18") { - writeFile("firmware.c.txt", readFile("configs/18-servo.c.txt", 2048)); - writeFile("firmware.s.txt", readFile("configs/18-servo.s.txt", 2048)); + writeFile("firmware.c.txt", readFile("configs/18-moution.c.txt", 2048)); + writeFile("firmware.s.txt", readFile("configs/18-moution.s.txt", 2048)); } if (value == "19") { + writeFile("firmware.c.txt", readFile("configs/19-stepper.c.txt", 2048)); + writeFile("firmware.s.txt", readFile("configs/19-stepper.s.txt", 2048)); + } + if (value == "20") { + writeFile("firmware.c.txt", readFile("configs/20-servo.c.txt", 2048)); + writeFile("firmware.s.txt", readFile("configs/20-servo.s.txt", 2048)); + } + if (value == "21") { writeFile("firmware.c.txt", readFile("configs/firmware.c.txt", 2048)); writeFile("firmware.s.txt", readFile("configs/firmware.s.txt", 2048)); } @@ -112,11 +120,12 @@ void web_init() { request->send(200, "text/text", "OK"); } //-------------------------------------------------------------------------------- - if (request->hasArg("cleanlog")) { #ifdef logging_enable + if (request->hasArg("cleanlog")) { clean_log_date(); -#endif + request->send(200, "text/text", "OK"); } +#endif //==============================udp settings============================================= if (request->hasArg("udponoff")) { value = request->getParam("udponoff")->value(); @@ -199,6 +208,19 @@ void web_init() { if (request->getParam("device")->value() == "ok") ESP.restart(); request->send(200, "text/text", "OK"); } + //-------------------------------------------------------------------------------- + if (request->hasArg("blink")) { + value = request->getParam("blink")->value(); + if (value == "0") { + jsonWriteStr(configSetupJson, "blink", value); + saveConfig(); + } + if (value == "1") { + jsonWriteStr(configSetupJson, "blink", value); + saveConfig(); + } + request->send(200, "text/text", "OK"); + } //==============================mqtt settings============================================= if (request->hasArg("mqttServer")) { jsonWriteStr(configSetupJson, "mqttServer", request->getParam("mqttServer")->value()); @@ -247,9 +269,9 @@ void web_init() { #ifdef push_enable if (request->hasArg("pushingboxid")) { jsonWriteStr(configSetupJson, "pushingboxid", request->getParam("pushingboxid")->value()); + saveConfig(); + request->send(200, "text/text", "ok"); } - saveConfig(); - request->send(200, "text/text", "ok"); #endif //==============================utilities settings============================================= if (request->hasArg("itoc")) { @@ -263,35 +285,65 @@ void web_init() { Serial.print("[i] Last firmware version: "); Serial.println(last_version); String tmp = "{}"; - if (WiFi.status() == WL_CONNECTED) { - if (mb_4_of_memory) { - if (last_version != "") { - if (last_version != "error") { - if (last_version == firmware_version) { - jsonWriteStr(tmp, "title", "Последняя версия прошивки уже установлена."); - jsonWriteStr(tmp, "class", "pop-up"); - } else { - jsonWriteStr(tmp, "title", "Имеется новая версия прошивкиИдет обновление прошивки, после обновления страница перезагрузится автоматически...')\">Установить"); - jsonWriteStr(tmp, "class", "pop-up"); - } - } else { - jsonWriteStr(tmp, "title", "Ошибка... Cервер не найден. Попробуйте позже..."); - jsonWriteStr(tmp, "class", "pop-up"); - } - } else { - jsonWriteStr(tmp, "title", "Нажмите на кнопку \"обновить прошивку\" повторно..."); + int case_of_update; + + if (WiFi.status() != WL_CONNECTED) last_version = "nowifi"; + if (!mb_4_of_memory) last_version = "less"; + + if (last_version == firmware_version) case_of_update = 1; + if (last_version != firmware_version) case_of_update = 2; + if (last_version == "error") case_of_update = 3; + if (last_version == "") case_of_update = 4; + if (last_version == "less") case_of_update = 5; + if (last_version == "nowifi") case_of_update = 6; + if (last_version == "notsupported") case_of_update = 7; + + switch (case_of_update) { + case 1: { + jsonWriteStr(tmp, "title", "Последняя версия прошивки уже установлена."); jsonWriteStr(tmp, "class", "pop-up"); } - } else { - jsonWriteStr(tmp, "title", "Обновление по воздуху не поддерживается, модуль имеет меньше 4 мб памяти..."); - jsonWriteStr(tmp, "class", "pop-up"); - } - } else { - jsonWriteStr(tmp, "title", "Устройство не подключен к роутеру..."); - jsonWriteStr(tmp, "class", "pop-up"); + break; + + case 2: { + jsonWriteStr(tmp, "title", "Имеется новая версия прошивкиИдет обновление прошивки, после обновления страница перезагрузится автоматически...')\">Установить"); + jsonWriteStr(tmp, "class", "pop-up"); + } + break; + + case 3: { + jsonWriteStr(tmp, "title", "Ошибка... Cервер не найден. Попробуйте позже..."); + jsonWriteStr(tmp, "class", "pop-up"); + } + break; + + case 4: { + jsonWriteStr(tmp, "title", "Нажмите на кнопку \"обновить прошивку\" повторно..."); + jsonWriteStr(tmp, "class", "pop-up"); + break; + } + + case 5: { + jsonWriteStr(tmp, "title", "Обновление по воздуху не поддерживается, модуль имеет меньше 4 мб памяти..."); + jsonWriteStr(tmp, "class", "pop-up"); + break; + } + + case 6: { + jsonWriteStr(tmp, "title", "Устройство не подключено к роутеру..."); + jsonWriteStr(tmp, "class", "pop-up"); + break; + } + + case 7: { + jsonWriteStr(tmp, "title", "Обновление на новую версию возможно только через usb..."); + jsonWriteStr(tmp, "class", "pop-up"); + break; + } } request->send(200, "text/text", tmp); }); + server.on("/upgrade", HTTP_GET, [](AsyncWebServerRequest * request) { upgrade = true; String tmp = "{}"; diff --git a/WiFi.ino b/WiFi.ino index dddf59b6..87eb411c 100644 --- a/WiFi.ino +++ b/WiFi.ino @@ -19,8 +19,7 @@ void ROUTER_Connecting() { } // Делаем проверку подключения до тех пор пока счетчик tries // не станет равен нулю или не получим подключение - while (--tries && WiFi.status() != WL_CONNECTED) - { + while (--tries && WiFi.status() != WL_CONNECTED) { if (WiFi.status() == WL_CONNECT_FAILED) { Serial.println("[E] password is not correct"); tries = 1; diff --git a/data/config.json b/data/config.json index bd69a709..589bab8c 100644 --- a/data/config.json +++ b/data/config.json @@ -16,5 +16,6 @@ "pushingboxid": "v7C133E426B0C69E", "weblogin": "admin", "webpass": "admin", - "udponoff": "1" + "udponoff": "1", + "blink":"1" } \ No newline at end of file diff --git a/data/configs/12-bmp280.c.txt b/data/configs/12-bmp280.c.txt new file mode 100644 index 00000000..16956455 --- /dev/null +++ b/data/configs/12-bmp280.c.txt @@ -0,0 +1,6 @@ +bmp280T temp1 0x76 Температура#bmp280 Датчики any-data 1 +bmp280P press1 0x76 Давление#bmp280 Датчики any-data 2 +logging temp1 1 100 Температура Датчики 3 +logging press1 1 100 Давление Датчики 4 + +//Чтение и логгирование датчика bmp280. Датчик подключается к шине i2c (esp8266 - gpio 5, 4) \ No newline at end of file diff --git a/data/configs/12-dallas.s.txt b/data/configs/12-bmp280.s.txt similarity index 100% rename from data/configs/12-dallas.s.txt rename to data/configs/12-bmp280.s.txt diff --git a/data/configs/13-bme280.c.txt b/data/configs/13-bme280.c.txt new file mode 100644 index 00000000..e8414f61 --- /dev/null +++ b/data/configs/13-bme280.c.txt @@ -0,0 +1,9 @@ +bme280T temp1 0x76 Температура#bmp280 Датчики any-data 1 +bme280P pres1 0x76 Давление#bmp280 Датчики any-data 2 +bme280H hum1 0x76 Влажность#bmp280 Датчики any-data 3 +bme280A altit1 0x76 Высота#bmp280 Датчики any-data 4 +logging temp1 1 100 Температура Датчики 5 +logging press1 1 100 Давление Датчики 6 +logging hum1 1 100 Влажность Датчики 7 + +//Чтение и логгирование датчика bme280. Датчик подключается к шине i2c (esp8266 - gpio 5, 4) \ No newline at end of file diff --git a/data/configs/13-bme280.s.txt b/data/configs/13-bme280.s.txt new file mode 100644 index 00000000..8b137891 --- /dev/null +++ b/data/configs/13-bme280.s.txt @@ -0,0 +1 @@ + diff --git a/data/configs/12-dallas.c.txt b/data/configs/14-dallas.c.txt similarity index 100% rename from data/configs/12-dallas.c.txt rename to data/configs/14-dallas.c.txt diff --git a/data/configs/14-dallas.s.txt b/data/configs/14-dallas.s.txt new file mode 100644 index 00000000..8b137891 --- /dev/null +++ b/data/configs/14-dallas.s.txt @@ -0,0 +1 @@ + diff --git a/data/configs/13-termostat.c.txt b/data/configs/15-termostat.c.txt similarity index 100% rename from data/configs/13-termostat.c.txt rename to data/configs/15-termostat.c.txt diff --git a/data/configs/13-termostat.s.txt b/data/configs/15-termostat.s.txt similarity index 100% rename from data/configs/13-termostat.s.txt rename to data/configs/15-termostat.s.txt diff --git a/data/configs/14-level.c.txt b/data/configs/16-level.c.txt similarity index 100% rename from data/configs/14-level.c.txt rename to data/configs/16-level.c.txt diff --git a/data/configs/14-level.s.txt b/data/configs/16-level.s.txt similarity index 100% rename from data/configs/14-level.s.txt rename to data/configs/16-level.s.txt diff --git a/data/configs/15-moution.c.txt b/data/configs/17-moution.c.txt similarity index 100% rename from data/configs/15-moution.c.txt rename to data/configs/17-moution.c.txt diff --git a/data/configs/15-moution.s.txt b/data/configs/17-moution.s.txt similarity index 100% rename from data/configs/15-moution.s.txt rename to data/configs/17-moution.s.txt diff --git a/data/configs/16-moution.c.txt b/data/configs/18-moution.c.txt similarity index 100% rename from data/configs/16-moution.c.txt rename to data/configs/18-moution.c.txt diff --git a/data/configs/16-moution.s.txt b/data/configs/18-moution.s.txt similarity index 100% rename from data/configs/16-moution.s.txt rename to data/configs/18-moution.s.txt diff --git a/data/configs/17-stepper.c.txt b/data/configs/19-stepper.c.txt similarity index 100% rename from data/configs/17-stepper.c.txt rename to data/configs/19-stepper.c.txt diff --git a/data/configs/17-stepper.s.txt b/data/configs/19-stepper.s.txt similarity index 100% rename from data/configs/17-stepper.s.txt rename to data/configs/19-stepper.s.txt diff --git a/data/configs/18-servo.c.txt b/data/configs/20-servo.c.txt similarity index 100% rename from data/configs/18-servo.c.txt rename to data/configs/20-servo.c.txt diff --git a/data/configs/18-servo.s.txt b/data/configs/20-servo.s.txt similarity index 100% rename from data/configs/18-servo.s.txt rename to data/configs/20-servo.s.txt diff --git a/data/lang/lang.ru.json b/data/lang/lang.ru.json index 9d4d1929..2c089bcb 100644 --- a/data/lang/lang.ru.json +++ b/data/lang/lang.ru.json @@ -25,6 +25,7 @@ "SetWiFiWarn2":"После того как вы введете логин пароль от вашего wifi роутера необходимо нажать кнопку сохранить, а затем обязательно нажать кнопку перезагрузить устройство внизу этой страницы", "SetWiFiWarn3":"Устройство постоянно сканирует сеть на наличие wifi. Если роутер отключен, то устройство автоматически перейдет в режим точки доступа. Когда wifi появится устройство автоматически подключится к роутеру снова, и выключит точку доступа", "SetWiFiWarn4":"После изменения поля NTP сервер необходимо перезагрузить устройство", + "SetWiFiWarn5":"Светодиод статуса подключения показывает четыре состояния подключения:
1. мигает редко - идет подключение к wifi
2. мигает часто - идет подключение к серверу mqtt
3. горит постоянно - модуль в режиме точки доступа,
4. не горит - модуль подключен к wifi и к mqtt.
Светодиод подключен к gpio2. Если галочка стоит - то использовать этот пин нельзя", "SetMQTTServerName":"Имя сервера:", "SetMQTTPort":"Номер порта:", diff --git a/data/set.device.json b/data/set.device.json index 2cb731a6..11df7191 100644 --- a/data/set.device.json +++ b/data/set.device.json @@ -63,17 +63,19 @@ "/set?preset=6": "6.Вкл. выкл. нескольких удаленных реле кнопкой в приложении (нужно указать Device ID)", "/set?preset=7": "7.Вкл. выкл. нескольких удаленных реле физической кнопкой (нужно указать Device ID)", "/set?preset=8": "8.Широтно импульсная модуляция", - "/set?preset=9": "9.Сенсор DHT11 и логгирование", - "/set?preset=10": "10.Сенсор DHT22, DHT33, DHT44, AM2302, RHT03 и логгирование", + "/set?preset=9": "9.Сенсор DHT11 (темп, влажность) и логгирование", + "/set?preset=10": "10.Сенсор DHT22, DHT33, DHT44, AM2302, RHT03 (темп, влажность) и логгирование", "/set?preset=11": "11.Аналоговый сенсор и логгирование", - "/set?preset=12": "12.Сенсор DS18B20 и логгирование", - "/set?preset=13": "13.Термостат на DS18B20 с переключением в ручной режим и логгированием", - "/set?preset=14": "14.Контроль уровня в баке на сенсорах: JSN-SR04T, HC-SR04, HY-SRF05 и логгирование (управление насосом)", - "/set?preset=15": "15.Датчик движения включающий свет", - "/set?preset=16": "16.Охранный датчик движения", - "/set?preset=17": "17.Система управления шаговыми двигателями на основе драйвера A4988 (открытие закрытие штор)", - "/set?preset=18": "18.Система управления сервоприводами", - "/set?preset=19": "Настройки по умолчанию" + "/set?preset=12": "12.Cенсор bmp280 (темп, давление) и логгирование", + "/set?preset=13": "13.Cенсор bme280 (темп, давление, влажность, высота) и логгирование", + "/set?preset=14": "12.Сенсор DS18B20 (темп) и логгирование", + "/set?preset=15": "13.Термостат на DS18B20 с переключением в ручной режим и логгированием", + "/set?preset=16": "14.Котроль уровня в баке (датчик расстояния) на сенсорах: JSN-SR04T, HC-SR04, HY-SRF05 и логгирование", + "/set?preset=17": "15.Датчик движения включающий свет", + "/set?preset=18": "16.Охранный датчик движения", + "/set?preset=19": "17.Система управления шаговыми двигателями на основе драйвера A4988 (открытие закрытие штор)", + "/set?preset=20": "18.Система управления сервоприводами", + "/set?preset=21": "Настройки по умолчанию" } }, { diff --git a/data/set.wifi.json b/data/set.wifi.json index 01e5054b..d68edc7f 100644 --- a/data/set.wifi.json +++ b/data/set.wifi.json @@ -73,6 +73,20 @@ { "type": "hr" }, + { + "type": "checkbox", + "name": "blink", + "title": "Включить светодиод статуса подключения", + "action": "/set?blink=[[blink]]", + "state": "{{blink}}" + }, + { + "type": "text", + "title": "

{{SetWiFiWarn5}}

" + }, + { + "type": "hr" + }, { "type": "h3", "title": "{{SetWiFiAccessPoint}}" diff --git a/main.ino b/main.ino index f9c47149..0e28ffc1 100644 --- a/main.ino +++ b/main.ino @@ -368,17 +368,19 @@ void sendCONFIG(String topik, String widgetConfig, String key, String date) { void led_blink(String satus) { #ifdef ESP8266 #ifdef blink_pin - pinMode(blink_pin, OUTPUT); - if (satus == "off") { - noTone(blink_pin); - digitalWrite(blink_pin, HIGH); + if (jsonReadStr(configSetupJson, "blink") == "1") { + pinMode(blink_pin, OUTPUT); + if (satus == "off") { + noTone(blink_pin); + digitalWrite(blink_pin, HIGH); + } + if (satus == "on") { + noTone(blink_pin); + digitalWrite(blink_pin, LOW); + } + if (satus == "slow") tone(blink_pin, 1); + if (satus == "fast") tone(blink_pin, 20); } - if (satus == "on") { - noTone(blink_pin); - digitalWrite(blink_pin, LOW); - } - if (satus == "slow") tone(blink_pin, 1); - if (satus == "fast") tone(blink_pin, 20); #endif #endif } diff --git a/mqtt.ino b/mqtt.ino index abc25564..8980c741 100644 --- a/mqtt.ino +++ b/mqtt.ino @@ -19,8 +19,6 @@ void MQTT_init() { }, nullptr, true); } - - void do_mqtt_connection() { if (mqtt_connection) { mqtt_connection = false; diff --git a/set.h b/set.h index d32c3576..b42456d1 100644 --- a/set.h +++ b/set.h @@ -1,9 +1,8 @@ /******************************************************************* **********************FIRMWARE SETTINGS**************************** ******************************************************************/ -//dev -String firmware_version = "2.3.3"; -boolean mb_4_of_memory = true; +String firmware_version = "2.3.4"; +boolean mb_4_of_memory = false; //#define OTA_enable //#define MDNS_enable //#define WS_enable