diff --git a/data/set.device.json b/data/set.device.json index c1163c58..4a501636 100644 --- a/data/set.device.json +++ b/data/set.device.json @@ -43,7 +43,7 @@ }, { "type": "h4", - "title": "Версия файловой системы: 270" + "title": "Версия файловой системы: 271" }, { "type": "h4", diff --git a/include/Consts.h b/include/Consts.h index 0d41037f..1efaa87f 100644 --- a/include/Consts.h +++ b/include/Consts.h @@ -1,7 +1,7 @@ #pragma once //===========Firmware============================================================================================================================================= -#define FIRMWARE_VERSION 270 +#define FIRMWARE_VERSION 271 //#define FLASH_SIZE_1MB #ifdef ESP8266 #define FIRMWARE_NAME "esp8266-iotm" diff --git a/include/Utils/WebUtils.h b/include/Utils/WebUtils.h index 15e412db..f9b74587 100644 --- a/include/Utils/WebUtils.h +++ b/include/Utils/WebUtils.h @@ -5,4 +5,3 @@ extern String getURL(const String& urls); extern const String getMethodName(AsyncWebServerRequest* request); extern const String getRequestInfo(AsyncWebServerRequest* request); -extern void wifiSignalInit(); \ No newline at end of file diff --git a/include/Utils/WiFiUtils.h b/include/Utils/WiFiUtils.h index a6dbcc34..7a634009 100644 --- a/include/Utils/WiFiUtils.h +++ b/include/Utils/WiFiUtils.h @@ -12,3 +12,5 @@ boolean RouterFind(String ssid); uint8_t RSSIquality(); +extern void wifiSignalInit(); + diff --git a/src/Utils/WebUtils.cpp b/src/Utils/WebUtils.cpp index f3807912..d7083c62 100644 --- a/src/Utils/WebUtils.cpp +++ b/src/Utils/WebUtils.cpp @@ -90,33 +90,3 @@ const String getRequestInfo(AsyncWebServerRequest* request) { return res; } -void wifiSignalInit() { - ts.add( - SYGNAL, 1000 * 60, [&](void*) { - SerialPrint("I", "System", printMemoryStatus()); - switch (RSSIquality()) { - case 0: - jsonWriteStr(configSetupJson, F("signal"), F("Уровень WiFi сигнала: не подключено к роутеру")); - break; - case 1: - jsonWriteStr(configSetupJson, F("signal"), F("Уровень WiFi сигнала: нет сигнала")); - break; - case 2: - jsonWriteStr(configSetupJson, F("signal"), F("Уровень WiFi сигнала: очень низкий")); - break; - case 3: - jsonWriteStr(configSetupJson, F("signal"), F("Уровень WiFi сигнала: низкий")); - break; - case 4: - jsonWriteStr(configSetupJson, F("signal"), F("Уровень WiFi сигнала: хороший")); - break; - case 5: - jsonWriteStr(configSetupJson, F("signal"), F("Уровень WiFi сигнала: очень хороший")); - break; - case 6: - jsonWriteStr(configSetupJson, F("signal"), F("Уровень WiFi сигнала: отличный")); - break; - } - }, - nullptr, true); -} diff --git a/src/Utils/WiFiUtils.cpp b/src/Utils/WiFiUtils.cpp index 10ecd39c..a8326df2 100644 --- a/src/Utils/WiFiUtils.cpp +++ b/src/Utils/WiFiUtils.cpp @@ -141,4 +141,36 @@ uint8_t RSSIquality() { return res; } +void wifiSignalInit() { + ts.add( + SYGNAL, 1000 * 60, [&](void*) { + SerialPrint("I", "System", printMemoryStatus()); + switch (RSSIquality()) { + case 0: + jsonWriteStr(configSetupJson, F("signal"), F("Уровень WiFi сигнала: не подключено к роутеру")); + break; + case 1: + jsonWriteStr(configSetupJson, F("signal"), F("Уровень WiFi сигнала: нет сигнала")); + break; + case 2: + jsonWriteStr(configSetupJson, F("signal"), F("Уровень WiFi сигнала: очень низкий")); + break; + case 3: + jsonWriteStr(configSetupJson, F("signal"), F("Уровень WiFi сигнала: низкий")); + break; + case 4: + jsonWriteStr(configSetupJson, F("signal"), F("Уровень WiFi сигнала: хороший")); + break; + case 5: + jsonWriteStr(configSetupJson, F("signal"), F("Уровень WiFi сигнала: очень хороший")); + break; + case 6: + jsonWriteStr(configSetupJson, F("signal"), F("Уровень WiFi сигнала: отличный")); + break; + } + }, + nullptr, true); +} + + diff --git a/src/main.cpp b/src/main.cpp index 45398eef..41936b07 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -55,6 +55,7 @@ void setup() { web_init(); initSt(); busInit(); + wifiSignalInit(); #ifdef UDP_ENABLED asyncUdpInit(); #endif