diff --git a/src/Web.cpp b/src/Web.cpp
index 986545bd..2a72b51e 100644
--- a/src/Web.cpp
+++ b/src/Web.cpp
@@ -18,396 +18,396 @@ bool parseRequestForPreset(AsyncWebServerRequest* request, uint8_t& preset) {
}
void web_init() {
- server.on("/set", HTTP_GET, [](AsyncWebServerRequest* request) {
- //==============================set.device.json====================================================================================================
- if (request->hasArg(F("addItem"))) {
- addItem2(request->getParam("addItem")->value().toInt());
- request->redirect("/?set.device");
- }
-
- if (request->hasArg(F("addPreset"))) {
- addPreset2(request->getParam(F("addPreset"))->value().toInt());
-
- jsonWriteStr(configSetupJson, F("warning1"), F("
"));
-
- request->redirect(F("/?set.device"));
- }
-
- if (request->hasArg(F("delChoosingItems"))) {
- jsonWriteStr(configSetupJson, F("warning1"), F(""));
- myNotAsyncActions->make(do_delChoosingItems);
- request->send(200);
- }
-
- if (request->hasArg(F("delAllItems"))) {
- delAllItems();
-#ifdef EnableLogging
- cleanLogAndData();
-#endif
- jsonWriteStr(configSetupJson, F("warning1"), F(""));
- request->redirect(F("/?set.device"));
- }
-
- if (request->hasArg(F("saveItems"))) {
- myNotAsyncActions->make(do_deviceInit);
- savedFromWeb = true;
- request->send(200);
- }
-
- if (request->hasArg(F("scen"))) {
- bool value = request->getParam(F("scen"))->value().toInt();
- jsonWriteBool(configSetupJson, F("scen"), value);
- saveConfig();
- loadScenario();
- request->send(200);
- }
-
- if (request->hasArg(F("sceninit"))) {
- loadScenario();
- request->send(200);
- }
-
- if (request->hasArg(F("MqttIn"))) {
- bool value = request->getParam(F("MqttIn"))->value().toInt();
- jsonWriteBool(configSetupJson, "MqttIn", value);
- saveConfig();
- mqtt.subscribe((mqttPrefix + "/+/+/event").c_str());
- mqtt.subscribe((mqttPrefix + "/+/+/info").c_str());
- request->send(200);
- }
-
- if (request->hasArg(F("MqttOut"))) {
- bool value = request->getParam(F("MqttOut"))->value().toInt();
- jsonWriteBool(configSetupJson, F("MqttOut"), value);
- saveConfig();
- request->send(200);
- }
-
- if (request->hasArg(F("scenMqtt"))) {
- myNotAsyncActions->make(do_sendScenMQTT);
- request->send(200);
- }
-
- if (request->hasArg(F("cleanlog"))) {
-#ifdef EnableLogging
- cleanLogAndData();
-#endif
- request->send(200);
- }
-
- //==============================wifi settings=============================================
- if (request->hasArg(F("devname"))) {
- jsonWriteStr(configSetupJson, F("name"), request->getParam(F("devname"))->value());
- saveConfig();
- request->send(200);
- }
-
- if (request->hasArg(F("routerssid"))) {
- jsonWriteStr(configSetupJson, F("routerssid"), request->getParam(F("routerssid"))->value());
- saveConfig();
- request->send(200);
- }
-
- if (request->hasArg(F("routerpass"))) {
- jsonWriteStr(configSetupJson, F("routerpass"), request->getParam(F("routerpass"))->value());
- saveConfig();
- request->send(200);
- }
-
- if (request->hasArg(F("apssid"))) {
- jsonWriteStr(configSetupJson, F("apssid"), request->getParam(F("apssid"))->value());
- saveConfig();
- request->send(200, "text/text", "OK");
- }
-
- if (request->hasArg(F("appass"))) {
- jsonWriteStr(configSetupJson, F("appass"), request->getParam(F("appass"))->value());
- saveConfig();
- request->send(200);
- }
-
- if (request->hasArg(F("weblogin"))) {
- jsonWriteStr(configSetupJson, F("weblogin"), request->getParam(F("weblogin"))->value());
- saveConfig();
- request->send(200);
- }
-
- if (request->hasArg(F("webpass"))) {
- jsonWriteStr(configSetupJson, F("webpass"), request->getParam(F("webpass"))->value());
- saveConfig();
- request->send(200);
- }
-
- if (request->hasArg(F("timezone"))) {
- String timezoneStr = request->getParam(F("timezone"))->value();
- jsonWriteStr(configSetupJson, F("timezone"), timezoneStr);
- saveConfig();
- timeNow->setTimezone(timezoneStr.toInt());
- request->send(200);
- }
-
- if (request->hasArg(F("ntp"))) {
- String ntpStr = request->getParam(F("ntp"))->value();
- jsonWriteStr(configSetupJson, F("ntp"), ntpStr);
- saveConfig();
- timeNow->setNtpPool(ntpStr);
- request->send(200);
- }
-
- if (request->hasArg(F("blink"))) {
- bool value = request->getParam(F("blink"))->value().toInt();
- jsonWriteBool(configSetupJson, F("blink"), value);
- saveConfig();
- request->send(200);
- }
-
- if (request->hasArg(F("reqReset"))) {
- String tmp = "{}";
- jsonWriteStr(tmp, "title", F("Вы действительно хотите перезагрузить устройство?Идет перезагрузка устройства')\">Перезагрузить"));
- jsonWriteStr(tmp, "class", "pop-up");
- request->send(200, "text/html", tmp);
- }
-
- if (request->hasArg(F("reset"))) {
- ESP.restart();
- request->send(200);
- }
-
- //==============================mqtt settings=============================================
- //primary
- if (request->hasArg(F("mqttServer"))) {
- jsonWriteStr(configSetupJson, F("mqttServer"), request->getParam(F("mqttServer"))->value());
- saveConfig();
- myNotAsyncActions->make(do_MQTTPARAMSCHANGED);
- request->send(200);
- }
- if (request->hasArg(F("mqttPort"))) {
- int port = (request->getParam(F("mqttPort"))->value()).toInt();
- jsonWriteInt(configSetupJson, F("mqttPort"), port);
- saveConfig();
- myNotAsyncActions->make(do_MQTTPARAMSCHANGED);
- request->send(200);
- }
- if (request->hasArg(F("mqttPrefix"))) {
- jsonWriteStr(configSetupJson, F("mqttPrefix"), request->getParam(F("mqttPrefix"))->value());
- saveConfig();
- myNotAsyncActions->make(do_MQTTPARAMSCHANGED);
- request->send(200);
- }
- if (request->hasArg(F("mqttUser"))) {
- jsonWriteStr(configSetupJson, F("mqttUser"), request->getParam(F("mqttUser"))->value());
- saveConfig();
- myNotAsyncActions->make(do_MQTTPARAMSCHANGED);
- request->send(200);
- }
- if (request->hasArg(F("mqttPass"))) {
- jsonWriteStr(configSetupJson, F("mqttPass"), request->getParam(F("mqttPass"))->value());
- saveConfig();
- myNotAsyncActions->make(do_MQTTPARAMSCHANGED);
- request->send(200);
- }
- //secondary
- if (request->hasArg(F("mqttServer2"))) {
- jsonWriteStr(configSetupJson, F("mqttServer2"), request->getParam(F("mqttServer2"))->value());
- saveConfig();
- myNotAsyncActions->make(do_MQTTPARAMSCHANGED);
- request->send(200);
- }
- if (request->hasArg(F("mqttPort2"))) {
- int port = (request->getParam(F("mqttPort2"))->value()).toInt();
- jsonWriteInt(configSetupJson, F("mqttPort2"), port);
- saveConfig();
- myNotAsyncActions->make(do_MQTTPARAMSCHANGED);
- request->send(200);
- }
- if (request->hasArg(F("mqttPrefix2"))) {
- jsonWriteStr(configSetupJson, F("mqttPrefix2"), request->getParam(F("mqttPrefix2"))->value());
- saveConfig();
- myNotAsyncActions->make(do_MQTTPARAMSCHANGED);
- request->send(200);
- }
- if (request->hasArg(F("mqttUser2"))) {
- jsonWriteStr(configSetupJson, F("mqttUser2"), request->getParam(F("mqttUser2"))->value());
- saveConfig();
- myNotAsyncActions->make(do_MQTTPARAMSCHANGED);
- request->send(200);
- }
- if (request->hasArg(F("mqttPass2"))) {
- jsonWriteStr(configSetupJson, F("mqttPass2"), request->getParam(F("mqttPass2"))->value());
- saveConfig();
- myNotAsyncActions->make(do_MQTTPARAMSCHANGED);
- request->send(200);
- }
-
- if (request->hasArg("mqttsend")) {
- //myNotAsyncActions->make(do_MQTTUDP);
- request->send(200);
- }
-
- if (request->hasArg("mqttcheck")) {
- String buf = "" + getStateStr();
-
- String payload = "{}";
- jsonWriteStr(payload, "title", buf);
- jsonWriteStr(payload, "class", "pop-up");
-
- request->send(200, "text/html", payload);
- }
-
- //==============================telegram settings=============================================
- if (request->hasArg("telegramApi")) {
- jsonWriteStr(configSetupJson, "telegramApi", request->getParam("telegramApi")->value());
- saveConfig();
- request->send(200);
- }
- if (request->hasArg("autos")) {
- bool value = request->getParam("autos")->value().toInt();
- jsonWriteBool(configSetupJson, "autos", value);
- saveConfig();
- request->send(200);
- }
- if (request->hasArg("chatId")) {
- jsonWriteStr(configSetupJson, "chatId", request->getParam("chatId")->value());
- saveConfig();
- request->send(200);
- }
- if (request->hasArg("telegonof")) {
- bool value = request->getParam("telegonof")->value().toInt();
- jsonWriteBool(configSetupJson, "telegonof", value);
- saveConfig();
- request->send(200);
- }
- if (request->hasArg("teleginput")) {
- bool value = request->getParam("teleginput")->value().toInt();
- jsonWriteBool(configSetupJson, "teleginput", value);
- saveConfig();
- request->send(200);
- }
-
- //==============================utilities settings=============================================
- if (request->hasArg("i2c")) {
- myNotAsyncActions->make(do_BUSSCAN);
- request->redirect("/?set.utilities");
- }
- if (request->hasArg("uart")) {
- bool value = request->getParam("uart")->value().toInt();
- jsonWriteBool(configSetupJson, "uart", value);
- saveConfig();
-#ifdef EnableUart
- uartInit();
-#endif
- request->send(200);
- }
- if (request->hasArg("uartEvents")) {
- bool value = request->getParam("uartEvents")->value().toInt();
- jsonWriteBool(configSetupJson, "uartEvents", value);
- saveConfig();
- request->send(200);
- }
- if (request->hasArg("uartS")) {
- jsonWriteStr(configSetupJson, "uartS", request->getParam("uartS")->value());
- saveConfig();
-#ifdef EnableUart
- uartInit();
-#endif
- request->send(200);
- }
- if (request->hasArg("uartTX")) {
- jsonWriteStr(configSetupJson, "uartTX", request->getParam("uartTX")->value());
- saveConfig();
-#ifdef EnableUart
- uartInit();
-#endif
- request->send(200);
- }
- if (request->hasArg("uartRX")) {
- jsonWriteStr(configSetupJson, "uartRX", request->getParam("uartRX")->value());
- saveConfig();
-#ifdef EnableUart
- uartInit();
-#endif
- request->send(200);
- }
-
- //==============================developer settings=============================================
- if (request->hasArg("serverip")) {
- jsonWriteStr(configSetupJson, "serverip", request->getParam("serverip")->value());
- saveConfig();
- serverIP = jsonReadStr(configSetupJson, "serverip");
- request->send(200);
- }
- //set?order=button_1
- if (request->hasArg("order")) {
- String order = request->getParam("order")->value();
- order.replace("_", " ");
- loopCmdAdd(order + ",");
- request->send(200, "text/html", order);
- }
-
- if (request->hasArg("grafmax")) {
- int value = request->getParam("grafmax")->value().toInt();
- jsonWriteInt(configSetupJson, "grafmax", value);
- saveConfig();
- request->send(200);
- }
-
- //gate mode
-
- if (request->hasArg("gateAuto")) {
- bool value = request->getParam("gateAuto")->value().toInt();
- jsonWriteBool(configSetupJson, "gateAuto", value);
- 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("/check", HTTP_GET, [](AsyncWebServerRequest* request) {
- myNotAsyncActions->make(do_GETLASTVERSION);
- SerialPrint("I", "Update", "firmware version: " + String(lastVersion));
-
- String msg = "";
-
- if (USE_OTA) {
- if (lastVersion == FIRMWARE_VERSION) {
- msg = F("Актуальная версия прошивки уже установлена.");
- } else if (lastVersion > FIRMWARE_VERSION) {
- msg = F("Новая версия прошивкиИдет обновление прошивки, после обновления страница перезагрузится автоматически...')\">Установить");
- } else if (lastVersion == -1) {
- msg = F("Cервер не найден. Попробуйте повторить позже...");
- } else if (lastVersion == -2) {
- msg = F("Устройство не подключено к роутеру!");
- } else if (lastVersion < FIRMWARE_VERSION) {
- msg = F("Ошибка версии. Попробуйте повторить позже...");
- }
- } else {
- msg = F("Обновление невозможно, память устройства 1 мб");
- }
-
- String tmp = "{}";
- jsonWriteStr(tmp, "title", "" + msg);
- jsonWriteStr(tmp, "class", "pop-up");
- request->send(200, "text/html", tmp);
- });
-
- /*
- * Upgrade
- */
- server.on("/upgrade", HTTP_GET, [](AsyncWebServerRequest* request) {
- myNotAsyncActions->make(do_UPGRADE);
- request->send(200, "text/html");
- });
+// server.on("/set", HTTP_GET, [](AsyncWebServerRequest* request) {
+// //==============================set.device.json====================================================================================================
+// if (request->hasArg(F("addItem"))) {
+// addItem2(request->getParam("addItem")->value().toInt());
+// request->redirect("/?set.device");
+// }
+//
+// if (request->hasArg(F("addPreset"))) {
+// addPreset2(request->getParam(F("addPreset"))->value().toInt());
+//
+// jsonWriteStr(configSetupJson, F("warning1"), F(""));
+//
+// request->redirect(F("/?set.device"));
+// }
+//
+// if (request->hasArg(F("delChoosingItems"))) {
+// jsonWriteStr(configSetupJson, F("warning1"), F(""));
+// myNotAsyncActions->make(do_delChoosingItems);
+// request->send(200);
+// }
+//
+// if (request->hasArg(F("delAllItems"))) {
+// delAllItems();
+//#ifdef EnableLogging
+// cleanLogAndData();
+//#endif
+// jsonWriteStr(configSetupJson, F("warning1"), F(""));
+// request->redirect(F("/?set.device"));
+// }
+//
+// if (request->hasArg(F("saveItems"))) {
+// myNotAsyncActions->make(do_deviceInit);
+// savedFromWeb = true;
+// request->send(200);
+// }
+//
+// if (request->hasArg(F("scen"))) {
+// bool value = request->getParam(F("scen"))->value().toInt();
+// jsonWriteBool(configSetupJson, F("scen"), value);
+// saveConfig();
+// loadScenario();
+// request->send(200);
+// }
+//
+// if (request->hasArg(F("sceninit"))) {
+// loadScenario();
+// request->send(200);
+// }
+//
+// if (request->hasArg(F("MqttIn"))) {
+// bool value = request->getParam(F("MqttIn"))->value().toInt();
+// jsonWriteBool(configSetupJson, "MqttIn", value);
+// saveConfig();
+// mqtt.subscribe((mqttPrefix + "/+/+/event").c_str());
+// mqtt.subscribe((mqttPrefix + "/+/+/info").c_str());
+// request->send(200);
+// }
+//
+// if (request->hasArg(F("MqttOut"))) {
+// bool value = request->getParam(F("MqttOut"))->value().toInt();
+// jsonWriteBool(configSetupJson, F("MqttOut"), value);
+// saveConfig();
+// request->send(200);
+// }
+//
+// if (request->hasArg(F("scenMqtt"))) {
+// myNotAsyncActions->make(do_sendScenMQTT);
+// request->send(200);
+// }
+//
+// if (request->hasArg(F("cleanlog"))) {
+//#ifdef EnableLogging
+// cleanLogAndData();
+//#endif
+// request->send(200);
+// }
+//
+// //==============================wifi settings=============================================
+// if (request->hasArg(F("devname"))) {
+// jsonWriteStr(configSetupJson, F("name"), request->getParam(F("devname"))->value());
+// saveConfig();
+// request->send(200);
+// }
+//
+// if (request->hasArg(F("routerssid"))) {
+// jsonWriteStr(configSetupJson, F("routerssid"), request->getParam(F("routerssid"))->value());
+// saveConfig();
+// request->send(200);
+// }
+//
+// if (request->hasArg(F("routerpass"))) {
+// jsonWriteStr(configSetupJson, F("routerpass"), request->getParam(F("routerpass"))->value());
+// saveConfig();
+// request->send(200);
+// }
+//
+// if (request->hasArg(F("apssid"))) {
+// jsonWriteStr(configSetupJson, F("apssid"), request->getParam(F("apssid"))->value());
+// saveConfig();
+// request->send(200, "text/text", "OK");
+// }
+//
+// if (request->hasArg(F("appass"))) {
+// jsonWriteStr(configSetupJson, F("appass"), request->getParam(F("appass"))->value());
+// saveConfig();
+// request->send(200);
+// }
+//
+// if (request->hasArg(F("weblogin"))) {
+// jsonWriteStr(configSetupJson, F("weblogin"), request->getParam(F("weblogin"))->value());
+// saveConfig();
+// request->send(200);
+// }
+//
+// if (request->hasArg(F("webpass"))) {
+// jsonWriteStr(configSetupJson, F("webpass"), request->getParam(F("webpass"))->value());
+// saveConfig();
+// request->send(200);
+// }
+//
+// if (request->hasArg(F("timezone"))) {
+// String timezoneStr = request->getParam(F("timezone"))->value();
+// jsonWriteStr(configSetupJson, F("timezone"), timezoneStr);
+// saveConfig();
+// timeNow->setTimezone(timezoneStr.toInt());
+// request->send(200);
+// }
+//
+// if (request->hasArg(F("ntp"))) {
+// String ntpStr = request->getParam(F("ntp"))->value();
+// jsonWriteStr(configSetupJson, F("ntp"), ntpStr);
+// saveConfig();
+// timeNow->setNtpPool(ntpStr);
+// request->send(200);
+// }
+//
+// if (request->hasArg(F("blink"))) {
+// bool value = request->getParam(F("blink"))->value().toInt();
+// jsonWriteBool(configSetupJson, F("blink"), value);
+// saveConfig();
+// request->send(200);
+// }
+//
+// if (request->hasArg(F("reqReset"))) {
+// String tmp = "{}";
+// jsonWriteStr(tmp, "title", F("Вы действительно хотите перезагрузить устройство?Идет перезагрузка устройства')\">Перезагрузить"));
+// jsonWriteStr(tmp, "class", "pop-up");
+// request->send(200, "text/html", tmp);
+// }
+//
+// if (request->hasArg(F("reset"))) {
+// ESP.restart();
+// request->send(200);
+// }
+//
+// //==============================mqtt settings=============================================
+// //primary
+// if (request->hasArg(F("mqttServer"))) {
+// jsonWriteStr(configSetupJson, F("mqttServer"), request->getParam(F("mqttServer"))->value());
+// saveConfig();
+// myNotAsyncActions->make(do_MQTTPARAMSCHANGED);
+// request->send(200);
+// }
+// if (request->hasArg(F("mqttPort"))) {
+// int port = (request->getParam(F("mqttPort"))->value()).toInt();
+// jsonWriteInt(configSetupJson, F("mqttPort"), port);
+// saveConfig();
+// myNotAsyncActions->make(do_MQTTPARAMSCHANGED);
+// request->send(200);
+// }
+// if (request->hasArg(F("mqttPrefix"))) {
+// jsonWriteStr(configSetupJson, F("mqttPrefix"), request->getParam(F("mqttPrefix"))->value());
+// saveConfig();
+// myNotAsyncActions->make(do_MQTTPARAMSCHANGED);
+// request->send(200);
+// }
+// if (request->hasArg(F("mqttUser"))) {
+// jsonWriteStr(configSetupJson, F("mqttUser"), request->getParam(F("mqttUser"))->value());
+// saveConfig();
+// myNotAsyncActions->make(do_MQTTPARAMSCHANGED);
+// request->send(200);
+// }
+// if (request->hasArg(F("mqttPass"))) {
+// jsonWriteStr(configSetupJson, F("mqttPass"), request->getParam(F("mqttPass"))->value());
+// saveConfig();
+// myNotAsyncActions->make(do_MQTTPARAMSCHANGED);
+// request->send(200);
+// }
+// //secondary
+// if (request->hasArg(F("mqttServer2"))) {
+// jsonWriteStr(configSetupJson, F("mqttServer2"), request->getParam(F("mqttServer2"))->value());
+// saveConfig();
+// myNotAsyncActions->make(do_MQTTPARAMSCHANGED);
+// request->send(200);
+// }
+// if (request->hasArg(F("mqttPort2"))) {
+// int port = (request->getParam(F("mqttPort2"))->value()).toInt();
+// jsonWriteInt(configSetupJson, F("mqttPort2"), port);
+// saveConfig();
+// myNotAsyncActions->make(do_MQTTPARAMSCHANGED);
+// request->send(200);
+// }
+// if (request->hasArg(F("mqttPrefix2"))) {
+// jsonWriteStr(configSetupJson, F("mqttPrefix2"), request->getParam(F("mqttPrefix2"))->value());
+// saveConfig();
+// myNotAsyncActions->make(do_MQTTPARAMSCHANGED);
+// request->send(200);
+// }
+// if (request->hasArg(F("mqttUser2"))) {
+// jsonWriteStr(configSetupJson, F("mqttUser2"), request->getParam(F("mqttUser2"))->value());
+// saveConfig();
+// myNotAsyncActions->make(do_MQTTPARAMSCHANGED);
+// request->send(200);
+// }
+// if (request->hasArg(F("mqttPass2"))) {
+// jsonWriteStr(configSetupJson, F("mqttPass2"), request->getParam(F("mqttPass2"))->value());
+// saveConfig();
+// myNotAsyncActions->make(do_MQTTPARAMSCHANGED);
+// request->send(200);
+// }
+//
+// if (request->hasArg("mqttsend")) {
+// //myNotAsyncActions->make(do_MQTTUDP);
+// request->send(200);
+// }
+//
+// if (request->hasArg("mqttcheck")) {
+// String buf = "" + getStateStr();
+//
+// String payload = "{}";
+// jsonWriteStr(payload, "title", buf);
+// jsonWriteStr(payload, "class", "pop-up");
+//
+// request->send(200, "text/html", payload);
+// }
+//
+// //==============================telegram settings=============================================
+// if (request->hasArg("telegramApi")) {
+// jsonWriteStr(configSetupJson, "telegramApi", request->getParam("telegramApi")->value());
+// saveConfig();
+// request->send(200);
+// }
+// if (request->hasArg("autos")) {
+// bool value = request->getParam("autos")->value().toInt();
+// jsonWriteBool(configSetupJson, "autos", value);
+// saveConfig();
+// request->send(200);
+// }
+// if (request->hasArg("chatId")) {
+// jsonWriteStr(configSetupJson, "chatId", request->getParam("chatId")->value());
+// saveConfig();
+// request->send(200);
+// }
+// if (request->hasArg("telegonof")) {
+// bool value = request->getParam("telegonof")->value().toInt();
+// jsonWriteBool(configSetupJson, "telegonof", value);
+// saveConfig();
+// request->send(200);
+// }
+// if (request->hasArg("teleginput")) {
+// bool value = request->getParam("teleginput")->value().toInt();
+// jsonWriteBool(configSetupJson, "teleginput", value);
+// saveConfig();
+// request->send(200);
+// }
+//
+// //==============================utilities settings=============================================
+// if (request->hasArg("i2c")) {
+// myNotAsyncActions->make(do_BUSSCAN);
+// request->redirect("/?set.utilities");
+// }
+// if (request->hasArg("uart")) {
+// bool value = request->getParam("uart")->value().toInt();
+// jsonWriteBool(configSetupJson, "uart", value);
+// saveConfig();
+//#ifdef EnableUart
+// uartInit();
+//#endif
+// request->send(200);
+// }
+// if (request->hasArg("uartEvents")) {
+// bool value = request->getParam("uartEvents")->value().toInt();
+// jsonWriteBool(configSetupJson, "uartEvents", value);
+// saveConfig();
+// request->send(200);
+// }
+// if (request->hasArg("uartS")) {
+// jsonWriteStr(configSetupJson, "uartS", request->getParam("uartS")->value());
+// saveConfig();
+//#ifdef EnableUart
+// uartInit();
+//#endif
+// request->send(200);
+// }
+// if (request->hasArg("uartTX")) {
+// jsonWriteStr(configSetupJson, "uartTX", request->getParam("uartTX")->value());
+// saveConfig();
+//#ifdef EnableUart
+// uartInit();
+//#endif
+// request->send(200);
+// }
+// if (request->hasArg("uartRX")) {
+// jsonWriteStr(configSetupJson, "uartRX", request->getParam("uartRX")->value());
+// saveConfig();
+//#ifdef EnableUart
+// uartInit();
+//#endif
+// request->send(200);
+// }
+//
+// //==============================developer settings=============================================
+// if (request->hasArg("serverip")) {
+// jsonWriteStr(configSetupJson, "serverip", request->getParam("serverip")->value());
+// saveConfig();
+// serverIP = jsonReadStr(configSetupJson, "serverip");
+// request->send(200);
+// }
+// //set?order=button_1
+// if (request->hasArg("order")) {
+// String order = request->getParam("order")->value();
+// order.replace("_", " ");
+// loopCmdAdd(order + ",");
+// request->send(200, "text/html", order);
+// }
+//
+// if (request->hasArg("grafmax")) {
+// int value = request->getParam("grafmax")->value().toInt();
+// jsonWriteInt(configSetupJson, "grafmax", value);
+// saveConfig();
+// request->send(200);
+// }
+//
+// //gate mode
+//
+// if (request->hasArg("gateAuto")) {
+// bool value = request->getParam("gateAuto")->value().toInt();
+// jsonWriteBool(configSetupJson, "gateAuto", value);
+// 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("/check", HTTP_GET, [](AsyncWebServerRequest* request) {
+// myNotAsyncActions->make(do_GETLASTVERSION);
+// SerialPrint("I", "Update", "firmware version: " + String(lastVersion));
+//
+// String msg = "";
+//
+// if (USE_OTA) {
+// if (lastVersion == FIRMWARE_VERSION) {
+// msg = F("Актуальная версия прошивки уже установлена.");
+// } else if (lastVersion > FIRMWARE_VERSION) {
+// msg = F("Новая версия прошивкиИдет обновление прошивки, после обновления страница перезагрузится автоматически...')\">Установить");
+// } else if (lastVersion == -1) {
+// msg = F("Cервер не найден. Попробуйте повторить позже...");
+// } else if (lastVersion == -2) {
+// msg = F("Устройство не подключено к роутеру!");
+// } else if (lastVersion < FIRMWARE_VERSION) {
+// msg = F("Ошибка версии. Попробуйте повторить позже...");
+// }
+// } else {
+// msg = F("Обновление невозможно, память устройства 1 мб");
+// }
+//
+// String tmp = "{}";
+// jsonWriteStr(tmp, "title", "" + msg);
+// jsonWriteStr(tmp, "class", "pop-up");
+// request->send(200, "text/html", tmp);
+// });
+//
+// /*
+// * Upgrade
+// */
+// server.on("/upgrade", HTTP_GET, [](AsyncWebServerRequest* request) {
+// myNotAsyncActions->make(do_UPGRADE);
+// request->send(200, "text/html");
+// });
SerialPrint("I", F("Web"), F("WebAdmin Init"));
}
diff --git a/src/WebSocket.cpp b/src/WebSocket.cpp
index f5765956..f94b03ca 100644
--- a/src/WebSocket.cpp
+++ b/src/WebSocket.cpp
@@ -34,8 +34,6 @@ void wsSendSetup() {
i++;
deserializeJson(doc, file);
wsBuf += doc.as() + "\n";
- // wsPublishData("config", doc.as());
- // Serial.println(doc.as());
} while (file.findUntil(",", "]"));
SerialPrint("I", F("WS"), F("completed send config"));
}