Use WiFiManager v1.x

 - New WiFiManager uses AsyncWiFiMulti, allowing for async wifi setup
 - Led now doesn't need ticker, but just a regular task
 - Also added task for async background rescan

Author: GuLinux

platformio.ini

@@ -18,7 +18,7 @@ lib_deps =
 	SPI
 	https://github.com/GuLinux/AsyncBufferedTcpLogger#v0.0.6
 	https://github.com/GuLinux/AsyncWebserverUtils#v0.3.1
-	https://github.com/GuLinux/WiFiManager.git#v0.1.1
+	https://github.com/GuLinux/WiFiManager.git#v1.2.0
 	https://github.com/GuLinux/ArduinoOTA-Manager.git#v0.0.3
 	ESP32Async/AsyncTCP@^3.4.0
 	ESP32Async/ESPAsyncWebServer@^3.7.7
@@ -37,11 +37,17 @@ lib_deps =
 	sensirion/Sensirion I2C SHT4x@^1.1.0
 	mathertel/OneButton@^2.6.1
 	tobiasschuerg/ESP8266 Influxdb @ ^3.13.2
+	arkhipenko/TaskScheduler@^3.8.5
 build_flags = 
 	-DELEGANTOTA_USE_ASYNC_WEBSERVER=1
 	-std=c++2a
 	-std=gnu++2a
 	-D_TASK_STD_FUNCTION
+	-DWIFIMANAGER_DEFAULT_RECONNECT=true
+	-DWIFIMANAGER_DEFAULT_RETRIES=3
+	-DDEBUG_WIFI_MULTI=2
+	-DBOOT_DELAY=1000
+	-DCORE_DEBUG_LEVEL=0
 build_unflags = 
 	-std=gnu++11
 	-std=cpp++11
@@ -57,9 +63,15 @@ framework = arduino
 lib_compat_mode = strict
 lib_ldf_mode = chain
 
-
 [env:lolin_s2_mini]
 board = lolin_s2_mini
 
 [env:esp32_c3_supermini]
 board = lolin_c3_mini
+
+; debug_server =
+;   ${platformio.packages_dir}/tool-openocd-esp32/bin/openocd
+;   -f
+;   ${platformio.packages_dir}/tool-openocd-esp32/share/openocd/scripts/board/esp32c3-builtin.cfg
+  
+

src/async_led.h

@@ -4,34 +4,34 @@
 #include <Arduino.h>
 #include <list>
 #include <Ticker.h>
+#include <TaskSchedulerDeclarations.h>
 
 class AsyncLed {
 public:
     AsyncLed(uint8_t pin, bool invertLogic=false) : pin{pin}, invertLogic{invertLogic} {
    }
 
-    void setup() {
+    void setup(Scheduler *scheduler) {
         pinMode(pin, OUTPUT);
         writePin(false);
         leds.push_back(this);
-        AsyncLed::setupTicker();
+        AsyncLed::setupTask(scheduler);
     }
 
     float duty() const {
         return _duty;
     }
 
-    static void setupTicker() {
-        if(ticker) {
+    static void setupTask(Scheduler *scheduler) {
+        if(task) {
             return;
         }
-        ticker = new Ticker();
-        ticker->attach_ms(100, [](){
-            // Serial.println("Tick");
+        task = new Task(100, TASK_FOREVER, [](){
+            // Serial.println("Task running");
             for(auto led: leds) {
                 led->loop();
             }
-        });
+        }, scheduler, true);
         // Serial.printf("Ticker active: %d\n", ticker.active());  
     }
 
@@ -103,7 +103,7 @@ class AsyncLed {
         }
 
     }
-    static inline Ticker *ticker = nullptr;
+    static inline Task *task = nullptr;
     static inline std::list<AsyncLed*> leds;
 };
 

src/main.cpp

@@ -35,6 +35,8 @@ OneButton userButton;
 
 APB::WebServer webServer(scheduler);
 
+Task rescanTask;
+
 
 #define LOG_SCOPE "APB::Main - "
 
@@ -62,19 +64,33 @@ void setup() {
   APB::Settings::Instance.setup();
   APB::InfluxDb::Instance.setup(scheduler);
 
-  APB::StatusLed::Instance.setup();
+  APB::StatusLed::Instance.setup(&scheduler);
   #ifdef WIFI_POWER_TX
   WiFi.setTxPower(WIFI_POWER_TX);
   #endif
   #ifdef WIFI_POWER_RX
   WiFi.setTxPower(WIFI_POWER_RX);
   #endif
 
+  WiFi.onEvent([](arduino_event_id_t event, arduino_event_info_t){
+    Log.infoln(LOG_SCOPE "WiFi event: %s", WiFi.eventName(event));
+  });
 
-  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());
+  rescanTask.set(30'000, TASK_FOREVER, [](){
+    Log.infoln(LOG_SCOPE "Rescanning WiFi networks");
+    WiFiManager::Instance.rescan();
+  });
+  scheduler.addTask(rescanTask);
+  WiFiManager::Instance.setOnConnectedCallback([](const AsyncWiFiMulti::ApSettings &){
+    APB::StatusLed::Instance.okPattern();
+    rescanTask.disable();
+  });
+  WiFiManager::Instance.setOnConnectionFailedCallback([](){
+    APB::StatusLed::Instance.wifiConnectionFailedPattern();
+    rescanTask.enableDelayed(30'000);
+  });
+  WiFiManager::Instance.setOnDisconnectedCallback(std::bind(&APB::StatusLed::wifiConnectionFailedPattern, &APB::StatusLed::Instance));
+  WiFiManager::Instance.setup(&APB::Settings::Instance.wifi());
   Wire.begin(I2C_SDA_PIN, I2C_SCL_PIN);
   Wire.setClock(100000);
   APB::Ambient::Instance.setup(scheduler);

src/statusled.cpp

@@ -6,8 +6,8 @@ APB::StatusLed &APB::StatusLed::Instance = *new APB::StatusLed();
 APB::StatusLed::StatusLed() : led{APB_STATUS_LED_PIN, APB_STATUS_LED_INVERT_LOGIC} {
 }
 
-void APB::StatusLed::setup() {
-    led.setup();
+void APB::StatusLed::setup(Scheduler *scheduler) {
+    led.setup(scheduler);
     setDuty(Settings::Instance.statusLedDuty());
     setupPattern();
 }

src/statusled.h

@@ -9,7 +9,7 @@ class StatusLed {
 public:
     static StatusLed &Instance;
     StatusLed();
-    void setup();
+    void setup(Scheduler *scheduler);
     float duty() const;
     void setDuty(float duty);