Update logging and logic

Author: tyeth

src/network_interfaces/Wippersnapper_AIRLIFT.h

@@ -109,8 +109,8 @@ class Wippersnapper_AIRLIFT : public Wippersnapper {
   */
   /*******************************************************************/
   struct WiFiNetwork {
-    char ssid[33]; /*!< SSID (Max 32 characters + null terminator */
-    int32_t rssi = -99;      /*!< Received Signal Strength Indicator */
+    char ssid[33];      /*!< SSID (Max 32 characters + null terminator */
+    int32_t rssi = -99; /*!< Received Signal Strength Indicator */
   };
 
   /*******************************************************************/
@@ -146,42 +146,54 @@ class Wippersnapper_AIRLIFT : public Wippersnapper {
     }
 
     WiFiNetwork networks[WS_MAX_SORTED_NETWORKS];
+    uint8_t numSavedNetworks = 0;
 
     // Store the scanned networks in the array
     for (int i = 0; i < n; ++i) {
-      if (i < WS_MAX_SORTED_NETWORKS){
+      if (i < WS_MAX_SORTED_NETWORKS) {
         strncpy(networks[i].ssid, WiFi.SSID(i), sizeof(networks[i].ssid));
         networks[i].ssid[sizeof(networks[i].ssid) - 1] = '\0';
         networks[i].rssi = WiFi.RSSI(i);
+        numSavedNetworks++;
       } else {
         WS_DEBUG_PRINT("ERROR: Too many networks found! (>");
         WS_DEBUG_PRINT(WS_MAX_SORTED_NETWORKS);
         WS_DEBUG_PRINT(") Ignoring ");
         WS_DEBUG_PRINT(WiFi.SSID(i));
+        WS_DEBUG_PRINT("(");
+        WS_DEBUG_PRINT(WiFi.RSSI(i));
+        WS_DEBUG_PRINTLN(")");
       }
     }
 
     // Sort the networks by RSSI in descending order
-    std::sort(networks, networks + std::min(n, WS_MAX_SORTED_NETWORKS), compareByRSSI);
+    std::sort(networks, networks + numSavedNetworks, compareByRSSI);
 
     // Was the network within secrets.json found?
-    for (int i = 0; i < n; ++i) {
-      if (strcmp(_ssid, WiFi.SSID(i)) == 0) {
+    for (int i = 0; i < numSavedNetworks; ++i) {
+      if (strcmp(_ssid, networks[i].ssid) == 0) {
         WS_DEBUG_PRINT("SSID (");
         WS_DEBUG_PRINT(_ssid);
         WS_DEBUG_PRINT(") found! RSSI: ");
-        WS_DEBUG_PRINTLN(WiFi.RSSI(i));
+        WS_DEBUG_PRINTLN(networks[i].rssi);
         return true;
       }
     }
 
     // User-set network not found, print scan results to serial console
     WS_DEBUG_PRINTLN("ERROR: Your requested WiFi network was not found!");
-    WS_DEBUG_PRINTLN("WipperSnapper found these WiFi networks: ");
+    WS_DEBUG_PRINT("WipperSnapper found these WiFi networks");
+    if (n > WS_MAX_SORTED_NETWORKS) {
+      WS_DEBUG_PRINT(" (only first ");
+      WS_DEBUG_PRINT(WS_MAX_SORTED_NETWORKS);
+      WS_DEBUG_PRINTLN(" used):");
+    } else {
+      WS_DEBUG_PRINTLN(":");
+    }
     for (int i = 0; i < n; ++i) {
-      WS_DEBUG_PRINT(WiFi.SSID(i));
+      WS_DEBUG_PRINT(networks[i].ssid);
       WS_DEBUG_PRINT(" ");
-      WS_DEBUG_PRINT(WiFi.RSSI(i));
+      WS_DEBUG_PRINT(networks[i].rssi);
       WS_DEBUG_PRINTLN("dB");
     }
 

src/network_interfaces/Wippersnapper_ESP32.h

@@ -99,7 +99,7 @@ class Wippersnapper_ESP32 : public Wippersnapper {
   /****************************************************************/
   struct WiFiNetwork {
     char ssid[33]; /*!< SSID (Max 32 characters + null terminator */
-    int rssi;      /*!< Received Signal Strength Indicator */
+    int32_t rssi;  /*!< Received Signal Strength Indicator */
   };
 
   /*******************************************************************/
@@ -146,38 +146,47 @@ class Wippersnapper_ESP32 : public Wippersnapper {
       return false;
     }
 
-    // Dynamically allocate memory for the network list
-    std::vector<WiFiNetwork> networks(n);
-
+    WiFiNetwork networks[WS_MAX_SORTED_NETWORKS];
+    uint8_t numSavedNetworks = 0;
     // Store the scanned networks in the vector
     for (int i = 0; i < n; ++i) {
-      strncpy(networks[i].ssid, WiFi.SSID(i).c_str(),
-              sizeof(networks[i].ssid) - 1);
-      networks[i].ssid[sizeof(networks[i].ssid) - 1] =
-          '\0'; // Ensure null termination
-      networks[i].rssi = WiFi.RSSI(i);
+      if (i < WS_MAX_SORTED_NETWORKS) {
+        strncpy(networks[i].ssid, WiFi.SSID(i).c_str(),
+                sizeof(networks[i].ssid));
+        networks[i].ssid[sizeof(networks[i].ssid) - 1] = '\0';
+        networks[i].rssi = WiFi.RSSI(i);
+        numSavedNetworks++;
+      } else {
+        WS_DEBUG_PRINT("ERROR: Too many networks found! (>");
+        WS_DEBUG_PRINT(WS_MAX_SORTED_NETWORKS);
+        WS_DEBUG_PRINT(") Ignoring ");
+        WS_DEBUG_PRINT(WiFi.SSID(i));
+        WS_DEBUG_PRINT("(");
+        WS_DEBUG_PRINT(WiFi.RSSI(i));
+        WS_DEBUG_PRINTLN(")");
+      }
     }
 
     // Sort the networks by RSSI in descending order
-    std::sort(networks.begin(), networks.end(), compareByRSSI);
+    std::sort(networks, networks + numSavedNetworks, compareByRSSI);
 
     // Was the network within secrets.json found?
-    for (const auto &network : networks) {
-      if (strcmp(_ssid, network.ssid) == 0) {
+    for (int i = 0; i < numSavedNetworks; ++i) {
+      if (strcmp(_ssid, networks[i].ssid) == 0) {
         WS_DEBUG_PRINT("SSID (");
         WS_DEBUG_PRINT(_ssid);
         WS_DEBUG_PRINT(") found! RSSI: ");
-        WS_DEBUG_PRINTLN(network.rssi);
+        WS_DEBUG_PRINTLN(networks[i].rssi);
         return true;
       }
       if (WS._isWiFiMulti) {
         // multi network mode
         for (int j = 0; j < WS_MAX_ALT_WIFI_NETWORKS; j++) {
-          if (strcmp(WS._multiNetworks[j].ssid, network.ssid) == 0) {
+          if (strcmp(WS._multiNetworks[j].ssid, networks[i].ssid) == 0) {
             WS_DEBUG_PRINT("SSID (");
             WS_DEBUG_PRINT(WS._multiNetworks[j].ssid);
             WS_DEBUG_PRINT(") found! RSSI: ");
-            WS_DEBUG_PRINTLN(network.rssi);
+            WS_DEBUG_PRINTLN(networks[i].rssi);
             return true;
           }
         }
@@ -186,11 +195,18 @@ class Wippersnapper_ESP32 : public Wippersnapper {
 
     // User-set network not found, print scan results to serial console
     WS_DEBUG_PRINTLN("ERROR: Your requested WiFi network was not found!");
-    WS_DEBUG_PRINTLN("WipperSnapper found these WiFi networks: ");
-    for (const auto &network : networks) {
-      WS_DEBUG_PRINT(network.ssid);
+    WS_DEBUG_PRINT("WipperSnapper found these WiFi networks");
+    if (n > WS_MAX_SORTED_NETWORKS) {
+      WS_DEBUG_PRINT(" (only first ");
+      WS_DEBUG_PRINT(WS_MAX_SORTED_NETWORKS);
+      WS_DEBUG_PRINTLN(" used):");
+    } else {
+      WS_DEBUG_PRINTLN(":");
+    }
+    for (int i = 0; i < n; ++i) {
+      WS_DEBUG_PRINT(networks[i].ssid);
       WS_DEBUG_PRINT(" ");
-      WS_DEBUG_PRINT(network.rssi);
+      WS_DEBUG_PRINT(networks[i].rssi);
       WS_DEBUG_PRINTLN("dB");
     }