Add default SSID to multi wifi list + Cleanup formatting

Author: tyeth

src/network_interfaces/Wippersnapper_ESP32.h

@@ -278,6 +278,9 @@ class Wippersnapper_ESP32 : public Wippersnapper {
         // multi network mode
         _wifiMulti.APlistClean();
         _wifiMulti.setAllowOpenAP(false);
+        // add default network
+        _wifiMulti.addAP(_ssid, _pass);
+        // add array of alternative networks
         for (int i = 0; i < 5; i++) {
           if (strlen(WS._multiNetworks[i].ssid) > 0) {
             _wifiMulti.addAP(WS._multiNetworks[i].ssid,

src/network_interfaces/Wippersnapper_ESP8266.h

@@ -257,9 +257,14 @@ class Wippersnapper_ESP8266 : public Wippersnapper {
                              WS._multiNetworks[i].pass);
           }
         }
+        // add default network
+        if (_wifiMulti.existsAP(_ssid) == false){
+          _wifiMulti.addAP(_ssid, _pass);
+        }
         long startRetry = millis();
         WS_DEBUG_PRINTLN("CONNECTING");
-        while (_wifiMulti.run(5000) != WL_CONNECTED && millis() - startRetry < 10000) {
+        while (_wifiMulti.run(5000) != WL_CONNECTED &&
+               millis() - startRetry < 10000) {
           // ESP8266 WDT requires yield() during a busy-loop so it doesn't bite
           yield();
         }

src/network_interfaces/ws_networking_pico.h

@@ -283,6 +283,9 @@ class ws_networking_pico : public Wippersnapper {
       if (strlen(WS._multiNetworks[0].ssid) > 0) {
         // multi network mode
         _wifiMulti.clearAPList();
+        // add default network
+        _wifiMulti.addAP(_ssid, _pass);
+        // add array of alternative networks
         for (int i = 0; i < 5; i++) {
           _wifiMulti.addAP(WS._multiNetworks[i].ssid,
                            WS._multiNetworks[i].pass);

src/provisioning/littlefs/WipperSnapper_LittleFS.cpp

@@ -73,24 +73,28 @@ void WipperSnapper_LittleFS::parseSecrets() {
     convertFromJson(doc["network_type_wifi"], WS._config.network);
 
     if (!doc["network_type_wifi"].containsKey("alternate_networks")) {
+      // do nothing extra, we already have the only network
       WS_DEBUG_PRINTLN("Found single wifi network in secrets.json");
 
-    } else if (doc["network_type_wifi"]["alternative_networks"].is<JsonArray>()) {
+    } else if (doc["network_type_wifi"]["alternative_networks"]
+                   .is<JsonArray>()) {
+
       WS_DEBUG_PRINTLN("Found multiple wifi networks in secrets.json");
       // Parse network credentials from array in secrets
       JsonArray networks = doc["network_type_wifi"]["alternative_networks"];
       int8_t networkCount = networks.size();
       WS_DEBUG_PRINT("Network count: ");
       WS_DEBUG_PRINTLN(networkCount);
       if (networkCount == 0) {
-        fsHalt("ERROR: No networks found in network_type_wifi in secrets.json!");
+        fsHalt(
+            "ERROR: No networks found in network_type_wifi in secrets.json!");
       }
       // check if over 5, warn user and take first five
       for (int i = 0; i < networkCount; i++) {
         if (i >= 3) {
           WS_DEBUG_PRINT("WARNING: More than 3 networks in secrets.json, "
-                           "only the first 3 will be used. Not using ");
-          WS_DEBUG_PRINTLN(networks[i]["ssid"].as<const char*>());
+                         "only the first 3 will be used. Not using ");
+          WS_DEBUG_PRINTLN(networks[i]["ssid"].as<const char *>());
           break;
         }
         convertFromJson(networks[i], WS._multiNetworks[i]);
@@ -100,8 +104,8 @@ void WipperSnapper_LittleFS::parseSecrets() {
         WS_DEBUG_PRINTLN(WS._multiNetworks[i].pass);
       }
     } else {
-      fsHalt("ERROR: Unrecognised value type for network_type_wifi in "
-             "secrets.json!");
+      fsHalt("ERROR: Unrecognised value type for "
+             "network_type_wifi.alternative_networks in secrets.json!");
     }
   } else {
     fsHalt("ERROR: Could not find network_type_wifi in secrets.json!");

src/provisioning/tinyusb/Wippersnapper_FS.cpp

@@ -356,24 +356,28 @@ void Wippersnapper_FS::parseSecrets() {
     convertFromJson(doc["network_type_wifi"], WS._config.network);
 
     if (!doc["network_type_wifi"].containsKey("alternate_networks")) {
+      // do nothing extra, we already have the only network
       WS_DEBUG_PRINTLN("Found single wifi network in secrets.json");
 
-    } else if (doc["network_type_wifi"]["alternative_networks"].is<JsonArray>()) {
+    } else if (doc["network_type_wifi"]["alternative_networks"]
+                   .is<JsonArray>()) {
+
       WS_DEBUG_PRINTLN("Found multiple wifi networks in secrets.json");
       // Parse network credentials from array in secrets
       JsonArray networks = doc["network_type_wifi"]["alternative_networks"];
       int8_t networkCount = networks.size();
       WS_DEBUG_PRINT("Network count: ");
       WS_DEBUG_PRINTLN(networkCount);
       if (networkCount == 0) {
-        fsHalt("ERROR: No networks found in network_type_wifi in secrets.json!");
+        fsHalt(
+            "ERROR: No networks found in network_type_wifi in secrets.json!");
       }
       // check if over 5, warn user and take first five
       for (int i = 0; i < networkCount; i++) {
         if (i >= 3) {
           WS_DEBUG_PRINT("WARNING: More than 3 networks in secrets.json, "
-                           "only the first 3 will be used. Not using ");
-          WS_DEBUG_PRINTLN(networks[i]["ssid"].as<const char*>());
+                         "only the first 3 will be used. Not using ");
+          WS_DEBUG_PRINTLN(networks[i]["ssid"].as<const char *>());
           break;
         }
         convertFromJson(networks[i], WS._multiNetworks[i]);
@@ -383,8 +387,8 @@ void Wippersnapper_FS::parseSecrets() {
         WS_DEBUG_PRINTLN(WS._multiNetworks[i].pass);
       }
     } else {
-      fsHalt("ERROR: Unrecognised value type for network_type_wifi in "
-             "secrets.json!");
+      fsHalt("ERROR: Unrecognised value type for "
+             "network_type_wifi.alternative_networks in secrets.json!");
     }
   } else {
     fsHalt("ERROR: Could not find network_type_wifi in secrets.json!");