From f28bafa277447b5ff9575cc35ae58b510f61ba07 Mon Sep 17 00:00:00 2001 From: Dmitry Borisenko <49808844+DmitryBorisenko33@users.noreply.github.com> Date: Tue, 7 Dec 2021 05:58:06 +0100 Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=B8?= =?UTF-8?q?=D0=BB=20=D0=BA=D0=BE=D1=81=D1=8F=D0=BA=20=D1=81=D0=BE=20=D1=81?= =?UTF-8?q?=D0=BB=D0=B5=D1=82=D0=B0=D1=8E=D1=89=D0=B8=D0=BC=20config=20jso?= =?UTF-8?q?n?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- data_esp/config.json | 20 ++++++++--------- data_esp/set.device.json.gz | Bin 2956 -> 2976 bytes data_svelte/config.json | 6 +++--- src/Init.cpp | 8 +++---- src/MqttClient.cpp | 14 ++++++------ src/UpgradeFirm.cpp | 8 +++---- src/Utils/WiFiUtils.cpp | 19 ++++++++-------- src/Web.cpp | 42 ++++++++++++++++++------------------ src/main.cpp | 8 +++---- 9 files changed, 63 insertions(+), 62 deletions(-) diff --git a/data_esp/config.json b/data_esp/config.json index a1a7a55b..88ca3689 100644 --- a/data_esp/config.json +++ b/data_esp/config.json @@ -3,20 +3,20 @@ "chipID": "", "apssid": "IoTmanager", "appass": "", - "routerssid": "XChangeWIFI", - "routerpass": "XCh@WIFI", + "routerssid": "rise", + "routerpass": "hostel3333", "timezone": 1, "ntp": "pool.ntp.org", - "mqttServer": "91.204.228.124", - "mqttPort": 1883, + "mqttServer": "M2.WQTT.RU", + "mqttPort": 8021, "mqttPrefix": "/iotTest3", "mqttUser": "rise", - "mqttPass": "23ri22se32", - "mqttServer2": "M2.WQTT.RU", - "mqttPort2": 8021, - "mqttPrefix2": "/iotTest3", - "mqttUser2": "rise", - "mqttPass2": "hostel3333", + "mqttPass": "hostel3333", + "mqttServer2": "", + "mqttPort2": 0, + "mqttPrefix2": "", + "mqttUser2": "", + "mqttPass2": "", "scen": "1", "telegramApi": "1416711569:AAEI0j83GmXqwzb_gnK1B0Am0gDwZoJt5xo", "telegonof": "0", diff --git a/data_esp/set.device.json.gz b/data_esp/set.device.json.gz index 1efe071bcf05bf7bd4ad5315d5ba92c997cb65fb..a55eb12817a27b39c9c7e0347d955359ea9d570a 100644 GIT binary patch literal 2976 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 0) { - jsonWriteStr(configSetupJson, F("warning3"), F("

Обнаружен неверный номер пина

")); + jsonWriteStr(configSetupJson, F("warning3"), F("Обнаружен неверный номер пина")); } else { jsonWriteStr(configSetupJson, F("warning3"), ""); } savedFromWeb = false; - //publishWidgets(); - //publishState(); + // publishWidgets(); + // publishState(); } void loadScenario() { diff --git a/src/MqttClient.cpp b/src/MqttClient.cpp index 08c808af..5c393aac 100644 --- a/src/MqttClient.cpp +++ b/src/MqttClient.cpp @@ -154,8 +154,8 @@ boolean mqttConnect() { if (connected) { SerialPrint("I", F("MQTT"), F("✔ connected")); - if (currentBroker == 1) jsonWriteStr(configSetupJson, F("warning4"), F("

Подключено к основному брокеру

")); - if (currentBroker == 2) jsonWriteStr(configSetupJson, F("warning4"), F("

Подключено к резервному брокеру

")); + if (currentBroker == 1) jsonWriteStr(configSetupJson, F("warning4"), F("Подключено к основному брокеру")); + if (currentBroker == 2) jsonWriteStr(configSetupJson, F("warning4"), F("Подключено к резервному брокеру")); setLedStatus(LED_OFF); mqttSubscribe(); res = true; @@ -163,7 +163,7 @@ boolean mqttConnect() { mqttConnectAttempts++; SerialPrint("E", F("MQTT"), "🡆 Attempt No: " + String(mqttConnectAttempts) + " could't connect, retry in " + String(MQTT_RECONNECT_INTERVAL / 1000) + "s"); setLedStatus(LED_FAST); - jsonWriteStr(configSetupJson, F("warning4"), F("

Не подключено брокеру

")); + jsonWriteStr(configSetupJson, F("warning4"), F("Не подключено брокеру")); if (mqttConnectAttempts >= CHANGE_BROKER_AFTER) { mqttConnectAttempts = 0; if (isSecondBrokerSet()) { @@ -180,14 +180,14 @@ boolean mqttConnect() { void mqttCallback(char* topic, uint8_t* payload, size_t length) { String topicStr = String(topic); - //SerialPrint("I", "=>MQTT", topicStr); + // SerialPrint("I", "=>MQTT", topicStr); String payloadStr; payloadStr.reserve(length + 1); for (size_t i = 0; i < length; i++) { payloadStr += (char)payload[i]; } - //SerialPrint("I", "=>MQTT", payloadStr); + // SerialPrint("I", "=>MQTT", payloadStr); if (payloadStr.startsWith("HELLO")) { SerialPrint("I", F("MQTT"), F("Full update")); @@ -321,8 +321,8 @@ void publishWidgets() { line = all_widgets.substring(psn_1, psn_2); line.replace("\n", ""); line.replace("\r\n", ""); - //jsonWriteStr(line, "id", String(counter)); - //jsonWriteStr(line, "pageId", String(counter)); + // jsonWriteStr(line, "id", String(counter)); + // jsonWriteStr(line, "pageId", String(counter)); counter++; sendMQTT("config", line); Serial.println("[V] " + line); diff --git a/src/UpgradeFirm.cpp b/src/UpgradeFirm.cpp index c8e05d83..58906f84 100644 --- a/src/UpgradeFirm.cpp +++ b/src/UpgradeFirm.cpp @@ -27,7 +27,7 @@ void upgradeInit() { if (lastVersion > 0) { SerialPrint("I", F("Update"), "available version: " + String(lastVersion)); if (lastVersion > FIRMWARE_VERSION) { - jsonWriteStr(configSetupJson, "warning2", F("

Вышла новая версия прошивки, нажмите обновить прошивку

")); + jsonWriteStr(configSetupJson, "warning2", F("Вышла новая версия прошивки, нажмите обновить прошивку")); } } }; @@ -69,11 +69,11 @@ void upgrade_firmware(int type) { devconfig_ForUpdate = readFile(String(DEVICE_CONFIG_FILE), 4096); configSetup_ForUpdate = configSetupJson; - if (type == 1) { //only build + if (type == 1) { // only build if (upgradeBuild()) restartEsp(); } - else if (type == 2) { //only spiffs + else if (type == 2) { // only spiffs if (upgradeFS()) { writeFile(String(DEVICE_SCENARIO_FILE), scenario_ForUpdate); writeFile(String(DEVICE_CONFIG_FILE), devconfig_ForUpdate); @@ -82,7 +82,7 @@ void upgrade_firmware(int type) { } } - else if (type == 3) { //spiffs and build + else if (type == 3) { // spiffs and build if (upgradeFS()) { writeFile(String(DEVICE_SCENARIO_FILE), scenario_ForUpdate); writeFile(String(DEVICE_CONFIG_FILE), devconfig_ForUpdate); diff --git a/src/Utils/WiFiUtils.cpp b/src/Utils/WiFiUtils.cpp index 13503fa4..99ef2af8 100644 --- a/src/Utils/WiFiUtils.cpp +++ b/src/Utils/WiFiUtils.cpp @@ -1,4 +1,5 @@ #include "Utils/WiFiUtils.h" + #include "FileSystem.h" void routerConnect() { @@ -63,7 +64,7 @@ bool startAPMode() { SerialPrint("I", "WIFI", "AP IP: " + myIP.toString()); jsonWriteStr(configSetupJson, "ip", myIP.toString()); - //if (jsonReadInt(configOptionJson, "pass_status") != 1) { + // if (jsonReadInt(configOptionJson, "pass_status") != 1) { ts.add( WIFI_SCAN, 10 * 1000, [&](void*) { String sta_ssid = jsonReadStr(configSetupJson, "routerssid"); @@ -88,7 +89,7 @@ boolean RouterFind(String ssid) { if (n == -2) { //Сканирование не было запущено, запускаем SerialPrint("I", "WIFI", "start scanning"); - WiFi.scanNetworks(true, false); //async, show_hidden + WiFi.scanNetworks(true, false); // async, show_hidden } else if (n == -1) { //Сканирование все еще выполняется @@ -146,25 +147,25 @@ void wifiSignalInit() { switch (RSSIquality()) { case 0: - jsonWriteStr(configSetupJson, F("signal"), F("Уровень WiFi сигнала: не подключено к роутеру")); + jsonWriteStr(configSetupJson, F("signal"), F("не подключено к роутеру")); break; case 1: - jsonWriteStr(configSetupJson, F("signal"), F("Уровень WiFi сигнала: нет сигнала")); + jsonWriteStr(configSetupJson, F("signal"), F("нет сигнала")); break; case 2: - jsonWriteStr(configSetupJson, F("signal"), F("Уровень WiFi сигнала: очень низкий")); + jsonWriteStr(configSetupJson, F("signal"), F("очень низкий")); break; case 3: - jsonWriteStr(configSetupJson, F("signal"), F("Уровень WiFi сигнала: низкий")); + jsonWriteStr(configSetupJson, F("signal"), F("низкий")); break; case 4: - jsonWriteStr(configSetupJson, F("signal"), F("Уровень WiFi сигнала: хороший")); + jsonWriteStr(configSetupJson, F("signal"), F("хороший")); break; case 5: - jsonWriteStr(configSetupJson, F("signal"), F("Уровень WiFi сигнала: очень хороший")); + jsonWriteStr(configSetupJson, F("signal"), F("очень хороший")); break; case 6: - jsonWriteStr(configSetupJson, F("signal"), F("Уровень WiFi сигнала: отличный")); + jsonWriteStr(configSetupJson, F("signal"), F("отличный")); break; } }, diff --git a/src/Web.cpp b/src/Web.cpp index 986545bd..74179d8d 100644 --- a/src/Web.cpp +++ b/src/Web.cpp @@ -1,4 +1,5 @@ #include "Web.h" + #include "BufferExecute.h" #include "Class/NotAsync.h" #include "Global.h" @@ -28,13 +29,13 @@ void web_init() { if (request->hasArg(F("addPreset"))) { addPreset2(request->getParam(F("addPreset"))->value().toInt()); - jsonWriteStr(configSetupJson, F("warning1"), F("

Требуется перезагрузка

")); + jsonWriteStr(configSetupJson, F("warning1"), F("Требуется перезагрузка")); request->redirect(F("/?set.device")); } if (request->hasArg(F("delChoosingItems"))) { - jsonWriteStr(configSetupJson, F("warning1"), F("

Требуется перезагрузка

")); + jsonWriteStr(configSetupJson, F("warning1"), F("Требуется перезагрузка")); myNotAsyncActions->make(do_delChoosingItems); request->send(200); } @@ -44,7 +45,7 @@ void web_init() { #ifdef EnableLogging cleanLogAndData(); #endif - jsonWriteStr(configSetupJson, F("warning1"), F("

Требуется перезагрузка

")); + jsonWriteStr(configSetupJson, F("warning1"), F("Требуется перезагрузка")); request->redirect(F("/?set.device")); } @@ -174,7 +175,7 @@ void web_init() { } //==============================mqtt settings============================================= - //primary + // primary if (request->hasArg(F("mqttServer"))) { jsonWriteStr(configSetupJson, F("mqttServer"), request->getParam(F("mqttServer"))->value()); saveConfig(); @@ -206,7 +207,7 @@ void web_init() { myNotAsyncActions->make(do_MQTTPARAMSCHANGED); request->send(200); } - //secondary + // secondary if (request->hasArg(F("mqttServer2"))) { jsonWriteStr(configSetupJson, F("mqttServer2"), request->getParam(F("mqttServer2"))->value()); saveConfig(); @@ -240,7 +241,7 @@ void web_init() { } if (request->hasArg("mqttsend")) { - //myNotAsyncActions->make(do_MQTTUDP); + // myNotAsyncActions->make(do_MQTTUDP); request->send(200); } @@ -336,7 +337,7 @@ void web_init() { serverIP = jsonReadStr(configSetupJson, "serverip"); request->send(200); } - //set?order=button_1 + // set?order=button_1 if (request->hasArg("order")) { String order = request->getParam("order")->value(); order.replace("_", " "); @@ -351,7 +352,7 @@ void web_init() { request->send(200); } - //gate mode + // gate mode if (request->hasArg("gateAuto")) { bool value = request->getParam("gateAuto")->value().toInt(); @@ -359,19 +360,18 @@ void web_init() { saveConfig(); request->send(200); } - }); - //server.on("/del", HTTP_GET, [](AsyncWebServerRequest* request) { - // if (request->hasArg("file") && request->hasArg("line")) { - // String fileName = request->getParam("file")->value(); - // Serial.println(fileName); - // int line = request->getParam("line")->value().toInt(); - // Serial.println(line); - // myNotAsyncActions->make(do_delChoosingItems); - // request->redirect(F("/?set.device")); - // } - //}); + // server.on("/del", HTTP_GET, [](AsyncWebServerRequest* request) { + // if (request->hasArg("file") && request->hasArg("line")) { + // String fileName = request->getParam("file")->value(); + // Serial.println(fileName); + // int line = request->getParam("line")->value().toInt(); + // Serial.println(line); + // myNotAsyncActions->make(do_delChoosingItems); + // request->redirect(F("/?set.device")); + // } + // }); server.on("/check", HTTP_GET, [](AsyncWebServerRequest* request) { myNotAsyncActions->make(do_GETLASTVERSION); @@ -402,8 +402,8 @@ void web_init() { }); /* - * Upgrade - */ + * Upgrade + */ server.on("/upgrade", HTTP_GET, [](AsyncWebServerRequest* request) { myNotAsyncActions->make(do_UPGRADE); request->send(200, "text/html"); diff --git a/src/main.cpp b/src/main.cpp index 218cf9a9..298b051d 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -11,6 +11,7 @@ #include "Global.h" #include "Init.h" #include "ItemsList.h" +#include "MySensorsDataParse.h" #include "RemoteOrdersUdp.h" #include "SoftUART.h" #include "Telegram.h" @@ -18,22 +19,21 @@ #include "Utils/StatUtils.h" #include "Utils/Timings.h" #include "Utils/WebUtils.h" -#include "MySensorsDataParse.h" #include "items/ButtonInClass.h" #include "items/vCountDown.h" #include "items/vImpulsOut.h" #include "items/vLogging.h" #include "items/vSensorAnalog.h" #include "items/vSensorBme280.h" -#include "items/vSensorSht20.h" #include "items/vSensorBmp280.h" #include "items/vSensorCcs811.h" #include "items/vSensorDallas.h" #include "items/vSensorDht.h" +#include "items/vSensorNode.h" #include "items/vSensorPzem.h" +#include "items/vSensorSht20.h" #include "items/vSensorUltrasonic.h" #include "items/vSensorUptime.h" -#include "items/vSensorNode.h" void not_async_actions(); @@ -80,7 +80,7 @@ void setup() { getFSInfo(); - //testsPerform(); + // testsPerform(); just_load = false; initialized = true;