WiFi callbacks

ampel-firmware/ampel-firmware.ino

@@ -56,25 +56,12 @@
  * and define your credentials and parameters in 'config.h'.
  */
 
-void failedConnection() {
-  Serial.println("Seriously. What???");
-  led_effects::showKITTWheel(color::red);
-}
-
-/*****************************************************************
- * Setup                                                         *
- *****************************************************************/
-void setup() {
-  led_effects::setupOnBoardLED();
-  led_effects::onBoardLEDOff();
-
-  Serial.begin(BAUDS);
-
-  web_config::initialize();
-
-  if (config::wifi_active) {
-    web_config::setWifiConnectionCallback([]() {
-      //TODO: Move somewhere else
+//void failedConnection() {
+//  Serial.println("Seriously. What???");
+//  led_effects::showKITTWheel(color::red);
+//}
+//
+void wifiConnected() {
   led_effects::showKITTWheel(color::green);
   Serial.println();
   Serial.print(F("WiFi - Connected! IP address: "));
@@ -88,19 +75,32 @@ void setup() {
     mqtt::initialize(ampel.sensorId);
   }
 
+  //TODO: If http enabled
   Serial.print(F("You can access this sensor via http://"));
   Serial.print(ampel.sensorId);
   Serial.print(F(".local (might be unstable) or http://"));
   Serial.println(WiFi.localIP());
-    });
+}
+
+void wifiFailed() {
+  Serial.print(F("WiFi - Could not connect to "));
+  Serial.println(config::current_ssid()); //TODO: Rename
+  led_effects::showKITTWheel(color::red);
+}
+/*****************************************************************
+ * Setup                                                         *
+ *****************************************************************/
+void setup() {
+  led_effects::setupOnBoardLED();
+  led_effects::onBoardLEDOff();
 
-    web_config::setWifiFailCallback(failedConnection);
+  Serial.begin(BAUDS);
 
-//  web_config::setWifiConnectionFailedCallback([]() {
-//    led_effects::showKITTWheel(color::red);
-//    Serial.println(F("Connection to WiFi failed"));
-//  });
-  }
+  web_config::initialize();
+
+  web_config::setWifiConnectionCallback(wifiConnected);
+
+  web_config::setWifiFailCallback(wifiFailed);
 
   pinMode(0, INPUT); // Flash button (used for forced calibration)
 
@@ -124,8 +124,6 @@ void setup() {
     wifi::defineCommands();
 #  if (AMPEL_HTTP==1)
     web_server::definePages();
-    //TODO: Rename. Not just web_server
-    // web_server::initialize();
 #  endif
   }
 

ampel-firmware/web_config.cpp

@@ -50,6 +50,7 @@ namespace web_config {
           "[s]").build();
 
   //TODO: Distribute to corresponding classes, possibly with callbacks?
+  //TODO: Chainedparameters?
   /**
    * CO2 sensor
    */