From 24f23955b848835030e8f5f356b973ba573f3f57 Mon Sep 17 00:00:00 2001 From: biver Date: Tue, 15 Nov 2022 20:01:33 +0300 Subject: [PATCH 1/3] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D1=8F?= =?UTF-8?q?=D0=B5=D0=BC=20=D0=B8=D0=BD=D1=84=D0=BE=D1=80=D0=BC=D0=B0=D1=86?= =?UTF-8?q?=D0=B8=D1=8E=20=D0=BE=20=D0=BF=D0=BE=D0=B4=D0=B4=D0=B5=D0=BB?= =?UTF-8?q?=D0=BA=D0=B0=D1=85=20ds18b20?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/modules/sensors/Ds18b20/modinfo.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/sensors/Ds18b20/modinfo.json b/src/modules/sensors/Ds18b20/modinfo.json index 708708ba..bf2ba4b0 100644 --- a/src/modules/sensors/Ds18b20/modinfo.json +++ b/src/modules/sensors/Ds18b20/modinfo.json @@ -29,7 +29,7 @@ "esp8266_4mb": 15 }, "title": "Cенсор температуры ds18b20", - "moduleDesc": "Позволяет получить значения температуры с Ds18b20.", + "moduleDesc": "Позволяет получить значения температуры с Ds18b20. О подделках: https://github.com/cpetrich/counterfeit_DS18B20", "propInfo": { "pin": "GPIO номер, к которому подключена шина данных датчиков.", "index": "Порядковый номер датчика на шине.", From a619bab16763b716453abddc20f5a3bbfdc28954 Mon Sep 17 00:00:00 2001 From: biver Date: Tue, 15 Nov 2022 20:01:59 +0300 Subject: [PATCH 2/3] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D1=8F=D0=B5=D0=BC=20=D0=BE=D1=88=D0=B8=D0=B1=D0=BA=D0=B8=20?= =?UTF-8?q?=D0=BE=D0=B1=D1=80=D0=B0=D0=B1=D0=BE=D1=82=D0=BA=D0=B8=20=D0=98?= =?UTF-8?q?=D0=94=5F=20=D0=B2=20Uart?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/modules/sensors/UART/Uart.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/modules/sensors/UART/Uart.cpp b/src/modules/sensors/UART/Uart.cpp index df2501f5..a6d5040e 100644 --- a/src/modules/sensors/UART/Uart.cpp +++ b/src/modules/sensors/UART/Uart.cpp @@ -106,6 +106,7 @@ class UART : public IoTItem { case 2: // формат событий для Nextion ID=Value0xFF0xFF0xFF printStr += eventItem->getID(); int indexOf_ = printStr.indexOf("_"); + //Serial.println(printStr + " fff " + indexOf_); if (indexOf_ == -1) return; // пропускаем событие, если нет используемого признака типа данных - _txt или _vol if (printStr.indexOf("_txt") > 0) { @@ -113,11 +114,11 @@ class UART : public IoTItem { printStr += eventItem->getValue(); printStr += "\""; } else if (printStr.indexOf("_val") > 0) { + printStr += eventItem->getValue(); printStr.replace(".", ""); printStr.replace("_val", ".val="); - printStr += eventItem->getValue(); } else { - if (indexOf_ == printStr.length()) printStr.replace("_", ""); + if (indexOf_ == printStr.length()-1) printStr.replace("_", ""); else printStr.replace("_", "."); printStr += "="; printStr += eventItem->getValue(); From 3668874154cf553c71f515442431d037f9ecff9e Mon Sep 17 00:00:00 2001 From: biver Date: Tue, 15 Nov 2022 23:04:26 +0300 Subject: [PATCH 3/3] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D1=8F?= =?UTF-8?q?=D0=B5=D0=BC=20=D0=B2=D0=BE=D0=B7=D0=BC=D0=BE=D0=B6=D0=BD=D0=BE?= =?UTF-8?q?=D1=81=D1=82=D1=8C=20=D1=83=D1=81=D1=82=D0=B0=D0=BD=D0=BE=D0=B2?= =?UTF-8?q?=D0=B8=D1=82=D1=8C=20SSID=20=D0=B8=20=D0=BF=D0=B0=D1=80=D0=BE?= =?UTF-8?q?=D0=BB=D1=8C=20WiFi=20=D1=87=D0=B5=D1=80=D0=B5=D0=B7=20get=20ht?= =?UTF-8?q?tp://192.168.4.1/set=3Frouterssid=3D&routerpass=3D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/StandWebServer.cpp | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/src/StandWebServer.cpp b/src/StandWebServer.cpp index 6d1e5d58..aa609150 100644 --- a/src/StandWebServer.cpp +++ b/src/StandWebServer.cpp @@ -38,6 +38,22 @@ void standWebServerInit() { // HTTP.send(200, "text/plain", "ok"); // }); + + HTTP.on("/set", HTTP_GET, []() { + if (HTTP.hasArg(F("routerssid")) && WiFi.getMode() == WIFI_AP) { + jsonWriteStr(settingsFlashJson, F("routerssid"), HTTP.arg(F("routerssid"))); + syncSettingsFlashJson(); + HTTP.send(200, "text/plain", "ok"); + } + + if (HTTP.hasArg(F("routerpass")) && WiFi.getMode() == WIFI_AP) { + jsonWriteStr(settingsFlashJson, F("routerpass"), HTTP.arg(F("routerpass"))); + syncSettingsFlashJson(); + HTTP.send(200, "text/plain", "ok"); + } + + }); + // Добавляем функцию Update для перезаписи прошивки по WiFi при 1М(256K FileFS) и выше // httpUpdater.setup(&HTTP);