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

Исправил косяк со слетающим config json

Browse Source
This commit is contained in:
Dmitry Borisenko
2021-12-07 05:58:06 +01:00
parent 35923eca7d
commit f28bafa277
9 changed files with 63 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
data_esp/config.json
View File

@@ -3,20 +3,20 @@
"chipID": "", "chipID": "",
"apssid": "IoTmanager", "apssid": "IoTmanager",
"appass": "", "appass": "",
"routerssid": "XChangeWIFI", "routerssid": "rise",
"routerpass": "XCh@WIFI", "routerpass": "hostel3333",
"timezone": 1, "timezone": 1,
"ntp": "pool.ntp.org", "ntp": "pool.ntp.org",
"mqttServer": "91.204.228.124", "mqttServer": "M2.WQTT.RU",
"mqttPort": 1883, "mqttPort": 8021,
"mqttPrefix": "/iotTest3", "mqttPrefix": "/iotTest3",
"mqttUser": "rise", "mqttUser": "rise",
"mqttPass": "23ri22se32", "mqttPass": "hostel3333",
"mqttServer2": "M2.WQTT.RU", "mqttServer2": "",
"mqttPort2": 8021, "mqttPort2": 0,
"mqttPrefix2": "/iotTest3", "mqttPrefix2": "",
"mqttUser2": "rise", "mqttUser2": "",
"mqttPass2": "hostel3333", "mqttPass2": "",
"scen": "1", "scen": "1",
"telegramApi": "1416711569:AAEI0j83GmXqwzb_gnK1B0Am0gDwZoJt5xo", "telegramApi": "1416711569:AAEI0j83GmXqwzb_gnK1B0Am0gDwZoJt5xo",
"telegonof": "0", "telegonof": "0",

BIN
data_esp/set.device.json.gz
View File

Binary file not shown.

6
data_svelte/config.json
View File

@@ -3,12 +3,12 @@
"chipID": "", "chipID": "",
"apssid": "IoTmanager", "apssid": "IoTmanager",
"appass": "", "appass": "",
"routerssid": "rise2", "routerssid": "rise",
"routerpass": "hostel3333", "routerpass": "hostel3333",
"timezone": 1, "timezone": 1,
"ntp": "pool.ntp.org", "ntp": "pool.ntp.org",
"mqttServer": "M2.WQTT.RU", "mqttServer": "M2.WQTT.RU",
"mqttPort": 1883, "mqttPort": 8021,
"mqttPrefix": "/iotTest3", "mqttPrefix": "/iotTest3",
"mqttUser": "rise", "mqttUser": "rise",
"mqttPass": "hostel3333", "mqttPass": "hostel3333",
@@ -26,7 +26,7 @@
"webpass": "admin", "webpass": "admin",
"MqttIn": "0", "MqttIn": "0",
"MqttOut": "0", "MqttOut": "0",
"blink": "0", "blink": "1",
"oneWirePin": "2", "oneWirePin": "2",
"serverip": "http://206.189.49.244", "serverip": "http://206.189.49.244",
"uart": "0", "uart": "0",

4
src/Init.cpp
View File

@@ -13,13 +13,13 @@
#include "items/vPwmOut.h" #include "items/vPwmOut.h"
#include "items/vSensorAnalog.h" #include "items/vSensorAnalog.h"
#include "items/vSensorBme280.h" #include "items/vSensorBme280.h"
#include "items/vSensorSht20.h"
#include "items/vSensorBmp280.h" #include "items/vSensorBmp280.h"
#include "items/vSensorCcs811.h" #include "items/vSensorCcs811.h"
#include "items/vSensorDallas.h" #include "items/vSensorDallas.h"
#include "items/vSensorDht.h" #include "items/vSensorDht.h"
#include "items/vSensorNode.h" #include "items/vSensorNode.h"
#include "items/vSensorPzem.h" #include "items/vSensorPzem.h"
#include "items/vSensorSht20.h"
#include "items/vSensorUltrasonic.h" #include "items/vSensorUltrasonic.h"
#include "items/vSensorUptime.h" #include "items/vSensorUptime.h"
@@ -70,7 +70,7 @@ void deviceInit() {
int errors = myLineParsing.getPinErrors(); int errors = myLineParsing.getPinErrors();
if (errors > 0) { if (errors > 0) {
jsonWriteStr(configSetupJson, F("warning3"), F("<div style='margin-top:10px;margin-bottom:10px;'><font color='black'><p style='border: 1px solid #DCDCDC; border-radius: 3px; background-color: #ffc7c7; padding: 10px;'>Обнаружен неверный номер пина</p></font></div>")); jsonWriteStr(configSetupJson, F("warning3"), F("Обнаружен неверный номер пина"));
} else { } else {
jsonWriteStr(configSetupJson, F("warning3"), ""); jsonWriteStr(configSetupJson, F("warning3"), "");
} }

6
src/MqttClient.cpp
View File

@@ -154,8 +154,8 @@ boolean mqttConnect() {
if (connected) { if (connected) {
SerialPrint("I", F("MQTT"), F("✔ connected")); SerialPrint("I", F("MQTT"), F("✔ connected"));
if (currentBroker == 1) jsonWriteStr(configSetupJson, F("warning4"), F("<div style='margin-top:10px;margin-bottom:10px;'><font color='black'><p style='border: 1px solid #DCDCDC; border-radius: 3px; background-color: #8ef584; padding: 10px;'>Подключено к основному брокеру</p></font></div>")); if (currentBroker == 1) jsonWriteStr(configSetupJson, F("warning4"), F("Подключено к основному брокеру"));
if (currentBroker == 2) jsonWriteStr(configSetupJson, F("warning4"), F("<div style='margin-top:10px;margin-bottom:10px;'><font color='black'><p style='border: 1px solid #DCDCDC; border-radius: 3px; background-color: #8ef584; padding: 10px;'>Подключено к резервному брокеру</p></font></div>")); if (currentBroker == 2) jsonWriteStr(configSetupJson, F("warning4"), F("Подключено к резервному брокеру"));
setLedStatus(LED_OFF); setLedStatus(LED_OFF);
mqttSubscribe(); mqttSubscribe();
res = true; res = true;
@@ -163,7 +163,7 @@ boolean mqttConnect() {
mqttConnectAttempts++; mqttConnectAttempts++;
SerialPrint("E", F("MQTT"), "🡆 Attempt No: " + String(mqttConnectAttempts) + " could't connect, retry in " + String(MQTT_RECONNECT_INTERVAL / 1000) + "s"); SerialPrint("E", F("MQTT"), "🡆 Attempt No: " + String(mqttConnectAttempts) + " could't connect, retry in " + String(MQTT_RECONNECT_INTERVAL / 1000) + "s");
setLedStatus(LED_FAST); setLedStatus(LED_FAST);
jsonWriteStr(configSetupJson, F("warning4"), F("<div style='margin-top:10px;margin-bottom:10px;'><font color='black'><p style='border: 1px solid #DCDCDC; border-radius: 3px; background-color: #fa987a; padding: 10px;'>Не подключено брокеру</p></font></div>")); jsonWriteStr(configSetupJson, F("warning4"), F("Не подключено брокеру"));
if (mqttConnectAttempts >= CHANGE_BROKER_AFTER) { if (mqttConnectAttempts >= CHANGE_BROKER_AFTER) {
mqttConnectAttempts = 0; mqttConnectAttempts = 0;
if (isSecondBrokerSet()) { if (isSecondBrokerSet()) {

2
src/UpgradeFirm.cpp
View File

@@ -27,7 +27,7 @@ void upgradeInit() {
if (lastVersion > 0) { if (lastVersion > 0) {
SerialPrint("I", F("Update"), "available version: " + String(lastVersion)); SerialPrint("I", F("Update"), "available version: " + String(lastVersion));
if (lastVersion > FIRMWARE_VERSION) { if (lastVersion > FIRMWARE_VERSION) {
jsonWriteStr(configSetupJson, "warning2", F("<div style='margin-top:10px;margin-bottom:10px;'><font color='black'><p style='border: 1px solid #DCDCDC; border-radius: 3px; background-color: #ffc7c7; padding: 10px;'>Вышла новая версия прошивки, нажмите <b>обновить прошивку</b></p></font></div>")); jsonWriteStr(configSetupJson, "warning2", F("Вышла новая версия прошивки, нажмите обновить прошивку"));
} }
} }
}; };

15
src/Utils/WiFiUtils.cpp
View File

@@ -1,4 +1,5 @@
#include "Utils/WiFiUtils.h" #include "Utils/WiFiUtils.h"
#include "FileSystem.h" #include "FileSystem.h"
void routerConnect() { void routerConnect() {
@@ -146,25 +147,25 @@ void wifiSignalInit() {
switch (RSSIquality()) { switch (RSSIquality()) {
case 0: case 0:
jsonWriteStr(configSetupJson, F("signal"), F("Уровень WiFi сигнала: <font color='red'>не подключено к роутеру</font>")); jsonWriteStr(configSetupJson, F("signal"), F("не подключено к роутеру"));
break; break;
case 1: case 1:
jsonWriteStr(configSetupJson, F("signal"), F("Уровень WiFi сигнала: <font color='red'>нет сигнала</font>")); jsonWriteStr(configSetupJson, F("signal"), F("нет сигнала"));
break; break;
case 2: case 2:
jsonWriteStr(configSetupJson, F("signal"), F("Уровень WiFi сигнала: <font color='red'>очень низкий</font>")); jsonWriteStr(configSetupJson, F("signal"), F("очень низкий"));
break; break;
case 3: case 3:
jsonWriteStr(configSetupJson, F("signal"), F("Уровень WiFi сигнала: <font color='orange'>низкий</font>")); jsonWriteStr(configSetupJson, F("signal"), F("низкий"));
break; break;
case 4: case 4:
jsonWriteStr(configSetupJson, F("signal"), F("Уровень WiFi сигнала: <font color='green'>хороший</font>")); jsonWriteStr(configSetupJson, F("signal"), F("хороший"));
break; break;
case 5: case 5:
jsonWriteStr(configSetupJson, F("signal"), F("Уровень WiFi сигнала: <font color='green'>очень хороший</font>")); jsonWriteStr(configSetupJson, F("signal"), F("очень хороший"));
break; break;
case 6: case 6:
jsonWriteStr(configSetupJson, F("signal"), F("Уровень WiFi сигнала: <font color='green'>отличный</font>")); jsonWriteStr(configSetupJson, F("signal"), F("отличный"));
break; break;
} }
}, },

8
src/Web.cpp
View File

@@ -1,4 +1,5 @@
#include "Web.h" #include "Web.h"
#include "BufferExecute.h" #include "BufferExecute.h"
#include "Class/NotAsync.h" #include "Class/NotAsync.h"
#include "Global.h" #include "Global.h"
@@ -28,13 +29,13 @@ void web_init() {
if (request->hasArg(F("addPreset"))) { if (request->hasArg(F("addPreset"))) {
addPreset2(request->getParam(F("addPreset"))->value().toInt()); addPreset2(request->getParam(F("addPreset"))->value().toInt());
jsonWriteStr(configSetupJson, F("warning1"), F("<div style='margin-top:10px;margin-bottom:10px;'><font color='black'><p style='border: 1px solid #DCDCDC; border-radius: 3px; background-color: #ffc7c7; padding: 10px;'>Требуется перезагрузка</p></font></div>")); jsonWriteStr(configSetupJson, F("warning1"), F("Требуется перезагрузка"));
request->redirect(F("/?set.device")); request->redirect(F("/?set.device"));
} }
if (request->hasArg(F("delChoosingItems"))) { if (request->hasArg(F("delChoosingItems"))) {
jsonWriteStr(configSetupJson, F("warning1"), F("<div style='margin-top:10px;margin-bottom:10px;'><font color='black'><p style='border: 1px solid #DCDCDC; border-radius: 3px; background-color: #ffc7c7; padding: 10px;'>Требуется перезагрузка</p></font></div>")); jsonWriteStr(configSetupJson, F("warning1"), F("Требуется перезагрузка"));
myNotAsyncActions->make(do_delChoosingItems); myNotAsyncActions->make(do_delChoosingItems);
request->send(200); request->send(200);
} }
@@ -44,7 +45,7 @@ void web_init() {
#ifdef EnableLogging #ifdef EnableLogging
cleanLogAndData(); cleanLogAndData();
#endif #endif
jsonWriteStr(configSetupJson, F("warning1"), F("<div style='margin-top:10px;margin-bottom:10px;'><font color='black'><p style='border: 1px solid #DCDCDC; border-radius: 3px; background-color: #ffc7c7; padding: 10px;'>Требуется перезагрузка</p></font></div>")); jsonWriteStr(configSetupJson, F("warning1"), F("Требуется перезагрузка"));
request->redirect(F("/?set.device")); request->redirect(F("/?set.device"));
} }
@@ -359,7 +360,6 @@ void web_init() {
saveConfig(); saveConfig();
request->send(200); request->send(200);
} }
}); });
// server.on("/del", HTTP_GET, [](AsyncWebServerRequest* request) { // server.on("/del", HTTP_GET, [](AsyncWebServerRequest* request) {

6
src/main.cpp
View File

@@ -11,6 +11,7 @@
#include "Global.h" #include "Global.h"
#include "Init.h" #include "Init.h"
#include "ItemsList.h" #include "ItemsList.h"
#include "MySensorsDataParse.h"
#include "RemoteOrdersUdp.h" #include "RemoteOrdersUdp.h"
#include "SoftUART.h" #include "SoftUART.h"
#include "Telegram.h" #include "Telegram.h"
@@ -18,22 +19,21 @@
#include "Utils/StatUtils.h" #include "Utils/StatUtils.h"
#include "Utils/Timings.h" #include "Utils/Timings.h"
#include "Utils/WebUtils.h" #include "Utils/WebUtils.h"
#include "MySensorsDataParse.h"
#include "items/ButtonInClass.h" #include "items/ButtonInClass.h"
#include "items/vCountDown.h" #include "items/vCountDown.h"
#include "items/vImpulsOut.h" #include "items/vImpulsOut.h"
#include "items/vLogging.h" #include "items/vLogging.h"
#include "items/vSensorAnalog.h" #include "items/vSensorAnalog.h"
#include "items/vSensorBme280.h" #include "items/vSensorBme280.h"
#include "items/vSensorSht20.h"
#include "items/vSensorBmp280.h" #include "items/vSensorBmp280.h"
#include "items/vSensorCcs811.h" #include "items/vSensorCcs811.h"
#include "items/vSensorDallas.h" #include "items/vSensorDallas.h"
#include "items/vSensorDht.h" #include "items/vSensorDht.h"
#include "items/vSensorNode.h"
#include "items/vSensorPzem.h" #include "items/vSensorPzem.h"
#include "items/vSensorSht20.h"
#include "items/vSensorUltrasonic.h" #include "items/vSensorUltrasonic.h"
#include "items/vSensorUptime.h" #include "items/vSensorUptime.h"
#include "items/vSensorNode.h"
void not_async_actions(); void not_async_actions();