jeans/openHASP
jeans/openHASP
1
0
Fork 0
mirror of https://github.com/HASwitchPlate/openHASP.git synced 2025-07-27 05:06:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Load all settings before the setup functions

Browse Source
This commit is contained in:
fvanroie 2020-03-29 03:18:35 +02:00
parent fb7c827015
commit 5b6bc1afb5
1 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/hasp_wifi.cpp
View File

@ -65,17 +65,15 @@ String wifiGetMacAddress(int start, const char * seperator)
void wifiConnected(IPAddress ipaddress) void wifiConnected(IPAddress ipaddress)
{ {
bool isConnected = WiFi.status() == WL_CONNECTED;
Log.notice(F("WIFI: Received IP address %s"), ipaddress.toString().c_str()); Log.notice(F("WIFI: Received IP address %s"), ipaddress.toString().c_str());
Log.verbose(F("WIFI: Connected = %s"), isConnected ? PSTR("yes") : PSTR("no")); Log.verbose(F("WIFI: Connected = %s"), WiFi.status() == WL_CONNECTED ? PSTR("yes") : PSTR("no"));
if(isConnected) { // if(isConnected) {
// mqttReconnect(); // mqttReconnect();
// haspReconnect(); // haspReconnect();
httpReconnect(); // httpReconnect();
// mdnsStart(); // mdnsStart();
} //}
} }
void wifiDisconnected(const char * ssid, uint8_t reason) void wifiDisconnected(const char * ssid, uint8_t reason)
@ -137,7 +135,7 @@ void wifiSetup(JsonObject settings)
{ {
char buffer[128]; char buffer[128];
wifiSetConfig(settings); // wifiSetConfig(settings);
if(strlen(wifiSsid) == 0) { if(strlen(wifiSsid) == 0) {
String apSsdid = F("HASP-"); String apSsdid = F("HASP-");
@ -176,9 +174,20 @@ void wifiSetup(JsonObject settings)
} }
} }
bool wifiLoop() bool wifiEvery5Seconds()
{ {
return WiFi.status() == WL_CONNECTED; if(WiFi.status() == WL_CONNECTED) {
return true;
} else {
wifiReconnectCounter++;
if(wifiReconnectCounter > 45) {
Log.error(F("WIFI: Retries exceed %u: Rebooting..."), wifiReconnectCounter);
dispatchReboot(false);
}
Log.warning(F("WIFI: No Connection... retry %u"), wifiReconnectCounter);
if(wifiReconnectCounter % 6 == 0) WiFi.begin(wifiSsid, wifiPassword);
return false;
}
} }
bool wifiGetConfig(const JsonObject & settings) bool wifiGetConfig(const JsonObject & settings)