Rainbow wheel while waiting for client

ampel-firmware/src/lib/WiFiManager/WiFiManager.cpp

@@ -604,6 +604,10 @@ boolean  WiFiManager::startConfigPortal(char const *apName, char const *apPasswo
   // blocking loop waiting for config
   while(1){
 
+    if ( _waiting_for_client_callback != NULL){
+      _waiting_for_client_callback();
+    }
+
     // if timed out or abort, break
     if(configPortalHasTimeout() || abort){
       DEBUG_WM(DEBUG_DEV,F("configportal abort"));
@@ -2198,6 +2202,11 @@ void WiFiManager::setPreSaveConfigCallback( std::function<void()> func ) {
   _presavecallback = func;
 }
 
+// CUSTOM for Ampel
+void WiFiManager::setWaitingForClientCallback( std::function<void()> func ) {
+  _waiting_for_client_callback = func;
+}
+
 /**
  * set custom head html
  * custom element will be added to head, eg. new style tag etc.

ampel-firmware/src/lib/WiFiManager/WiFiManager.h

@@ -216,6 +216,9 @@ class WiFiManager
     //called when settings before have been changed and connection was successful
     void          setPreSaveConfigCallback( std::function<void()> func );
 
+    //called while waiting for client to connect to config. Used for LEDs
+    void          setWaitingForClientCallback( std::function<void()> func );
+
 
     //sets timeout before AP,webserver loop ends and exits even if there has been no setup.
     //useful for devices that failed to connect at some point and got stuck in a webserver loop
@@ -600,6 +603,7 @@ class WiFiManager
     std::function<void()> _presavecallback;
     std::function<void()> _saveparamscallback;
     std::function<void()> _resetcallback;
+    std::function<void()> _waiting_for_client_callback;
 
     template <class T>
     auto optionalIPFromString(T *obj, const char *s) -> decltype(  obj->fromString(s)  ) {
@@ -613,4 +617,4 @@ class WiFiManager
 
 #endif
 
-#endif
+#endif
\ No newline at end of file

ampel-firmware/wifi_util.cpp

@@ -50,22 +50,26 @@ namespace wifi {
       wifiManager.resetSettings();
     }, F("(Resets wifi config)"));
 
-    wifiManager.setAPCallback([](WiFiManager *x) {
-      led_effects::showRainbowWheel();
+//    wifiManager.setAPCallback([](WiFiManager *x) {
+//      led_effects::showRainbowWheel();
+//    });
+//
+    wifiManager.setWaitingForClientCallback([](){
+      led_effects::showRainbowWheel(50); // Shouldn't last too long, web server needs to be able to answer.
     });
-
-    wifiManager.setWebServerCallback([]() {
-      led_effects::showKITTWheel(color::green);
-    });
-
-    wifiManager.setSaveConfigCallback([]() {
-      led_effects::showKITTWheel(color::blue);
-    });
-
-    wifiManager.setSaveConfigCallback([]() {
-      led_effects::showKITTWheel(color::magenta);
-    });
-
+//
+//    wifiManager.setWebServerCallback([]() {
+//      led_effects::showKITTWheel(color::green);
+//    });
+//
+//    wifiManager.setSaveConfigCallback([]() {
+//      led_effects::showKITTWheel(color::blue);
+//    });
+//
+//    wifiManager.setSaveConfigCallback([]() {
+//      led_effects::showKITTWheel(color::magenta);
+//    });
+//
     wifiManager.autoConnect(hostname);
   }
 }