Done

ampel-firmware/web_config.cpp

@@ -130,9 +130,9 @@ namespace web_config {
   TextTParameter<STRING_LEN> ntpServerParam =
       Builder<TextTParameter<STRING_LEN>>("ntp_server").label("NTP Server").defaultValue(NTP_SERVER).build();
   IntTParameter<int16_t> timeOffsetParam = Builder<IntTParameter<int16_t>>("timezone").label("Timezone").defaultValue(
-      UTC_OFFSET).min(-23).max(23).step(1).placeholder("[h]").build();
+  UTC_OFFSET).min(-23).max(23).step(1).placeholder("[h]").build();
   CheckboxTParameter dstParam = Builder<CheckboxTParameter>("dst").label("Daylight Saving Time?").defaultValue(
-      DAYLIGHT_SAVING_TIME).build();
+  DAYLIGHT_SAVING_TIME).build();
 
   /**
    * LoRaWAN
@@ -149,7 +149,6 @@ namespace web_config {
   LORAWAN_APPLICATION_EUI).build();
   TextTParameter<33> appKeyParam = Builder<TextTParameter<33>>("app_key").label("App key (MSB)").defaultValue(
   LORAWAN_APPLICATION_KEY).build();
-
 #endif
 
   OptionalGroupHtmlFormatProvider optionalGroupHtmlFormatProvider;
@@ -172,7 +171,7 @@ namespace web_config {
   }
 
   void initialize() {
-    iotWebConf = new IotWebConf(ampel.sensorId, &dnsServer, &http, AMPEL_PASSWORD, config_version);
+    iotWebConf = new IotWebConf(ampel.sensorId, &dnsServer, &http, "", config_version);
 
     iotWebConf->setHtmlFormatProvider(&optionalGroupHtmlFormatProvider);
 
@@ -182,6 +181,10 @@ namespace web_config {
     iotWebConf->getThingNameParameter()->label = "Ampel name";
     iotWebConf->getApPasswordParameter()->label = "Ampel password (user : 'admin')";
 
+    iotWebConf->getApPasswordParameter()->defaultValue = AMPEL_PASSWORD;
+    iotWebConf->getWifiSsidParameter()->defaultValue = WIFI_SSID;
+    iotWebConf->getWifiPasswordParameter()->defaultValue = WIFI_PASSWORD;
+
     co2Params.addItem(&timestepParam);
     co2Params.addItem(&temperatureOffsetParam);
     co2Params.addItem(&altitudeParam);
@@ -257,14 +260,10 @@ namespace web_config {
 
     iotWebConf->skipApStartup();
     //TODO: Add callbacks
-    //TODO: Add default values for SSID/password
     //TODO: Save LoRaWAN key if possible?
 
     iotWebConf->init();
 
-    //TODO: Authenticate only if required?
-    //TODO: / captive fast return?
-
     http.on("/config", [] {
       iotWebConf->handleConfig();
     });