From 6625ade7c6c48c21761d3f35d752a4f5d25afe2a Mon Sep 17 00:00:00 2001
From: Eric Duminil <eric.duminil@gmail.com>
Date: Tue, 8 Feb 2022 17:01:11 +0100
Subject: [PATCH] Small changes
---
ampel-firmware/ampel-firmware.ino | 5 +----
ampel-firmware/wifi_util.cpp | 4 ++++
ampel-firmware/wifi_util.h | 1 +
3 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/ampel-firmware/ampel-firmware.ino b/ampel-firmware/ampel-firmware.ino
index 3f4cc49..07dda7f 100644
--- a/ampel-firmware/ampel-firmware.ino
+++ b/ampel-firmware/ampel-firmware.ino
@@ -12,7 +12,6 @@
*/
#include "ampel-firmware.h"
-//TODO: Move as many includes into cpp as possible
/*****************************************************************
* GPL License *
@@ -96,8 +95,6 @@ void setup() {
});
#endif
- void setWifiConnectionFailedCallback(void (*function)());
-
pinMode(0, INPUT); // Flash button (used for forced calibration)
Serial.println();
@@ -221,7 +218,7 @@ void checkFlashButton() {
void keepServicesAlive() {
#ifdef AMPEL_WIFI
web_config::update();
- if (WiFi.status() == WL_CONNECTED) {
+ if (wifi::connected()) {
ntp::update(); // NTP client has its own timer. It will connect to NTP server every 60s.
# ifdef AMPEL_MQTT
mqtt::keepConnection(); // MQTT client has its own timer. It will keep alive every 15s.
diff --git a/ampel-firmware/wifi_util.cpp b/ampel-firmware/wifi_util.cpp
index 8e54eb7..5c19f65 100644
--- a/ampel-firmware/wifi_util.cpp
+++ b/ampel-firmware/wifi_util.cpp
@@ -27,6 +27,10 @@ namespace config {
namespace wifi {
char local_ip[16]; // "255.255.255.255\0"
+ bool connected() {
+ return WiFi.status() == WL_CONNECTED;
+ }
+
void scanNetworks() {
Serial.println();
Serial.println(F("WiFi - Scanning..."));
diff --git a/ampel-firmware/wifi_util.h b/ampel-firmware/wifi_util.h
index eec6b89..cfe47bb 100644
--- a/ampel-firmware/wifi_util.h
+++ b/ampel-firmware/wifi_util.h
@@ -4,6 +4,7 @@
namespace wifi {
extern char local_ip[16];
void defineCommands();
+ bool connected();
}
#endif
--
GitLab