используем везде isNetworkActive()

This commit is contained in:
DmitriyTychina
2023-09-03 19:33:40 +03:00
parent 646128b999
commit 93dfa8ee83
7 changed files with 8 additions and 8 deletions

View File

@@ -5,7 +5,7 @@ void mqttInit() {
ts.add(
WIFI_MQTT_CONNECTION_CHECK, MQTT_RECONNECT_INTERVAL,
[&](void*) {
if (WiFi.status() == WL_CONNECTED) {
if (isNetworkActive()) {
SerialPrint("i", F("WIFI"), "http://" + jsonReadStr(settingsFlashJson, F("ip")));
wifiUptimeCalc();
if (mqtt.connected()) {

View File

@@ -10,7 +10,7 @@ public:
void sendHttpPOST(String url, String msg)
{
if (WiFi.status() == WL_CONNECTED)
if (isNetworkActive())
{
WiFiClient client;

View File

@@ -13,7 +13,7 @@ class TelegramLT : public IoTItem {
}
void sendTelegramMsg(bool often, String msg) {
if (WiFi.status() == WL_CONNECTED && (often || !often && _prevMsg != msg)) {
if (isNetworkActive() && (often || !often && _prevMsg != msg)) {
WiFiClient client;
HTTPClient http;
http.begin(client, "http://live-control.com/iotm/telegram.php");

View File

@@ -31,7 +31,7 @@ public:
void doByInterval()
{
if (WiFi.status() == WL_CONNECTED)
if (isNetworkActive())
{
String value = getItemValue(logid);
if (value != "")
@@ -55,7 +55,7 @@ public:
IoTValue execute(String command, std::vector<IoTValue> &param)
{
if (WiFi.status() == WL_CONNECTED)
if (isNetworkActive())
{
if (command == F("logGoogle"))
{ // Логирование определенного элемента по его идентификатору в GoogleSheet

View File

@@ -26,7 +26,7 @@ public:
{
String ret;
if (WiFi.status() == WL_CONNECTED)
if (isNetworkActive())
{
// char c;
String payload;

View File

@@ -20,7 +20,7 @@ void updateDeviceStatus() {
// jsonRead(settingsFlashJson, F("serverip"), serverIP);
String url = serverIP + F("/projects/esprebootstat.php");
// SerialPrint("i", "Stat", "url " + url);
if ((WiFi.status() == WL_CONNECTED)) {
if ((isNetworkActive())) {
WiFiClient client;
HTTPClient http;
http.begin(client, url);

View File

@@ -121,7 +121,7 @@ boolean RouterFind(String ssid) {
uint8_t RSSIquality() {
uint8_t res = 0;
if (WiFi.status() == WL_CONNECTED) {
if (isNetworkActive()) {
int rssi = WiFi.RSSI();
if (rssi >= -50) {
res = 6; //"Excellent";