Remove unnecessary includes + fixup esp8266

Author: tyeth

src/network_interfaces/Wippersnapper_AIRLIFT.h

@@ -26,8 +26,6 @@
 #include "SPI.h"
 #include "WiFiNINA.h"
 #include "Wippersnapper.h"
-#include <algorithm>
-#include <vector>
 
 #define NINAFWVER                                                              \
   "1.7.7" /*!< min. nina-fw version compatible with this library. */

src/network_interfaces/Wippersnapper_ESP32.h

@@ -27,8 +27,6 @@
 #include "WiFiMulti.h"
 #include <NetworkClient.h>
 #include <NetworkClientSecure.h>
-#include <algorithm>
-#include <vector>
 extern Wippersnapper WS;
 
 /****************************************************************************/

src/network_interfaces/Wippersnapper_ESP8266.h

@@ -23,8 +23,6 @@
 #include "ESP8266WiFi.h"
 #include "ESP8266WiFiMulti.h"
 #include "Wippersnapper.h"
-#include <algorithm>
-#include <vector>
 
 /* NOTE - Projects that require "Secure MQTT" (TLS/SSL) also require a new
  * SSL certificate every year. If adding Secure MQTT to your ESP8266 project is
@@ -159,38 +157,47 @@ class Wippersnapper_ESP8266 : 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;
           }
         }
@@ -199,11 +206,18 @@ class Wippersnapper_ESP8266 : 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");
     }
 

src/network_interfaces/Wippersnapper_WIFININA.h

@@ -21,8 +21,6 @@
 #include <Arduino.h>
 #include <SPI.h>
 #include <WiFiNINA.h>
-#include <algorithm>
-#include <vector>
 
 #include "Wippersnapper.h"
 

src/network_interfaces/ws_networking_pico.h

@@ -29,8 +29,6 @@
 #include "Arduino.h"
 #include <WiFiClient.h>
 #include <WiFiClientSecure.h>
-#include <algorithm>
-#include <vector>
 extern Wippersnapper WS;
 
 /****************************************************************************/