clang format "sort networks by RSSI"

tyeth · tyeth · commit cdb96c71b4dc · 2024-11-21T18:39:06.000Z
diff --git a/src/network_interfaces/Wippersnapper_AIRLIFT.h b/src/network_interfaces/Wippersnapper_AIRLIFT.h
@@ -23,11 +23,11 @@
 #include "Adafruit_MQTT.h"
 #include "Adafruit_MQTT_Client.h"
 #include "Arduino.h"
-#include <vector>
-#include <algorithm>
 #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. */
@@ -103,71 +103,72 @@ class Wippersnapper_AIRLIFT : public Wippersnapper {
     _pass = WS._config.network.pass;
   }
 
-// Define a structure to hold network information
-struct WiFiNetwork {
+  // Define a structure to hold network information
+  struct WiFiNetwork {
     char ssid[33]; // Maximum SSID length is 32 characters + null terminator
     int rssi;
-};
+  };
 
-// Comparison function to sort by RSSI in descending order
-bool static compareByRSSI(const WiFiNetwork &a, const WiFiNetwork &b) {
+  // Comparison function to sort by RSSI in descending order
+  bool static compareByRSSI(const WiFiNetwork &a, const WiFiNetwork &b) {
     return a.rssi > b.rssi;
-}
+  }
 
-/***********************************************************/
-/*!
-  @brief   Performs a scan of local WiFi networks.
-  @returns True if `_network_ssid` is found, False otherwise.
-*/
-/***********************************************************/
-bool check_valid_ssid() {
+  /***********************************************************/
+  /*!
+    @brief   Performs a scan of local WiFi networks.
+    @returns True if `_network_ssid` is found, False otherwise.
+  */
+  /***********************************************************/
+  bool check_valid_ssid() {
     // Disconnect WiFi from an AP if it was previously connected
     WiFi.disconnect();
     delay(100);
 
     // Perform a network scan
     int n = WiFi.scanNetworks();
     if (n == 0) {
-        WS_DEBUG_PRINTLN("ERROR: No WiFi networks found!");
-        return false;
+      WS_DEBUG_PRINTLN("ERROR: No WiFi networks found!");
+      return false;
     }
 
     // Dynamically allocate memory for the network list
     std::vector<WiFiNetwork> networks(n);
 
     // Store the scanned networks in the vector
     for (int i = 0; i < n; ++i) {
-        strncpy(networks[i].ssid, WiFi.SSID(i), sizeof(networks[i].ssid) - 1);
-        networks[i].ssid[sizeof(networks[i].ssid) - 1] = '\0'; // Ensure null termination
-        networks[i].rssi = WiFi.RSSI(i);
+      strncpy(networks[i].ssid, WiFi.SSID(i), sizeof(networks[i].ssid) - 1);
+      networks[i].ssid[sizeof(networks[i].ssid) - 1] =
+          '\0'; // Ensure null termination
+      networks[i].rssi = WiFi.RSSI(i);
     }
 
     // Sort the networks by RSSI in descending order
     std::sort(networks.begin(), networks.end(), compareByRSSI);
 
     // Was the network within secrets.json found?
     for (const auto &network : networks) {
-        if (strcmp(_ssid, network.ssid) == 0) {
-            WS_DEBUG_PRINT("SSID (");
-            WS_DEBUG_PRINT(_ssid);
-            WS_DEBUG_PRINT(") found! RSSI: ");
-            WS_DEBUG_PRINTLN(network.rssi);
-            return true;
-        }
+      if (strcmp(_ssid, network.ssid) == 0) {
+        WS_DEBUG_PRINT("SSID (");
+        WS_DEBUG_PRINT(_ssid);
+        WS_DEBUG_PRINT(") found! RSSI: ");
+        WS_DEBUG_PRINTLN(network.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: ");
     for (const auto &network : networks) {
-        WS_DEBUG_PRINT(network.ssid);
-        WS_DEBUG_PRINT(" ");
-        WS_DEBUG_PRINT(network.rssi);
-        WS_DEBUG_PRINTLN("dB");
+      WS_DEBUG_PRINT(network.ssid);
+      WS_DEBUG_PRINT(" ");
+      WS_DEBUG_PRINT(network.rssi);
+      WS_DEBUG_PRINTLN("dB");
     }
 
     return false;
-}
+  }
 
   /********************************************************/
   /*!
diff --git a/src/network_interfaces/Wippersnapper_ESP32.h b/src/network_interfaces/Wippersnapper_ESP32.h
@@ -23,12 +23,12 @@
 #include "Adafruit_MQTT.h"
 #include "Adafruit_MQTT_Client.h"
 #include "Arduino.h"
-#include <vector>
-#include <algorithm>
 #include "WiFi.h"
 #include "WiFiMulti.h"
 #include <NetworkClient.h>
 #include <NetworkClientSecure.h>
+#include <algorithm>
+#include <vector>
 extern Wippersnapper WS;
 
 /****************************************************************************/
@@ -94,13 +94,13 @@ class Wippersnapper_ESP32 : public Wippersnapper {
 
   // Define a structure to hold network information
   struct WiFiNetwork {
-      char ssid[33]; // Maximum SSID length is 32 characters + null terminator
-      int rssi;
+    char ssid[33]; // Maximum SSID length is 32 characters + null terminator
+    int rssi;
   };
 
   // Comparison function to sort by RSSI in descending order
   bool static compareByRSSI(const WiFiNetwork &a, const WiFiNetwork &b) {
-      return a.rssi > b.rssi;
+    return a.rssi > b.rssi;
   }
 
   /***********************************************************/
@@ -129,54 +129,56 @@ class Wippersnapper_ESP32 : public Wippersnapper {
     // Perform a network scan
     int n = WiFi.scanNetworks();
     if (n == 0) {
-        WS_DEBUG_PRINTLN("ERROR: No WiFi networks found!");
-        return false;
+      WS_DEBUG_PRINTLN("ERROR: No WiFi networks found!");
+      return false;
     }
 
     // Dynamically allocate memory for the network list
     std::vector<WiFiNetwork> networks(n);
 
     // 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);
+      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);
     }
 
     // Sort the networks by RSSI in descending order
     std::sort(networks.begin(), networks.end(), compareByRSSI);
 
     // Was the network within secrets.json found?
     for (const auto &network : networks) {
-        if (strcmp(_ssid, network.ssid) == 0) {
+      if (strcmp(_ssid, network.ssid) == 0) {
+        WS_DEBUG_PRINT("SSID (");
+        WS_DEBUG_PRINT(_ssid);
+        WS_DEBUG_PRINT(") found! RSSI: ");
+        WS_DEBUG_PRINTLN(network.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) {
             WS_DEBUG_PRINT("SSID (");
-            WS_DEBUG_PRINT(_ssid);
+            WS_DEBUG_PRINT(WS._multiNetworks[j].ssid);
             WS_DEBUG_PRINT(") found! RSSI: ");
             WS_DEBUG_PRINTLN(network.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) {
-                    WS_DEBUG_PRINT("SSID (");
-                    WS_DEBUG_PRINT(WS._multiNetworks[j].ssid);
-                    WS_DEBUG_PRINT(") found! RSSI: ");
-                    WS_DEBUG_PRINTLN(network.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: ");
     for (const auto &network : networks) {
-        WS_DEBUG_PRINT(network.ssid);
-        WS_DEBUG_PRINT(" ");
-        WS_DEBUG_PRINT(network.rssi);
-        WS_DEBUG_PRINTLN("dB");
+      WS_DEBUG_PRINT(network.ssid);
+      WS_DEBUG_PRINT(" ");
+      WS_DEBUG_PRINT(network.rssi);
+      WS_DEBUG_PRINTLN("dB");
     }
 
     return false;
diff --git a/src/network_interfaces/Wippersnapper_ESP8266.h b/src/network_interfaces/Wippersnapper_ESP8266.h
@@ -18,13 +18,13 @@
 #define WIPPERSNAPPER_ESP8266_H
 
 #ifdef ARDUINO_ARCH_ESP8266
-#include <vector>
-#include <algorithm>
 #include "Adafruit_MQTT.h"
 #include "Adafruit_MQTT_Client.h"
 #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
@@ -116,15 +116,13 @@ class Wippersnapper_ESP8266 : public Wippersnapper {
   }
 
   // Define a structure to hold network information
-  struct WiFiNetwork
-  {
+  struct WiFiNetwork {
     char ssid[33]; // Maximum SSID length is 32 characters + null terminator
     int rssi;
   };
 
   // Comparison function to sort by RSSI in descending order
-  bool static compareByRSSI(const WiFiNetwork &a, const WiFiNetwork &b)
-  {
+  bool static compareByRSSI(const WiFiNetwork &a, const WiFiNetwork &b) {
     return a.rssi > b.rssi;
   }
 
@@ -153,8 +151,10 @@ class Wippersnapper_ESP8266 : public Wippersnapper {
 
     // 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
+      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);
     }
 
@@ -187,8 +187,7 @@ 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)
-    {
+    for (const auto &network : networks) {
       WS_DEBUG_PRINT(network.ssid);
       WS_DEBUG_PRINT(" ");
       WS_DEBUG_PRINT(network.rssi);
diff --git a/src/network_interfaces/Wippersnapper_WIFININA.h b/src/network_interfaces/Wippersnapper_WIFININA.h
@@ -19,10 +19,10 @@
 #include <Adafruit_MQTT.h>
 #include <Adafruit_MQTT_Client.h>
 #include <Arduino.h>
-#include <vector>
-#include <algorithm>
 #include <SPI.h>
 #include <WiFiNINA.h>
+#include <algorithm>
+#include <vector>
 
 #include "Wippersnapper.h"
 
@@ -111,17 +111,14 @@ class Wippersnapper_WIFININA : public Wippersnapper {
     strlcpy(WS._config.network.pass, _pass, sizeof(WS._config.network.pass));
   }
 
-
   // Define a structure to hold network information
-  struct WiFiNetwork
-  {
+  struct WiFiNetwork {
     char ssid[33]; // Maximum SSID length is 32 characters + null terminator
     int rssi;
   };
 
   // Comparison function to sort by RSSI in descending order
-  bool static compareByRSSI(const WiFiNetwork &a, const WiFiNetwork &b)
-  {
+  bool static compareByRSSI(const WiFiNetwork &a, const WiFiNetwork &b) {
     return a.rssi > b.rssi;
   }
 
@@ -140,42 +137,43 @@ class Wippersnapper_WIFININA : public Wippersnapper {
     // Perform a network scan
     int n = WiFi.scanNetworks();
     if (n == 0) {
-        WS_DEBUG_PRINTLN("ERROR: No WiFi networks found!");
-        return false;
+      WS_DEBUG_PRINTLN("ERROR: No WiFi networks found!");
+      return false;
     }
 
     // Dynamically allocate memory for the network list
     std::vector<WiFiNetwork> networks(n);
 
     // Store the scanned networks in the vector
     for (int i = 0; i < n; ++i) {
-        strncpy(networks[i].ssid, WiFi.SSID(i), sizeof(networks[i].ssid) - 1);
-        networks[i].ssid[sizeof(networks[i].ssid) - 1] = '\0'; // Ensure null termination
-        networks[i].rssi = WiFi.RSSI(i);
+      strncpy(networks[i].ssid, WiFi.SSID(i), sizeof(networks[i].ssid) - 1);
+      networks[i].ssid[sizeof(networks[i].ssid) - 1] =
+          '\0'; // Ensure null termination
+      networks[i].rssi = WiFi.RSSI(i);
     }
 
     // Sort the networks by RSSI in descending order
     std::sort(networks.begin(), networks.end(), compareByRSSI);
 
     // Was the network within secrets.json found?
     for (const auto &network : networks) {
-        if (strcmp(_ssid, network.ssid) == 0) {
-            WS_DEBUG_PRINT("SSID (");
-            WS_DEBUG_PRINT(_ssid);
-            WS_DEBUG_PRINT(") found! RSSI: ");
-            WS_DEBUG_PRINTLN(network.rssi);
-            return true;
-        }
+      if (strcmp(_ssid, network.ssid) == 0) {
+        WS_DEBUG_PRINT("SSID (");
+        WS_DEBUG_PRINT(_ssid);
+        WS_DEBUG_PRINT(") found! RSSI: ");
+        WS_DEBUG_PRINTLN(network.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: ");
     for (const auto &network : networks) {
-        WS_DEBUG_PRINT(network.ssid);
-        WS_DEBUG_PRINT(" ");
-        WS_DEBUG_PRINT(network.rssi);
-        WS_DEBUG_PRINTLN("dB");
+      WS_DEBUG_PRINT(network.ssid);
+      WS_DEBUG_PRINT(" ");
+      WS_DEBUG_PRINT(network.rssi);
+      WS_DEBUG_PRINTLN("dB");
     }
 
     return false;
diff --git a/src/network_interfaces/ws_networking_pico.h b/src/network_interfaces/ws_networking_pico.h
