arduino/esp-clock
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

optimise wifi disconnect check

Browse Source
This commit is contained in:
Nicu Hodos 2021-12-07 11:36:24 +01:00
parent 900cf664b4
commit 24dee5c4ec
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/ir.h
View File

@ -51,6 +51,7 @@ namespace Ir {
{ {
case 0x9F: case 0x9F:
avrOn = false; avrOn = false;
tCheckWifi.enable();
break; break;
case 0xC4: case 0xC4:
case 0xD0: case 0xD0:

16
src/esp_clock.cpp
View File

@ -1,11 +1,15 @@
#include <Arduino.h> #include <Arduino.h>
void onWifiConnected();
void checkWifiCallback();
#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 dayChanged;
StatusRequest wifiConnected; StatusRequest wifiConnected;
Task tCheckWifi(5000, TASK_FOREVER, checkWifiCallback, &ts);
#include "display.h" #include "display.h"
#include "wifi.h" #include "wifi.h"
@ -16,12 +20,8 @@ StatusRequest wifiConnected;
#define STAY_CONNECTED_AFTER_BOOT 5*60 #define STAY_CONNECTED_AFTER_BOOT 5*60
void wifiConnectedCallback();
void checkWifiCallback();
Task tCheckWifi(5000, TASK_FOREVER, checkWifiCallback, &ts);
Task tWifiReconnect(Wifi::reconnect, &ts); Task tWifiReconnect(Wifi::reconnect, &ts);
Task tWifiConnected(wifiConnectedCallback, &ts); Task tWifiConnected(onWifiConnected, &ts);
void setup() { void setup() {
Serial.begin(9600); Serial.begin(9600);
@ -45,19 +45,19 @@ void loop() {
ts.execute(); ts.execute();
} }
void wifiConnectedCallback() { void onWifiConnected() {
Wifi::printStatus(); Wifi::printStatus();
if (time_t newTime = Ntp::updateTime()) { if (time_t newTime = Ntp::updateTime()) {
Serial.println(asctime(localtime(&newTime))); Serial.println(asctime(localtime(&newTime)));
Ntp::lastConnectedTime = newTime; Ntp::lastConnectedTime = newTime;
} }
Ota::tLoop.enable(); Ota::tLoop.enable();
tCheckWifi.enable(); if (!Ir::avrOn) tCheckWifi.enable();
Mqtt::client.connect(); Mqtt::client.connect();
} }
void checkWifiCallback() { void checkWifiCallback() {
if ((difftime(now(), Ntp::lastConnectedTime) > STAY_CONNECTED_AFTER_BOOT) && !Ir::avrOn) { if (difftime(now(), Ntp::lastConnectedTime) > STAY_CONNECTED_AFTER_BOOT) {
Wifi::disconnect(); Wifi::disconnect();
Ota::tLoop.disable(); Ota::tLoop.disable();
tCheckWifi.disable(); tCheckWifi.disable();