mqtt using isWiFiConnected instead of IP-check
This commit is contained in:
parent
16374cf33b
commit
9f4f0dba79
@ -1,12 +1,10 @@
|
|||||||
#include "mqtt.h"
|
#include "mqtt.h"
|
||||||
|
|
||||||
#include "base.h"
|
|
||||||
#include <WiFiClient.h>
|
#include <WiFiClient.h>
|
||||||
#include <WiFi.h>
|
|
||||||
#include "log.h"
|
|
||||||
#include "PubSubClient.h"
|
#include "PubSubClient.h"
|
||||||
#include "console.h"
|
#include "console.h"
|
||||||
#include "wifi.h"
|
#include "wifi.h"
|
||||||
|
#include "log.h"
|
||||||
|
|
||||||
#define CONNECT_TIMEOUT_MILLISECONDS 5000
|
#define CONNECT_TIMEOUT_MILLISECONDS 5000
|
||||||
|
|
||||||
@ -48,7 +46,7 @@ void mqttLoop() {
|
|||||||
mqttConnected = connected;
|
mqttConnected = connected;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (WiFi.localIP() != 0 && isTimeSet() && !connected && (mqttLastConnectTry == 0 || millis() - mqttLastConnectTry > CONNECT_TIMEOUT_MILLISECONDS)) {
|
if (isWiFiConnected() && isTimeSet() && !connected && (mqttLastConnectTry == 0 || millis() - mqttLastConnectTry > CONNECT_TIMEOUT_MILLISECONDS)) {
|
||||||
error("MQTT", "Connecting: \"%s\"", MQTT_HOST);
|
error("MQTT", "Connecting: \"%s\"", MQTT_HOST);
|
||||||
mqttLastConnectTry = millis();
|
mqttLastConnectTry = millis();
|
||||||
mqtt.setServer(MQTT_HOST, 1883);
|
mqtt.setServer(MQTT_HOST, 1883);
|
||||||
|
|||||||
@ -158,6 +158,10 @@ void wifiLoop() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
bool isWiFiConnected() {
|
||||||
|
return wifiConnected;
|
||||||
|
}
|
||||||
|
|
||||||
bool isTimeSet() {
|
bool isTimeSet() {
|
||||||
return timeSet;
|
return timeSet;
|
||||||
}
|
}
|
||||||
|
|||||||
@ -9,6 +9,8 @@ void wifiLoop();
|
|||||||
|
|
||||||
void wifiConnect();
|
void wifiConnect();
|
||||||
|
|
||||||
|
bool isWiFiConnected();
|
||||||
|
|
||||||
bool isTimeSet();
|
bool isTimeSet();
|
||||||
|
|
||||||
time_t getTime();
|
time_t getTime();
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user