simplify wifi reconnect

This commit is contained in:
Nicu Hodos 2021-12-07 11:44:53 +01:00
parent 24dee5c4ec
commit 72b654bb7f
2 changed files with 4 additions and 9 deletions

View File

@ -63,7 +63,7 @@ namespace Display {
currentHour = hour(); currentHour = hour();
Display::adjustBrightness(); Display::adjustBrightness();
hourChanged.signal(); hourChanged.signal();
if (currentHour == 8) dayChanged.signal(); if (currentHour == 8) Wifi::reconnect();
} }
if (currentMin != minute()) { if (currentMin != minute()) {
currentMin = minute(); currentMin = minute();

View File

@ -1,18 +1,18 @@
#include <Arduino.h> #include <Arduino.h>
void onWifiConnected();
void checkWifiCallback(); void checkWifiCallback();
void onWifiConnected();
#define _TASK_STATUS_REQUEST #define _TASK_STATUS_REQUEST
#include <TaskScheduler.h> #include <TaskScheduler.h>
Scheduler ts; Scheduler ts;
StatusRequest hourChanged; StatusRequest hourChanged;
StatusRequest dayChanged;
StatusRequest wifiConnected; StatusRequest wifiConnected;
Task tCheckWifi(5000, TASK_FOREVER, checkWifiCallback, &ts); Task tCheckWifi(5000, TASK_FOREVER, checkWifiCallback, &ts);
Task tWifiConnected(onWifiConnected, &ts);
#include "display.h"
#include "wifi.h" #include "wifi.h"
#include "display.h"
#include "ntp_time.h" #include "ntp_time.h"
#include "mqtt.h" #include "mqtt.h"
#include "ota.h" #include "ota.h"
@ -20,9 +20,6 @@ Task tCheckWifi(5000, TASK_FOREVER, checkWifiCallback, &ts);
#define STAY_CONNECTED_AFTER_BOOT 5*60 #define STAY_CONNECTED_AFTER_BOOT 5*60
Task tWifiReconnect(Wifi::reconnect, &ts);
Task tWifiConnected(onWifiConnected, &ts);
void setup() { void setup() {
Serial.begin(9600); Serial.begin(9600);
@ -33,9 +30,7 @@ void setup() {
Mqtt::setup(); Mqtt::setup();
hourChanged.setWaiting(); hourChanged.setWaiting();
dayChanged.setWaiting();
wifiConnected.setWaiting(); wifiConnected.setWaiting();
tWifiReconnect.waitFor(&dayChanged);
tWifiConnected.waitFor(&wifiConnected); tWifiConnected.waitFor(&wifiConnected);
Wifi::setup(); Wifi::setup();