Move WiFi manager to an external library

Author: GuLinux

platformio.ini

@@ -20,13 +20,13 @@ lib_deps =
 	https://github.com/mathieucarbou/ESPAsyncWebServer.git#v3.1.5
 	https://github.com/GuLinux/AsyncBufferedTcpLogger#v0.0.2
 	https://github.com/GuLinux/AsyncWebserverUtils#v0.0.2
+	https://github.com/GuLinux/WiFiManager.git#v0.0.1
 	ayushsharma82/ElegantOTA @ 3.1.1
 	bblanchon/ArduinoJson@^7.2.0
 	adafruit/Adafruit Unified Sensor@^1.1.14
 	adafruit/Adafruit BusIO@^1.14.5
 	adafruit/Adafruit BME280 Library@^2.2.4
 	adafruit/DHT sensor library@^1.4.6
-	arkhipenko/TaskScheduler@^3.7.0
 	jsc/ArduinoLog@^1.2.1
 	yuriisalimov/NTC_Thermistor@^2.0.3
 	robtillaart/SHT31 @ ^0.5.0

src/configuration.h

@@ -11,7 +11,7 @@
 
 
 #define APB_STATUS_LED_INVERT_LOGIC false
-#define APB_MAX_STATIONS 5
+#define WIFIMANAGER_MAX_STATIONS 5
 #define APB_NETWORK_LOGGER_BACKLOG 0
 #define APB_AMBIENT_UPDATE_INTERVAL_SECONDS 5
 #define APB_HEATER_UPDATE_INTERVAL_SECONDS 5

src/main.cpp

@@ -2,11 +2,12 @@
 #include <ElegantOTA.h>
 #include <TaskScheduler.h>
 #include <ArduinoLog.h>
+#include <wifimanager.h>
 
 #include "configuration.h"
 
 #include "webserver.h"
-#include "wifimanager.h"
+
 #include "settings.h"
 #include "ambient/ambient.h"
 #include "heater.h"
@@ -36,6 +37,7 @@ APB::WebServer webServer(scheduler);
 #define LOG_SCOPE "APB::Main - "
 
 using namespace std::placeholders;
+using namespace GuLinux;
 
 void setupArduinoOTA();
 
@@ -61,7 +63,10 @@ void setup() {
 
   APB::StatusLed::Instance.setup();
 
-  APB::WiFiManager::Instance.setup(scheduler);
+  WiFiManager::Instance.setOnConnectedCallback(std::bind(&APB::StatusLed::okPattern, &APB::StatusLed::Instance));
+  WiFiManager::Instance.setOnConnectionFailedCallback(std::bind(&APB::StatusLed::wifiConnectionFailedPattern, &APB::StatusLed::Instance));
+  WiFiManager::Instance.setOnNoStationsFoundCallback(std::bind(&APB::StatusLed::noWiFiStationsFoundPattern, &APB::StatusLed::Instance));
+  WiFiManager::Instance.setup(scheduler, &APB::Settings::Instance.wifi());
   Wire.begin(I2C_SDA_PIN, I2C_SCL_PIN);
   Wire.setClock(100000);
   APB::Ambient::Instance.setup(scheduler);
@@ -75,14 +80,14 @@ void setup() {
 #ifdef ONEBUTTON_USER_BUTTON_1
   userButton.attachDoubleClick([]() {
     Log.infoln("[OneButton] User button 1 double clicked, reconnecting WiFi");
-    APB::WiFiManager::Instance.reconnect();
+    WiFiManager::Instance.reconnect();
   });
   userButton.setup(ONEBUTTON_USER_BUTTON_1, INPUT, false);
 #endif
 }
 
 void loop() {
-  APB::WiFiManager::Instance.loop(); 
+  WiFiManager::Instance.loop(); 
   scheduler.execute();
   ElegantOTA.loop();
 

src/webserver.cpp

@@ -14,6 +14,7 @@
 #define LOG_SCOPE "APB::WebServer "
 
 using namespace std::placeholders;
+using namespace GuLinux;
 
 APB::WebServer::WebServer(Scheduler &scheduler) : server(80),
     events("/api/events"),

src/webserver.h

@@ -6,7 +6,7 @@
 #include <AsyncJson.h>
 
 #include "settings.h"
-#include "wifimanager.h"
+#include <wifimanager.h>
 #include "ambient/ambient.h"
 #include "heater.h"
 #include "powermonitor.h"
@@ -27,7 +27,6 @@ class WebServer {
     JsonDocument eventsDocument;
     std::array<char, 800> eventsString;
 
-
     void onGetStatus(AsyncWebServerRequest *request);
     void onGetConfig(AsyncWebServerRequest *request);
     void onGetHistory(AsyncWebServerRequest *request);