Merge pull request #284 from DmitriyTychina/ver4dev

Ver4dev
This commit is contained in:
2023-09-03 09:04:07 +03:00
committed by GitHub
5 changed files with 13 additions and 11 deletions

View File

@@ -3,7 +3,8 @@
#include "Global.h" #include "Global.h"
#include "MqttClient.h" #include "MqttClient.h"
boolean isNetworkActive(); // boolean isNetworkActive();
inline boolean isNetworkActive() {return WiFi.status() == WL_CONNECTED;};
void routerConnect(); void routerConnect();
bool startAPMode(); bool startAPMode();
boolean RouterFind(String ssid); boolean RouterFind(String ssid);

View File

@@ -91,6 +91,8 @@
"esp8266_1mb": [], "esp8266_1mb": [],
"esp8266_1mb_ota": [], "esp8266_1mb_ota": [],
"esp8285_1mb": [], "esp8285_1mb": [],
"esp8285_1mb_ota": [] "esp8285_1mb_ota": [],
} "esp8266_2mb": [],
"esp8266_2mb_ota": []
}
} }

View File

@@ -9,7 +9,7 @@
"id": "impulse", "id": "impulse",
"widget": "anydataDef", "widget": "anydataDef",
"page": "Кнопки", "page": "Кнопки",
"descr": "Количество нажаний", "descr": "Количество нажатий",
"needSave": 0, "needSave": 0,
"int": 300, "int": 300,
"inv": 1, "inv": 1,
@@ -48,6 +48,8 @@
"esp8266_1mb": [], "esp8266_1mb": [],
"esp8266_1mb_ota": [], "esp8266_1mb_ota": [],
"esp8285_1mb": [], "esp8285_1mb": [],
"esp8285_1mb_ota": [] "esp8285_1mb_ota": [],
"esp8266_2mb": [],
"esp8266_2mb_ota": []
} }
} }

View File

@@ -64,9 +64,6 @@
"esp8266_1mb_ota": [ "esp8266_1mb_ota": [
"adafruit/Adafruit BMP280 Library" "adafruit/Adafruit BMP280 Library"
], ],
"esp8266_2mb": [
"adafruit/Adafruit BMP280 Library"
],
"esp8285_1mb": [ "esp8285_1mb": [
"adafruit/Adafruit BMP280 Library" "adafruit/Adafruit BMP280 Library"
], ],

View File

@@ -115,9 +115,9 @@ boolean RouterFind(String ssid) {
return res; return res;
} }
boolean isNetworkActive() { // boolean isNetworkActive() {
return WiFi.status() == WL_CONNECTED; // return WiFi.status() == WL_CONNECTED;
} // }
uint8_t RSSIquality() { uint8_t RSSIquality() {
uint8_t res = 0; uint8_t res = 0;