diff --git a/RX_FSK/RX_FSK.ino b/RX_FSK/RX_FSK.ino
index 4fb310d..3a27250 100644
--- a/RX_FSK/RX_FSK.ino
+++ b/RX_FSK/RX_FSK.ino
@@ -14,7 +14,7 @@
 #define LORA_LED  9
 
 // UNCOMMENT one of the constructor lines below
-U8X8_SSD1306_128X64_NONAME_SW_I2C *u8x8=NULL;  // initialize later after reading config file
+U8X8_SSD1306_128X64_NONAME_SW_I2C *u8x8 = NULL; // initialize later after reading config file
 //U8X8_SSD1306_128X64_NONAME_SW_I2C u8x8(/* clock=*/ OLED_SCL, /* data=*/ OLED_SDA, /* reset=*/ OLED_RST); // Unbuffered, basic graphics, software I2C
 //U8G2_SSD1306_128X64_NONAME_1_SW_I2C Display(U8G2_R0, /* clock=*/ OLED_SCL, /* data=*/ OLED_SDA, /* reset=*/ OLED_RST); // Page buffer, SW I2C
 //U8G2_SSD1306_128X64_NONAME_F_SW_I2C Display(U8G2_R0, /* clock=*/ OLED_SCL, /* data=*/ OLED_SDA, /* reset=*/ OLED_RST); // Full framebuffer, SW I2C
@@ -34,13 +34,13 @@ int ledPin = 1;
 String ledState;
 
 // Replaces placeholder with LED state value
-String processor(const String& var){
+String processor(const String& var) {
   Serial.println(var);
-  if(var == "STATE"){
-    if(digitalRead(ledPin)){
+  if (var == "STATE") {
+    if (digitalRead(ledPin)) {
       ledState = "ON";
     }
-    else{
+    else {
       ledState = "OFF";
     }
     Serial.print(ledState);
@@ -53,14 +53,16 @@ String processor(const String& var){
 
 const String sondeTypeSelect(int activeType) {
   String sts = "";
-  for(int i=0; i<3; i++) {
-     sts += "<option value=\"";
-     sts += sondeTypeStr[i];
-     sts += "\"";
-     if(activeType==i) { sts += " selected"; }
-     sts += ">";
-     sts += sondeTypeStr[i];
-     sts += "</option>";
+  for (int i = 0; i < 3; i++) {
+    sts += "<option value=\"";
+    sts += sondeTypeStr[i];
+    sts += "\"";
+    if (activeType == i) {
+      sts += " selected";
+    }
+    sts += ">";
+    sts += sondeTypeStr[i];
+    sts += "</option>";
   }
   return sts;
 }
@@ -75,29 +77,35 @@ char message[10240];
 
 void setupChannelList() {
   File file = SPIFFS.open("/qrg.txt", "r");
-  if(!file) {
+  if (!file) {
     Serial.println("There was an error opening the file '/qrg.txt' for reading");
     return;
   }
-  int i=0;
+  int i = 0;
   sonde.clearSonde();
-  Serial.println("Reading channel config:");  
-  while(file.available()) {
+  Serial.println("Reading channel config:");
+  while (file.available()) {
     String line = file.readStringUntil('\n');
-    if(!file.available()) break;
-    if(line[0] == '#') continue;
+    if (!file.available()) break;
+    if (line[0] == '#') continue;
     char *space = strchr(line.c_str(), ' ');
-    if(!space) continue;
+    if (!space) continue;
     *space = 0;
     float freq = atof(line.c_str());
     SondeType type;
-    if(space[1]=='4') { type=STYPE_RS41; }
-    else if (space[1]=='9') { type=STYPE_DFM09; }
-    else if (space[1]=='6') { type=STYPE_DFM06; }
+    if (space[1] == '4') {
+      type = STYPE_RS41;
+    }
+    else if (space[1] == '9') {
+      type = STYPE_DFM09;
+    }
+    else if (space[1] == '6') {
+      type = STYPE_DFM06;
+    }
     else continue;
-    int active = space[3]=='+'?1:0;
+    int active = space[3] == '+' ? 1 : 0;
     char *launchsite = strchr(line.c_str(), ' ');
-    Serial.printf("Add %f - type %d (on/off: %d)- Site: \n",freq,type,active,launchsite);
+    Serial.printf("Add %f - type %d (on/off: %d)- Site: \n", freq, type, active, launchsite);
     sonde.addSonde(freq, type, active, launchsite);
     i++;
   }
@@ -105,19 +113,19 @@ void setupChannelList() {
 
 const char *createQRGForm() {
   char *ptr = message;
-  strcpy(ptr,"<html><head><link rel=\"stylesheet\" type=\"text/css\" href=\"style.css\"></head><body><form action=\"qrg.html\" method=\"post\"><table><tr><th>ID</th><th>Active</th><th>Freq</th><th>Mode</th></tr>");
-   for(int i=0; i<sonde.config.maxsonde; i++) {
-    String s = sondeTypeSelect(i>=sonde.nSonde?2:sonde.sondeList[i].type);
-     sprintf(ptr+strlen(ptr), "<tr><td>%d</td><td><input name=\"A%d\" type=\"checkbox\" %s/></td>"
-        "<td><input name=\"F%d\" type=\"text\" value=\"%3.3f\"></td>"       
-        "<td><select name=\"T%d\">%s</select></td>",
-        i+1,
-        i+1, (i<sonde.nSonde&&sonde.sondeList[i].active)?"checked":"",
-        i+1, i>=sonde.nSonde?400.000:sonde.sondeList[i].freq,
-        i+1, s.c_str());
-   }
-   strcat(ptr,"</table><input type=\"submit\" value=\"Update\"/></form></body></html>");
-   return message;
+  strcpy(ptr, "<html><head><link rel=\"stylesheet\" type=\"text/css\" href=\"style.css\"></head><body><form action=\"qrg.html\" method=\"post\"><table><tr><th>ID</th><th>Active</th><th>Freq</th><th>Mode</th></tr>");
+  for (int i = 0; i < sonde.config.maxsonde; i++) {
+    String s = sondeTypeSelect(i >= sonde.nSonde ? 2 : sonde.sondeList[i].type);
+    sprintf(ptr + strlen(ptr), "<tr><td>%d</td><td><input name=\"A%d\" type=\"checkbox\" %s/></td>"
+            "<td><input name=\"F%d\" type=\"text\" value=\"%3.3f\"></td>"
+            "<td><select name=\"T%d\">%s</select></td>",
+            i + 1,
+            i + 1, (i < sonde.nSonde && sonde.sondeList[i].active) ? "checked" : "",
+            i + 1, i >= sonde.nSonde ? 400.000 : sonde.sondeList[i].freq,
+            i + 1, s.c_str());
+  }
+  strcat(ptr, "</table><input type=\"submit\" value=\"Update\"/></form></body></html>");
+  return message;
 }
 
 const char *handleQRGPost(AsyncWebServerRequest *request) {
@@ -125,7 +133,7 @@ const char *handleQRGPost(AsyncWebServerRequest *request) {
   // parameters: a_i, f_1, t_i  (active/frequency/type)
 #if 1
   File f = SPIFFS.open("/qrg.txt", "w");
-  if(!f) {
+  if (!f) {
     Serial.println("Error while opening '/qrg.txt' for writing");
     return "Error while opening '/qrg.txt' for writing";
   }
@@ -133,29 +141,29 @@ const char *handleQRGPost(AsyncWebServerRequest *request) {
   Serial.println("Handling post request");
 #if 0
   int params = request->params();
-  for(int i=0; i<params; i++) {
+  for (int i = 0; i < params; i++) {
     Serial.println(request->getParam(i)->name().c_str());
   }
 #endif
-  for(int i=1; i<=MAX_QRG; i++) {  
+  for (int i = 1; i <= MAX_QRG; i++) {
     snprintf(label, 10, "A%d", i);
     AsyncWebParameter *active = request->getParam(label, true);
     snprintf(label, 10, "F%d", i);
     AsyncWebParameter *freq = request->getParam(label, true);
-    if(!freq) continue;
+    if (!freq) continue;
     snprintf(label, 10, "T%d", i);
     AsyncWebParameter *type = request->getParam(label, true);
-    if(!type) continue;
+    if (!type) continue;
     const char *fstr = freq->value().c_str();
     const char *tstr = type->value().c_str();
-    Serial.printf("Processing a=%s, f=%s, t=%s\n", active?"YES":"NO", fstr, tstr);
-    char typech = (tstr[2]=='4'?'4':tstr[3]);  // Ugly TODO 
-    f.printf("%3.3f %c %c\n", atof(fstr), typech, active?'+':'-');
+    Serial.printf("Processing a=%s, f=%s, t=%s\n", active ? "YES" : "NO", fstr, tstr);
+    char typech = (tstr[2] == '4' ? '4' : tstr[3]); // Ugly TODO
+    f.printf("%3.3f %c %c\n", atof(fstr), typech, active ? '+' : '-');
   }
   f.close();
   Serial.println("Channel setup finished");
   Serial.println();
-  
+
   setupChannelList();
 }
 
@@ -164,45 +172,52 @@ const char *handleQRGPost(AsyncWebServerRequest *request) {
 
 #define MAX_WIFI 10
 int nNetworks;
-struct { String id; String pw; } networks[MAX_WIFI];
+struct {
+  String id;
+  String pw;
+} networks[MAX_WIFI];
 
 // FIXME: For now, we don't uspport wifi networks that contain newline or null characters
 // ... would require a more sophisicated file format (currently one line SSID; one line Password
 void setupWifiList() {
   File file = SPIFFS.open("/networks.txt", "r");
-  if(!file){
+  if (!file) {
     Serial.println("There was an error opening the file '/networks.txt' for reading");
     return;
   }
-  int i=0;
-  
-  while(file.available()) {
+  int i = 0;
+
+  while (file.available()) {
     String line = file.readStringUntil('\n');
-    if(!file.available()) break;
-     networks[i].id = line;
-     networks[i].pw = file.readStringUntil('\n');
-     i++;
+    if (!file.available()) break;
+    networks[i].id = line;
+    networks[i].pw = file.readStringUntil('\n');
+    i++;
   }
   nNetworks = i;
   Serial.print(i); Serial.println(" networks in networks.txt\n");
-  for(int j=0; j<i; j++) { Serial.print(networks[j].id); Serial.print(": "); Serial.println(networks[j].pw); }
+  for (int j = 0; j < i; j++) {
+    Serial.print(networks[j].id);
+    Serial.print(": ");
+    Serial.println(networks[j].pw);
+  }
 }
 
 
 const char *createWIFIForm() {
   char *ptr = message;
   char tmp[4];
-  strcpy(ptr,"<html><head><link rel=\"stylesheet\" type=\"text/css\" href=\"style.css\"></head><body><form action=\"wifi.html\" method=\"post\"><table><tr><th>Nr</th><th>SSID</th><th>Password</th></tr>");
-  for(int i=0; i<MAX_WIFI; i++) {
-     sprintf(tmp,"%d",i);
-     sprintf(ptr+strlen(ptr), "<tr><td>%s</td><td><input name=\"S%d\" type=\"text\" value=\"%s\"/></td>"
-        "<td><input name=\"P%d\" type=\"text\" value=\"%s\"/></td>",   
-        i==0?"<b>AP</b>":tmp,
-        i+1, i<nNetworks?networks[i].id.c_str():"",
-        i+1, i<nNetworks?networks[i].pw.c_str():"");
-   }
-   strcat(ptr,"</table><input type=\"submit\" value=\"Update\"></input></form></body></html>");
-   return message;
+  strcpy(ptr, "<html><head><link rel=\"stylesheet\" type=\"text/css\" href=\"style.css\"></head><body><form action=\"wifi.html\" method=\"post\"><table><tr><th>Nr</th><th>SSID</th><th>Password</th></tr>");
+  for (int i = 0; i < MAX_WIFI; i++) {
+    sprintf(tmp, "%d", i);
+    sprintf(ptr + strlen(ptr), "<tr><td>%s</td><td><input name=\"S%d\" type=\"text\" value=\"%s\"/></td>"
+            "<td><input name=\"P%d\" type=\"text\" value=\"%s\"/></td>",
+            i == 0 ? "<b>AP</b>" : tmp,
+            i + 1, i < nNetworks ? networks[i].id.c_str() : "",
+            i + 1, i < nNetworks ? networks[i].pw.c_str() : "");
+  }
+  strcat(ptr, "</table><input type=\"submit\" value=\"Update\"></input></form></body></html>");
+  return message;
 }
 
 const char *handleWIFIPost(AsyncWebServerRequest *request) {
@@ -210,7 +225,7 @@ const char *handleWIFIPost(AsyncWebServerRequest *request) {
   // parameters: a_i, f_1, t_i  (active/frequency/type)
 #if 1
   File f = SPIFFS.open("/networks.txt", "w");
-  if(!f) {
+  if (!f) {
     Serial.println("Error while opening '/networks.txt' for writing");
     return "Error while opening '/networks.txt' for writing";
   }
@@ -218,20 +233,20 @@ const char *handleWIFIPost(AsyncWebServerRequest *request) {
   Serial.println("Handling post request");
 #if 0
   int params = request->params();
-  for(int i=0; i<params; i++) {
+  for (int i = 0; i < params; i++) {
     Serial.println(request->getParam(i)->name().c_str());
   }
 #endif
-  for(int i=1; i<=MAX_WIFI; i++) {  
+  for (int i = 1; i <= MAX_WIFI; i++) {
     snprintf(label, 10, "S%d", i);
     AsyncWebParameter *ssid = request->getParam(label, true);
-    if(!ssid) continue;
+    if (!ssid) continue;
     snprintf(label, 10, "P%d", i);
     AsyncWebParameter *pw = request->getParam(label, true);
-    if(!pw) continue;
+    if (!pw) continue;
     const char *sstr = ssid->value().c_str();
     const char *pstr = pw->value().c_str();
-    if(strlen(sstr)==0) continue;
+    if (strlen(sstr) == 0) continue;
     Serial.printf("Processing S=%s, P=%s\n", sstr, pstr);
     f.printf("%s\n%s\n", sstr, pstr);
   }
@@ -244,24 +259,24 @@ void addSondeStatus(char *ptr, int i)
 {
   SondeInfo *s = &sonde.sondeList[i];
   strcat(ptr, "<table>");
-  sprintf(ptr+strlen(ptr),"<tr><td id=\"sfreq\">%3.3f MHz, Type: %s</td><tr><td>ID: %s</td></tr><tr><td>QTH: %.6f,%.6f h=%.0fm</td></tr>\n",
-    s->freq, sondeTypeStr[s->type],
-    s->validID?s->id:"<??>",
-    s->lat, s->lon, s->alt);
-  sprintf(ptr+strlen(ptr), "<tr><td><a target=\"_empty\" href=\"geo:%.6f,%.6f\">GEO-App</a> - ", s->lat, s->lon);
-  sprintf(ptr+strlen(ptr), "<a target=\"_empty\" href=\"https://wx.dl2mf.de/?%s\">WX.DL2MF.de</a> - ", s->id);
-  sprintf(ptr+strlen(ptr), "<a target=\"_empty\" href=\"https://www.openstreetmap.org/?mlat=%.6f&mlon=%.6f&zoom=14\">OSM</a></td></tr>", s->lat, s->lon);
+  sprintf(ptr + strlen(ptr), "<tr><td id=\"sfreq\">%3.3f MHz, Type: %s</td><tr><td>ID: %s</td></tr><tr><td>QTH: %.6f,%.6f h=%.0fm</td></tr>\n",
+          s->freq, sondeTypeStr[s->type],
+          s->validID ? s->id : "<??>",
+          s->lat, s->lon, s->alt);
+  sprintf(ptr + strlen(ptr), "<tr><td><a target=\"_empty\" href=\"geo:%.6f,%.6f\">GEO-App</a> - ", s->lat, s->lon);
+  sprintf(ptr + strlen(ptr), "<a target=\"_empty\" href=\"https://wx.dl2mf.de/?%s\">WX.DL2MF.de</a> - ", s->id);
+  sprintf(ptr + strlen(ptr), "<a target=\"_empty\" href=\"https://www.openstreetmap.org/?mlat=%.6f&mlon=%.6f&zoom=14\">OSM</a></td></tr>", s->lat, s->lon);
   strcat(ptr, "</table><p/>\n");
 }
 
 const char *createStatusForm() {
   char *ptr = message;
-  strcpy(ptr,"<html><head><link rel=\"stylesheet\" type=\"text/css\" href=\"style.css\"><meta http-equiv=\"refresh\" content=\"5\"></head><body>");
-  
-  for(int i=0; i<sonde.nSonde; i++) {
-    addSondeStatus(ptr, (i+sonde.currentSonde)%sonde.nSonde);
+  strcpy(ptr, "<html><head><link rel=\"stylesheet\" type=\"text/css\" href=\"style.css\"><meta http-equiv=\"refresh\" content=\"5\"></head><body>");
+
+  for (int i = 0; i < sonde.nSonde; i++) {
+    addSondeStatus(ptr, (i + sonde.currentSonde) % sonde.nSonde);
   }
-  strcat(ptr,"</body></html>");
+  strcat(ptr, "</body></html>");
   return message;
 }
 
@@ -270,11 +285,11 @@ const char *createStatusForm() {
 
 void setupConfigData() {
   File file = SPIFFS.open("/config.txt", "r");
-  if(!file) {
+  if (!file) {
     Serial.println("There was an error opening the file '/config.txt' for reading");
     return;
   }
-  while(file.available()) {
+  while (file.available()) {
     String line = file.readStringUntil('\n');
     sonde.setConfig(line.c_str());
   }
@@ -285,12 +300,12 @@ struct st_configitems {
   const char *label;
   int type;  // 0: numeric; i>0 string of length i; -1: separator; -2: type selector
   void *data;
-}; 
+};
 #define N_CONFIG 20
 struct st_configitems config_list[N_CONFIG] = {
   {"ShowSpectrum (s)", 0, &sonde.config.spectrum},
   {"Startfreq (MHz)", 0, &sonde.config.startfreq},
-  {"Bandwidth (kHz)", 0, &sonde.config.channelbw},  
+  {"Bandwidth (kHz)", 0, &sonde.config.channelbw},
   {"---", -1, NULL},
   {"Call", 8, sonde.config.call},
   {"Passcode", 8, sonde.config.passcode},
@@ -311,12 +326,12 @@ struct st_configitems config_list[N_CONFIG] = {
 };
 
 void addConfigStringEntry(char *ptr, int idx, const char *label, int len, char *field) {
-   sprintf(ptr+strlen(ptr), "<tr><td>%s</td><td><input name=\"CFG%d\" type=\"text\" value=\"%s\"/></td></tr>\n",
-      label, idx, field);
+  sprintf(ptr + strlen(ptr), "<tr><td>%s</td><td><input name=\"CFG%d\" type=\"text\" value=\"%s\"/></td></tr>\n",
+          label, idx, field);
 }
 void addConfigNumEntry(char *ptr, int idx, const char *label, int *value) {
-   sprintf(ptr+strlen(ptr), "<tr><td>%s</td><td><input name=\"CFG%d\" type=\"text\" value=\"%d\"/></td></tr>\n",
-      label, idx, *value);
+  sprintf(ptr + strlen(ptr), "<tr><td>%s</td><td><input name=\"CFG%d\" type=\"text\" value=\"%d\"/></td></tr>\n",
+          label, idx, *value);
 }
 void addConfigTypeEntry(char *ptr, int idx, const char *label, int *value) {
   // TODO
@@ -325,15 +340,15 @@ void addConfigOnOffEntry(char *ptr, int idx, const char *label, int *value) {
   // TODO
 }
 void addConfigSeparatorEntry(char *ptr) {
-   strcat(ptr, "<tr><td colspan=\"2\" class=\"divider\"><hr /></td></tr>\n");
+  strcat(ptr, "<tr><td colspan=\"2\" class=\"divider\"><hr /></td></tr>\n");
 }
 
 const char *createConfigForm() {
   char *ptr = message;
   char tmp[4];
-  strcpy(ptr,"<html><head><link rel=\"stylesheet\" type=\"text/css\" href=\"style.css\"></head><body><form action=\"config.html\" method=\"post\"><table><tr><th>Option</th><th>Value</th></tr>");
-  for(int i=0; i<N_CONFIG; i++) {
-    switch(config_list[i].type) {
+  strcpy(ptr, "<html><head><link rel=\"stylesheet\" type=\"text/css\" href=\"style.css\"></head><body><form action=\"config.html\" method=\"post\"><table><tr><th>Option</th><th>Value</th></tr>");
+  for (int i = 0; i < N_CONFIG; i++) {
+    switch (config_list[i].type) {
       case -3: // in/offt
         addConfigOnOffEntry(ptr, i, config_list[i].label, (int *)config_list[i].data);
         break;
@@ -351,7 +366,7 @@ const char *createConfigForm() {
         break;
     }
   }
-  strcat(ptr,"</table><input type=\"submit\" value=\"Update not yet implemented\"></input></form></body></html>");
+  strcat(ptr, "</table><input type=\"submit\" value=\"Update not yet implemented\"></input></form></body></html>");
   return message;
 }
 
@@ -359,51 +374,52 @@ const char *createConfigForm() {
 
 const char* PARAM_MESSAGE = "message";
 void SetupAsyncServer() {
-// Route for root / web page
- server.on("/", HTTP_GET, [](AsyncWebServerRequest *request){
-    request->send(SPIFFS, "/index.html", String(), false, processor);
-    });
-    
-  server.on("/index.html", HTTP_GET, [](AsyncWebServerRequest *request){
+  server.reset();
+  // Route for root / web page
+  server.on("/", HTTP_GET, [](AsyncWebServerRequest * request) {
     request->send(SPIFFS, "/index.html", String(), false, processor);
   });
 
-  server.on("/test.html", HTTP_GET, [](AsyncWebServerRequest *request){
+  server.on("/index.html", HTTP_GET, [](AsyncWebServerRequest * request) {
+    request->send(SPIFFS, "/index.html", String(), false, processor);
+  });
+
+  server.on("/test.html", HTTP_GET, [](AsyncWebServerRequest * request) {
     request->send(SPIFFS, "/test.html", String(), false, processor);
   });
 
-  server.on("/qrg.html", HTTP_GET,  [](AsyncWebServerRequest *request){
-     request->send(200, "text/html", createQRGForm());
+  server.on("/qrg.html", HTTP_GET,  [](AsyncWebServerRequest * request) {
+    request->send(200, "text/html", createQRGForm());
   });
-  server.on("/qrg.html", HTTP_POST, [](AsyncWebServerRequest *request){
+  server.on("/qrg.html", HTTP_POST, [](AsyncWebServerRequest * request) {
     handleQRGPost(request);
     request->send(200, "text/html", createQRGForm());
   });
 
-  server.on("/wifi.html", HTTP_GET,  [](AsyncWebServerRequest *request){
-     request->send(200, "text/html", createWIFIForm());
+  server.on("/wifi.html", HTTP_GET,  [](AsyncWebServerRequest * request) {
+    request->send(200, "text/html", createWIFIForm());
   });
-  server.on("/wifi.html", HTTP_POST, [](AsyncWebServerRequest *request){
+  server.on("/wifi.html", HTTP_POST, [](AsyncWebServerRequest * request) {
     handleWIFIPost(request);
     request->send(200, "text/html", createWIFIForm());
   });
 
-  server.on("/config.html", HTTP_GET,  [](AsyncWebServerRequest *request){
-     request->send(200, "text/html", createConfigForm());
-  });  
-
-  server.on("/status.html", HTTP_GET,  [](AsyncWebServerRequest *request){
-     request->send(200, "text/html", createStatusForm());
+  server.on("/config.html", HTTP_GET,  [](AsyncWebServerRequest * request) {
+    request->send(200, "text/html", createConfigForm());
   });
-  
+
+  server.on("/status.html", HTTP_GET,  [](AsyncWebServerRequest * request) {
+    request->send(200, "text/html", createStatusForm());
+  });
+
   // Route to load style.css file
-  server.on("/style.css", HTTP_GET, [](AsyncWebServerRequest *request){
+  server.on("/style.css", HTTP_GET, [](AsyncWebServerRequest * request) {
     request->send(SPIFFS, "/style.css", "text/css");
   });
 
-   // Route to set GPIO to HIGH
-  server.on("/test.php", HTTP_POST, [](AsyncWebServerRequest *request){
-    //digitalWrite(ledPin, HIGH);    
+  // Route to set GPIO to HIGH
+  server.on("/test.php", HTTP_POST, [](AsyncWebServerRequest * request) {
+    //digitalWrite(ledPin, HIGH);
     request->send(SPIFFS, "/index.html", String(), false, processor);
   });
 
@@ -411,21 +427,34 @@ void SetupAsyncServer() {
   server.begin();
 }
 
+int fetchWifiIndex(const char *id) {
+  for (int i = 0; i < nNetworks; i++) {
+    if (strcmp(id, networks[i].id.c_str()) == 0) return i;
+  }
+  return -1;
+}
+
+const char *fetchWifiSSID(int i) {
+  return networks[i].id.c_str();
+}
+const char *fetchWifiPw(int i) {
+  return networks[i].pw.c_str();
+}
 
 const char *fetchWifiPw(const char *id) {
-  for(int i=0; i<nNetworks; i++) {
+  for (int i = 0; i < nNetworks; i++) {
     //Serial.print("Comparing '");
     //Serial.print(id);
     //Serial.print("' and '");
     //Serial.print(networks[i].id.c_str());
     //Serial.println("'");
-    if(strcmp(id,networks[i].id.c_str())==0) return networks[i].pw.c_str();
+    if (strcmp(id, networks[i].id.c_str()) == 0) return networks[i].pw.c_str();
   }
   return NULL;
 }
-  
 
-enum KeyPress { KP_NONE=0, KP_SHORT, KP_DOUBLE, KP_MID, KP_LONG };
+
+enum KeyPress { KP_NONE = 0, KP_SHORT, KP_DOUBLE, KP_MID, KP_LONG };
 
 struct Button {
   uint8_t pin;
@@ -437,8 +466,8 @@ struct Button {
 Button button1 = {0, 0, KP_NONE, 0, false};
 
 void IRAM_ATTR buttonISR() {
-  if(digitalRead(button1.pin)==0) { // Button down
-    if(millis()-button1.press_ts<500) {
+  if (digitalRead(button1.pin) == 0) { // Button down
+    if (millis() - button1.press_ts < 500) {
       // Double press
       button1.doublepress = true;
     } else {
@@ -446,13 +475,17 @@ void IRAM_ATTR buttonISR() {
     }
     button1.press_ts = millis();
   } else { //Button up
-    unsigned int elapsed = millis()-button1.press_ts;
-    if(elapsed>1500) {
-      if(elapsed<4000) { button1.pressed=KP_MID; }
-      else { button1.pressed=KP_LONG; }
+    unsigned int elapsed = millis() - button1.press_ts;
+    if (elapsed > 1500) {
+      if (elapsed < 4000) {
+        button1.pressed = KP_MID;
+      }
+      else {
+        button1.pressed = KP_LONG;
+      }
     } else {
-      if(button1.doublepress) button1.pressed=KP_DOUBLE;
-      else button1.pressed=KP_SHORT;
+      if (button1.doublepress) button1.pressed = KP_DOUBLE;
+      else button1.pressed = KP_SHORT;
     }
     button1.numberKeyPresses += 1;
     button1.press_ts = millis();
@@ -470,20 +503,20 @@ int hasKeyPress() {
 
 void setup()
 {
-  char buf[12];  
+  char buf[12];
   // Open serial communications and wait for port to open:
   Serial.begin(115200);
   pinMode(LORA_LED, OUTPUT);
-  
+
   aprs_gencrctab();
 
   // Initialize SPIFFS
-  if(!SPIFFS.begin(true)){
+  if (!SPIFFS.begin(true)) {
     Serial.println("An Error has occurred while mounting SPIFFS");
     return;
   }
-  
-  setupConfigData();    // configuration must be read first due to OLED ports!!!  
+
+  setupConfigData();    // configuration must be read first due to OLED ports!!!
 
   u8x8 = new U8X8_SSD1306_128X64_NONAME_SW_I2C(/* clock=*/ sonde.config.oled_scl, /* data=*/ sonde.config.oled_sda, /* reset=*/ sonde.config.oled_rst); // Unbuffered, basic graphics, software I2C
   u8x8->begin();
@@ -492,60 +525,60 @@ void setup()
   u8x8->clear();
 
   u8x8->setFont(u8x8_font_7x14_1x2_r);
-  u8x8->drawString(1, 1, "RDZ_TTGO_SONDE"); 
-  u8x8->drawString(2, 3, "    V0.1e");   
-  u8x8->drawString(1, 5, "Mods by DL2MF");     
+  u8x8->drawString(1, 1, "RDZ_TTGO_SONDE");
+  u8x8->drawString(2, 3, "    V0.1e");
+  u8x8->drawString(1, 5, "Mods by DL2MF");
   delay(3000);
- 
+
   sonde.clearDisplay();
-  
+
   setupWifiList();
   button1.pin = sonde.config.button_pin;
 
   // == show initial values from config.txt ========================= //
   if (sonde.config.debug == 1) {
-  u8x8->setFont(u8x8_font_chroma48medium8_r);
-  u8x8->drawString(0, 0, "Config:");
+    u8x8->setFont(u8x8_font_chroma48medium8_r);
+    u8x8->drawString(0, 0, "Config:");
 
-  delay(500);
-  itoa(sonde.config.oled_sda, buf, 10);
-  u8x8->drawString(0, 1, " SDA:");
-  u8x8->drawString(6, 1, buf);                        
+    delay(500);
+    itoa(sonde.config.oled_sda, buf, 10);
+    u8x8->drawString(0, 1, " SDA:");
+    u8x8->drawString(6, 1, buf);
 
-  delay(500);
-  itoa(sonde.config.oled_scl, buf, 10);
-  u8x8->drawString(0, 2, " SCL:");            
-  u8x8->drawString(6, 2, buf);                        
+    delay(500);
+    itoa(sonde.config.oled_scl, buf, 10);
+    u8x8->drawString(0, 2, " SCL:");
+    u8x8->drawString(6, 2, buf);
 
-  delay(500);
-  itoa(sonde.config.oled_rst, buf, 10);
-  u8x8->drawString(0, 3, " RST:");
-  u8x8->drawString(6, 3, buf);  
+    delay(500);
+    itoa(sonde.config.oled_rst, buf, 10);
+    u8x8->drawString(0, 3, " RST:");
+    u8x8->drawString(6, 3, buf);
 
-  delay(1000);
-  itoa(sonde.config.led_pin, buf, 10);
-  u8x8->drawString(0, 4, " LED:");
-  u8x8->drawString(6, 4, buf);  
+    delay(1000);
+    itoa(sonde.config.led_pin, buf, 10);
+    u8x8->drawString(0, 4, " LED:");
+    u8x8->drawString(6, 4, buf);
 
-  delay(500);
-  itoa(sonde.config.spectrum, buf, 10);
-  u8x8->drawString(0, 5, " SPEC:");
-  u8x8->drawString(6, 5, buf);                          
+    delay(500);
+    itoa(sonde.config.spectrum, buf, 10);
+    u8x8->drawString(0, 5, " SPEC:");
+    u8x8->drawString(6, 5, buf);
 
-  delay(500);
-  itoa(sonde.config.maxsonde, buf, 10);
-  u8x8->drawString(0, 6, " MAX:");
-  u8x8->drawString(6, 6, buf);   
-  
-  delay(5000);
-  sonde.clearDisplay(); 
-  } 
-  // == show initial values from config.txt ========================= //  
-  
+    delay(500);
+    itoa(sonde.config.maxsonde, buf, 10);
+    u8x8->drawString(0, 6, " MAX:");
+    u8x8->drawString(6, 6, buf);
 
-#if 0 
+    delay(5000);
+    sonde.clearDisplay();
+  }
+  // == show initial values from config.txt ========================= //
+
+
+#if 0
   // == check the radio chip by setting default frequency =========== //
-  if(rs41.setFrequency(402700000)==0) {
+  if (rs41.setFrequency(402700000) == 0) {
     Serial.println(F("Setting freq: SUCCESS "));
   } else {
     Serial.println(F("Setting freq: ERROR "));
@@ -553,7 +586,7 @@ void setup()
   float f = sx1278.getFrequency();
   Serial.print("Frequency set to ");
   Serial.println(f);
-  // == check the radio chip by setting default frequency =========== //  
+  // == check the radio chip by setting default frequency =========== //
 #endif
 
   //sx1278.setLNAGain(-48);
@@ -569,7 +602,7 @@ void setup()
   Serial.println("Setup finished");
   Serial.println();
   // int returnValue = pthread_create(&wifithread, NULL, wifiloop, (void *)0);
- 
+
   //  if (returnValue) {
   //     Serial.println("An error has occurred");
   //  }
@@ -580,24 +613,25 @@ void setup()
 
   // == setup default channel list if qrg.txt read fails =========== //
   setupChannelList();
- #if 0
+#if 0
   sonde.clearSonde();
   sonde.addSonde(402.700, STYPE_RS41);
   sonde.addSonde(405.700, STYPE_RS41);
-  sonde.addSonde(405.900, STYPE_RS41);  
+  sonde.addSonde(405.900, STYPE_RS41);
   sonde.addSonde(403.450, STYPE_DFM09);
   Serial.println("No channel config file, using defaults!");
-  Serial.println();  
- #endif
+  Serial.println();
+#endif
   /// not here, done by sonde.setup(): rs41.setup();
   // == setup default channel list if qrg.txt read fails =========== //
-  
+
   sonde.setup();
+
+  WiFi.onEvent(WiFiEvent);
 }
 
 enum MainState { ST_DECODER, ST_SCANNER, ST_SPECTRUM, ST_WIFISCAN };
-
-static MainState mainState = ST_WIFISCAN;
+static MainState mainState = ST_DECODER; // ST_WIFISCAN;
 
 void enterMode(int mode) {
   mainState = (MainState)mode;
@@ -605,7 +639,7 @@ void enterMode(int mode) {
 }
 
 void loopDecoder() {
-  switch(getKeyPress()) {
+  switch (getKeyPress()) {
     case KP_SHORT:
       sonde.nextConfig();
       sonde.updateDisplayRXConfig();
@@ -624,58 +658,58 @@ void loopDecoder() {
   // sonde knows the current type and frequency, and delegates to the right decoder
   int res = sonde.receiveFrame();
 
-  if(res==0 && connected){
+  if (res == 0 && connected) {
     //Send a packet with position information
     // first check if ID and position lat+lonis ok
-    if(sonde.si()->validID && (sonde.si()->validPos&0x03==0x03)) {
+    if (sonde.si()->validID && (sonde.si()->validPos & 0x03 == 0x03)) {
       Serial.println("Sending position via UDP");
       SondeInfo *s = sonde.si();
       char raw[201];
-      const char *str = aprs_senddata(s->lat, s->lon, s->alt, s->hs, s->dir, s->vs, sondeTypeStr[s->type], s->id, "TE0ST", 
-        sonde.config.udpfeed.symbol);
+      const char *str = aprs_senddata(s->lat, s->lon, s->alt, s->hs, s->dir, s->vs, sondeTypeStr[s->type], s->id, "TE0ST",
+                                      sonde.config.udpfeed.symbol);
       int rawlen = aprsstr_mon2raw(str, raw, APRS_MAXLEN);
       Serial.print("Sending: "); Serial.println(raw);
-      udp.beginPacket(sonde.config.udpfeed.host,sonde.config.udpfeed.port);
-      udp.write((const uint8_t *)raw,rawlen);
+      udp.beginPacket(sonde.config.udpfeed.host, sonde.config.udpfeed.port);
+      udp.write((const uint8_t *)raw, rawlen);
       udp.endPacket();
     }
-  }  
+  }
   sonde.updateDisplay();
 }
 
 #define SCAN_MAXTRIES 1
 void loopScanner() {
   sonde.updateDisplayScanner();
-  static int tries=0;
-  switch(getKeyPress()) {
+  static int tries = 0;
+  switch (getKeyPress()) {
     case KP_SHORT:
-       enterMode(ST_DECODER);
-       return;
+      enterMode(ST_DECODER);
+      return;
     case KP_DOUBLE: break; /* ignored */
     case KP_MID:
-       enterMode(ST_SPECTRUM);
-       return;
-     case KP_LONG:
-       enterMode(ST_WIFISCAN);
-       return;
+      enterMode(ST_SPECTRUM);
+      return;
+    case KP_LONG:
+      enterMode(ST_WIFISCAN);
+      return;
   }
   // receiveFrame returns 0 on success, 1 on timeout
   int res = sonde.receiveFrame();   // Maybe instead of receiveFrame, just detect if right type is present? TODO
   Serial.print("Scanner: receiveFrame returned: ");
   Serial.println(res);
-  if(res==0) {
-      enterMode(ST_DECODER);
-      return;
+  if (res == 0) {
+    enterMode(ST_DECODER);
+    return;
   }
-  if(++tries>=SCAN_MAXTRIES && !hasKeyPress()) {
+  if (++tries >= SCAN_MAXTRIES && !hasKeyPress()) {
     sonde.nextConfig();
     tries = 0;
   }
 }
 
 void loopSpectrum() {
-  switch(getKeyPress()) {
-    case KP_SHORT: /* move selection of peak, TODO */ 
+  switch (getKeyPress()) {
+    case KP_SHORT: /* move selection of peak, TODO */
       sonde.nextConfig(); // TODO: Should be set specific frequency
       enterMode(ST_DECODER);
       return;
@@ -707,140 +741,327 @@ String translateEncryptionType(wifi_auth_mode_t encryptionType) {
   }
 }
 
-//wifi event handler
-void WiFiEvent(WiFiEvent_t event){
-    switch(event) {
-      case SYSTEM_EVENT_STA_GOT_IP:
-          //When connected set 
-          Serial.print("WiFi connected! IP address: ");
-          Serial.println(WiFi.localIP());  
-          //initializes the UDP state
-          //This initializes the transfer buffer
-          udp.begin(WiFi.localIP(),LOCALUDPPORT);
-          connected = true;
-          break;
-      case SYSTEM_EVENT_STA_DISCONNECTED:
-          Serial.println("WiFi lost connection");
-          connected = false;
-          break;
-    }
+void enableNetwork(bool enable) {
+  if(enable) {
+     SetupAsyncServer();
+     udp.begin(WiFi.localIP(), LOCALUDPPORT);
+     connected = true;
+  } else {
+     connected = false;
+  }
 }
 
-static char* _scan[2]={"/","\\"};
+
+enum t_wifi_state { WIFI_DISABLED, WIFI_SCAN, WIFI_CONNECT, WIFI_CONNECTED };
+
+static t_wifi_state wifi_state = WIFI_DISABLED;
+
+// Events used only for debug output right now
+void WiFiEvent(WiFiEvent_t event)
+{
+  Serial.printf("[WiFi-event] event: %d\n", event);
+
+  switch (event) {
+    case SYSTEM_EVENT_WIFI_READY:
+      Serial.println("WiFi interface ready");
+      break;
+    case SYSTEM_EVENT_SCAN_DONE:
+      Serial.println("Completed scan for access points");
+      break;
+    case SYSTEM_EVENT_STA_START:
+      Serial.println("WiFi client started");
+      break;
+    case SYSTEM_EVENT_STA_STOP:
+      Serial.println("WiFi clients stopped");
+      break;
+    case SYSTEM_EVENT_STA_CONNECTED:
+      Serial.println("Connected to access point");
+      break;
+    case SYSTEM_EVENT_STA_DISCONNECTED:
+      Serial.println("Disconnected from WiFi access point");
+      if(wifi_state==WIFI_CONNECT){
+         // If we get a disconnect event while waiting for connection (as I do sometimes with my FritzBox),
+         // just start from scratch with WiFi scan
+         wifi_state = WIFI_DISABLED;
+         WiFi.disconnect(true);
+      }
+      break;
+    case SYSTEM_EVENT_STA_AUTHMODE_CHANGE:
+      Serial.println("Authentication mode of access point has changed");
+      break;
+    case SYSTEM_EVENT_STA_GOT_IP:
+      Serial.print("Obtained IP address: ");
+      Serial.println(WiFi.localIP());
+      break;
+    case SYSTEM_EVENT_STA_LOST_IP:
+      Serial.println("Lost IP address and IP address is reset to 0");
+      break;
+    case SYSTEM_EVENT_STA_WPS_ER_SUCCESS:
+      Serial.println("WiFi Protected Setup (WPS): succeeded in enrollee mode");
+      break;
+    case SYSTEM_EVENT_STA_WPS_ER_FAILED:
+      Serial.println("WiFi Protected Setup (WPS): failed in enrollee mode");
+      break;
+    case SYSTEM_EVENT_STA_WPS_ER_TIMEOUT:
+      Serial.println("WiFi Protected Setup (WPS): timeout in enrollee mode");
+      break;
+    case SYSTEM_EVENT_STA_WPS_ER_PIN:
+      Serial.println("WiFi Protected Setup (WPS): pin code in enrollee mode");
+      break;
+    case SYSTEM_EVENT_AP_START:
+      Serial.println("WiFi access point started");
+      break;
+    case SYSTEM_EVENT_AP_STOP:
+      Serial.println("WiFi access point  stopped");
+      break;
+    case SYSTEM_EVENT_AP_STACONNECTED:
+      Serial.println("Client connected");
+      break;
+    case SYSTEM_EVENT_AP_STADISCONNECTED:
+      Serial.println("Client disconnected");
+      break;
+    case SYSTEM_EVENT_AP_STAIPASSIGNED:
+      Serial.println("Assigned IP address to client");
+      break;
+    case SYSTEM_EVENT_AP_PROBEREQRECVED:
+      Serial.println("Received probe request");
+      break;
+    case SYSTEM_EVENT_GOT_IP6:
+      Serial.println("IPv6 is preferred");
+      break;
+    case SYSTEM_EVENT_ETH_START:
+      Serial.println("Ethernet started");
+      break;
+    case SYSTEM_EVENT_ETH_STOP:
+      Serial.println("Ethernet stopped");
+      break;
+    case SYSTEM_EVENT_ETH_CONNECTED:
+      Serial.println("Ethernet connected");
+      break;
+    case SYSTEM_EVENT_ETH_DISCONNECTED:
+      Serial.println("Ethernet disconnected");
+      break;
+    case SYSTEM_EVENT_ETH_GOT_IP:
+      Serial.println("Obtained IP address");
+      break;
+  }
+}
+
+
+int wifiConnect(int16_t res) {
+  Serial.printf("WLAN scan result: found %d networks\n", res);
+
+  // pick best network
+  int bestEntry = -1;
+  int bestRSSI = INT_MIN;
+  uint8_t bestBSSID[6];
+  int32_t bestChannel = 0;
+
+  for (int8_t i = 0; i < res; i++) {
+    String ssid_scan;
+    int32_t rssi_scan;
+    uint8_t sec_scan;
+    uint8_t* BSSID_scan;
+    int32_t chan_scan;
+    WiFi.getNetworkInfo(i, ssid_scan, sec_scan, rssi_scan, BSSID_scan, chan_scan);
+    int networkEntry = fetchWifiIndex(ssid_scan.c_str());
+    if (networkEntry < 0) continue;
+    if (rssi_scan <= bestRSSI) continue;
+    bestEntry = networkEntry;
+    bestRSSI = rssi_scan;
+    bestChannel = chan_scan;
+    memcpy((void*) &bestBSSID, (void*) BSSID_scan, sizeof(bestBSSID));
+  }
+  WiFi.scanDelete();
+  if (bestEntry >= 0) {
+    Serial.printf("WiFi Connecting BSSID: %02X:%02X:%02X:%02X:%02X:%02X SSID: %s PW %s Channel: %d (RSSI %d)\n", bestBSSID[0], bestBSSID[1], bestBSSID[2], bestBSSID[3], bestBSSID[4], bestBSSID[5], fetchWifiSSID(bestEntry), fetchWifiPw(bestEntry), bestChannel, bestRSSI);
+    WiFi.begin(fetchWifiSSID(bestEntry), fetchWifiPw(bestEntry), bestChannel, bestBSSID);
+    wifi_state = WIFI_CONNECT;
+  } else {
+    // rescan
+    // wifiStart();
+    WiFi.disconnect(true);
+    wifi_state = WIFI_DISABLED;
+  }
+}
+
+static int wifi_cto;
+
+void loopWifiBackground() {
+  Serial.printf("WifiBackground: state %d\n", wifi_state);
+  // handle Wifi station mode in background
+  if (sonde.config.wifi == 0 || sonde.config.wifi == 2) return; // nothing to do if disabled or access point mode
+
+  if (wifi_state == WIFI_DISABLED) {  // stopped => start can
+    wifi_state = WIFI_SCAN;
+    Serial.println("WLAN start scan");
+    WiFi.scanNetworks(true); // scan in async mode
+  } else if (wifi_state == WIFI_SCAN) {
+    int16_t res = WiFi.scanComplete();
+    if (res == 0 || res == WIFI_SCAN_FAILED) {
+      // retry
+      Serial.println("WLAN restart scan");
+      WiFi.disconnect(true);
+      wifi_state = WIFI_DISABLED;
+      return;
+    }
+    if (res == WIFI_SCAN_RUNNING) {
+      return;
+    }
+    // Scan finished, try to connect
+    wifiConnect(res);
+    wifi_cto = 0;
+  } else if (wifi_state == WIFI_CONNECT) {
+    wifi_cto++;
+    if (WiFi.isConnected()) {
+      wifi_state = WIFI_CONNECTED;
+      // update IP in display
+      sonde.setIP(WiFi.localIP().toString().c_str(), false);
+      sonde.updateDisplayIP();
+      enableNetwork(true);
+    }
+    if (wifi_cto > 20) { // failed, restart scanning
+      wifi_state = WIFI_DISABLED;
+      WiFi.disconnect(true);
+    }
+  } else if (wifi_state == WIFI_CONNECTED) {
+    if (!WiFi.isConnected()) {
+      sonde.clearIP();
+      sonde.updateDisplayIP();
+      wifi_state = WIFI_DISABLED;  // restart scan
+      enableNetwork(false);
+      WiFi.disconnect(true);
+    }
+  }
+}
+
+
+static char* _scan[2] = {"/", "\\"};
 void loopWifiScan() {
+  if (sonde.config.wifi == 1) { // station mode, setup in background
+    wifi_state = WIFI_DISABLED;  // will start scanning in wifiLoopBackgroiund
+    enterMode(ST_SCANNER);
+  }
+  if (sonde.config.wifi == 2) { // AP mode, setup in background
+    // TODO
+  }
   u8x8->setFont(u8x8_font_chroma48medium8_r);
   if (sonde.config.wifi != 0) {
-    u8x8->drawString(0,0,"WiFi Scan...");
+    u8x8->drawString(0, 0, "WiFi Scan...");
   }
   else if (sonde.config.wifiap != 0) {
-    u8x8->drawString(0,0,"WiFi AP-Mode:");
+    u8x8->drawString(0, 0, "WiFi AP-Mode:");
   }
-  
-  int line=0;
-  int cnt=0;
-  int marker=0;
+
+  int line = 0;
+  int cnt = 0;
+  int marker = 0;
   char buf[5];
 
   WiFi.disconnect(true);
   WiFi.mode(WIFI_STA);
   const char *id, *pw;
-  char idstr[64]="test";
+  char idstr[64] = "test";
 
   if (sonde.config.wifi != 0) {
     int n = WiFi.scanNetworks();
-     for (int i = 0; i < n; i++) {
-        Serial.print("Network name: ");
-        Serial.println(WiFi.SSID(i));
-        u8x8->drawString(0,1+line,WiFi.SSID(i).c_str());
-        line = (line+1)%5;
-        Serial.print("Signal strength: ");
-        Serial.println(WiFi.RSSI(i));
-        Serial.print("MAC address: ");
-        Serial.println(WiFi.BSSIDstr(i));
-        Serial.print("Encryption type: ");
-        String encryptionTypeDescription = translateEncryptionType(WiFi.encryptionType(i));
-        Serial.println(encryptionTypeDescription);
-        Serial.println("-----------------------");
-        id=WiFi.SSID(i).c_str();
-        pw=fetchWifiPw(id);
-       if(pw) { strncpy(idstr, id, 63); }
+    for (int i = 0; i < n; i++) {
+      Serial.print("Network name: ");
+      Serial.println(WiFi.SSID(i));
+      u8x8->drawString(0, 1 + line, WiFi.SSID(i).c_str());
+      line = (line + 1) % 5;
+      Serial.print("Signal strength: ");
+      Serial.println(WiFi.RSSI(i));
+      Serial.print("MAC address: ");
+      Serial.println(WiFi.BSSIDstr(i));
+      Serial.print("Encryption type: ");
+      String encryptionTypeDescription = translateEncryptionType(WiFi.encryptionType(i));
+      Serial.println(encryptionTypeDescription);
+      Serial.println("-----------------------");
+      id = WiFi.SSID(i).c_str();
+      pw = fetchWifiPw(id);
+      if (pw) {
+        strncpy(idstr, id, 63);
       }
-      if(!pw) { pw="test"; }
-      Serial.print("Connecting to: "); Serial.println(idstr);
-      u8x8->drawString(0,6, "Conn:");
-      u8x8->drawString(6,6, idstr);
-      //register event handler
-      WiFi.onEvent(WiFiEvent);
-  
-      WiFi.begin(idstr, pw);
+    }
+    if (!pw) {
+      pw = "test";
+    }
+    Serial.print("Connecting to: "); Serial.println(idstr);
+    u8x8->drawString(0, 6, "Conn:");
+    u8x8->drawString(6, 6, idstr);
+    //register event handler
+    WiFi.onEvent(WiFiEvent);
+
+    WiFi.begin(idstr, pw);
   }
-  
-  while(WiFi.status() != WL_CONNECTED)  {
+
+  while (WiFi.status() != WL_CONNECTED)  {
+    delay(500);
+    Serial.print(".");
+    u8x8->drawString(15, 7, _scan[cnt & 1]);
+    cnt++;
+#if 0
+    if (cnt == 4) {
+      WiFi.disconnect(true);  // retry, for my buggy FritzBox
+      WiFi.onEvent(WiFiEvent);
+      WiFi.begin(idstr, pw);
+    }
+#endif
+    if (cnt == 15) {
+      WiFi.disconnect(true);
+
+      if (sonde.config.wifiap != 0) {         // enable WiFi AP mode in config.txt: wifi=1
+        delay(1000);
+        WiFi.softAP(networks[0].id.c_str(), networks[0].pw.c_str());
+        IPAddress myIP = WiFi.softAPIP();
+        Serial.print("AP IP address: ");
+        Serial.println(myIP);
+        u8x8->drawString(0, 6, "AP:             ");
+        u8x8->drawString(6, 6, networks[0].id.c_str());
+        sonde.setIP(myIP.toString().c_str(), true);
+        sonde.updateDisplayIP();
+        SetupAsyncServer();
+        delay(3000);
+      }
+
+      if (sonde.config.spectrum != 0) {     // enable Spectrum in config.txt: spectrum=number_of_seconds
+        sonde.clearDisplay();
+        u8x8->setFont(u8x8_font_chroma48medium8_r);
+        u8x8->drawString(0, 0, "Spectrum Scan...");
         delay(500);
-        Serial.print(".");
-        u8x8->drawString(15,7,_scan[cnt&1]);
-        cnt++;
-        #if 0
-        if(cnt==4) {
-            WiFi.disconnect(true);  // retry, for my buggy FritzBox
-            WiFi.onEvent(WiFiEvent);
-            WiFi.begin(idstr, pw);
-        }
-        #endif
-        if(cnt==15) {
-            WiFi.disconnect(true);
-            
-            if (sonde.config.wifiap != 0) {         // enable WiFi AP mode in config.txt: wifi=1
-              delay(1000);
-              WiFi.softAP(networks[0].id.c_str(),networks[0].pw.c_str());
-              IPAddress myIP = WiFi.softAPIP();
-              Serial.print("AP IP address: ");
-              Serial.println(myIP);
-              u8x8->drawString(0,6, "AP:             ");
-              u8x8->drawString(6,6, networks[0].id.c_str());
-              sonde.setIP(myIP.toString().c_str(), true);
-              sonde.updateDisplayIP();
-              SetupAsyncServer();
-              delay(3000);
+
+        enterMode(ST_SPECTRUM);
+
+        for (int i = 0; i < sonde.config.spectrum; i++) {
+          scanner.scan();
+          scanner.plotResult();
+
+          if (sonde.config.marker != 0) {
+            itoa((sonde.config.startfreq), buf, 10);
+            u8x8->drawString(0, 1, buf);
+            u8x8->drawString(7, 1, "MHz");
+            itoa((sonde.config.startfreq + 6), buf, 10);
+            u8x8->drawString(13, 1, buf);
+          }
+
+          if (sonde.config.timer != 0) {
+            itoa((sonde.config.spectrum - i), buf, 10);
+            if (sonde.config.marker != 0) {
+              marker = 1;
             }
-
-            if (sonde.config.spectrum != 0) {     // enable Spectrum in config.txt: spectrum=number_of_seconds
-              sonde.clearDisplay();
-              u8x8->setFont(u8x8_font_chroma48medium8_r);
-              u8x8->drawString(0, 0, "Spectrum Scan...");
-              delay(500);
-            
-              enterMode(ST_SPECTRUM);
-             
-              for (int i = 0; i < sonde.config.spectrum; i++) {                         
-                scanner.scan();
-                scanner.plotResult();
-
-                if (sonde.config.marker != 0) {
-                  itoa((sonde.config.startfreq), buf, 10);
-                  u8x8->drawString(0, 1, buf);
-                  u8x8->drawString(7, 1, "MHz");                 
-                  itoa((sonde.config.startfreq + 6), buf, 10);                  
-                  u8x8->drawString(13, 1, buf);
-                }                
-
-                if (sonde.config.timer != 0) {
-                  itoa((sonde.config.spectrum - i), buf, 10);
-				  if (sonde.config.marker != 0) {
-				   marker = 1;
-				  }
-					u8x8->drawString(0, 1+marker, buf);
-					u8x8->drawString(2, 1+marker, "Sec.");
-                }                          
-              }
-
-              delay(1000);
-            }           
-
-            enterMode(ST_SCANNER);
-            return;
+            u8x8->drawString(0, 1 + marker, buf);
+            u8x8->drawString(2, 1 + marker, "Sec.");
+          }
         }
 
+        delay(1000);
+      }
+
+      enterMode(ST_SCANNER);
+      return;
+    }
+
   }
 
   Serial.println("");
@@ -853,24 +1074,25 @@ void loopWifiScan() {
   delay(2000);
 
   // enterMode(ST_DECODER);     ### 2019-04-20 - changed DL2MF
-  enterMode(ST_SCANNER);  
+  enterMode(ST_SCANNER);
 }
 
 void loop() {
   Serial.println("Running main loop");
-  switch(mainState) {
+  switch (mainState) {
     case ST_DECODER: loopDecoder(); break;
     case ST_SCANNER: loopScanner(); break;
     case ST_SPECTRUM: loopSpectrum(); break;
     case ST_WIFISCAN: loopWifiScan(); break;
   }
-#if 1                  
+#if 1
   int rssi = sx1278.getRSSI();
   Serial.print("  RSSI: ");
   Serial.print(rssi);
-  
+
   int gain = sx1278.getLNAGain();
   Serial.print(" LNA Gain: "),
-  Serial.println(gain);
+               Serial.println(gain);
 #endif
+  loopWifiBackground();
 }
diff --git a/libraries/SondeLib/Sonde.cpp b/libraries/SondeLib/Sonde.cpp
index 639368f..4dc9323 100644
--- a/libraries/SondeLib/Sonde.cpp
+++ b/libraries/SondeLib/Sonde.cpp
@@ -153,6 +153,10 @@ void Sonde::setConfig(const char *cfg) {
 	}
 }
 
+void Sonde::clearIP() {
+  memset(myIP_tiles, 0, 11*8);
+}
+
 void Sonde::setIP(const char *ip, bool AP) {
   memset(myIP_tiles, 0, 11*8);
   int len = strlen(ip);
diff --git a/libraries/SondeLib/Sonde.h b/libraries/SondeLib/Sonde.h
index 806ea95..e2a5e09 100644
--- a/libraries/SondeLib/Sonde.h
+++ b/libraries/SondeLib/Sonde.h
@@ -92,6 +92,7 @@ public:
 	void updateDisplayScanner();
 	void clearDisplay();
 	void setIP(const char *ip, bool isAP);
+	void clearIP();
 };
 
 extern Sonde sonde;
