убрали лишние ошибки json

This commit is contained in:
Dmitry Borisenko
2022-02-22 16:40:46 +01:00
parent f4f93a32db
commit 993b2b25fd
12 changed files with 208 additions and 137 deletions

View File

@@ -7,14 +7,12 @@ void mqttInit() {
[&](void*) {
if (WiFi.status() == WL_CONNECTED) {
SerialPrint("i", F("WIFI"), F("OK"));
wifiUptimeCalc();
if (mqtt.connected()) {
SerialPrint("i", F("MQTT"), "OK");
mqttUptimeCalc();
handleMqttStatus(false);
static unsigned int prevMillis;
mqttUptime = mqttUptime + (millis() - prevMillis);
prevMillis = millis();
// setLedStatus(LED_OFF);
} else {
SerialPrint("E", F("MQTT"), F("✖ Connection lost"));
@@ -25,6 +23,7 @@ void mqttInit() {
} else {
SerialPrint("E", F("WIFI"), F("✖ Lost WiFi connection"));
ts.remove(WIFI_MQTT_CONNECTION_CHECK);
wifiUptime = 0;
startAPMode();
}
},
@@ -347,3 +346,15 @@ const String getStateStr(int e) {
break;
}
}
void mqttUptimeCalc() {
static unsigned int prevMillis;
mqttUptime = mqttUptime + (millis() - prevMillis);
prevMillis = millis();
}
void wifiUptimeCalc() {
static unsigned int prevMillis;
wifiUptime = wifiUptime + (millis() - prevMillis);
prevMillis = millis();
}