diff --git a/include/display.h b/include/display.h index 6caeb41..9aac3b9 100644 --- a/include/display.h +++ b/include/display.h @@ -63,7 +63,7 @@ namespace Display { currentHour = hour(); Display::adjustBrightness(); hourChanged.signal(); - if (currentHour == 8) dayChanged.signal(); + if (currentHour == 8) Wifi::reconnect(); } if (currentMin != minute()) { currentMin = minute(); diff --git a/src/esp_clock.cpp b/src/esp_clock.cpp index bf993be..40bee75 100644 --- a/src/esp_clock.cpp +++ b/src/esp_clock.cpp @@ -1,18 +1,18 @@ #include -void onWifiConnected(); void checkWifiCallback(); +void onWifiConnected(); #define _TASK_STATUS_REQUEST #include Scheduler ts; StatusRequest hourChanged; -StatusRequest dayChanged; StatusRequest wifiConnected; Task tCheckWifi(5000, TASK_FOREVER, checkWifiCallback, &ts); +Task tWifiConnected(onWifiConnected, &ts); -#include "display.h" #include "wifi.h" +#include "display.h" #include "ntp_time.h" #include "mqtt.h" #include "ota.h" @@ -20,9 +20,6 @@ Task tCheckWifi(5000, TASK_FOREVER, checkWifiCallback, &ts); #define STAY_CONNECTED_AFTER_BOOT 5*60 -Task tWifiReconnect(Wifi::reconnect, &ts); -Task tWifiConnected(onWifiConnected, &ts); - void setup() { Serial.begin(9600); @@ -33,9 +30,7 @@ void setup() { Mqtt::setup(); hourChanged.setWaiting(); - dayChanged.setWaiting(); wifiConnected.setWaiting(); - tWifiReconnect.waitFor(&dayChanged); tWifiConnected.waitFor(&wifiConnected); Wifi::setup();