Fix: calls to getRSSI unqualified inside Wippersnapper.cpp + only get RSSI before connect in check_valid_ssid

Author: tyeth

src/Wippersnapper.cpp

@@ -2402,8 +2402,6 @@ void Wippersnapper::runNetFSM() {
         haltError("ERROR: Unable to find WiFi network, rebooting soon...",
                   WS_LED_STATUS_WIFI_CONNECTING);
       }
-      WS_DEBUG_PRINT("SSID found! RSSI: ");
-      WS_DEBUG_PRINTLN(WS.getRSSI());
       // Attempt to connect to wireless network
       maxAttempts = 5;
       while (maxAttempts > 0) {
@@ -2570,7 +2568,7 @@ void Wippersnapper::pingBroker() {
     }
     _prv_ping = millis();
     WS_DEBUG_PRINT("WiFi RSSI: ");
-    WS_DEBUG_PRINTLN(WS.getRSSI());
+    WS_DEBUG_PRINTLN(getRSSI());
   }
   // blink status LED every STATUS_LED_KAT_BLINK_TIME millis
   if (millis() > (_prvKATBlink + STATUS_LED_KAT_BLINK_TIME)) {
@@ -2887,4 +2885,4 @@ ws_status_t Wippersnapper::run() {
   WS.feedWDT();
 
   return WS_NET_CONNECTED; // TODO: Make this funcn void!
-}
+}

src/network_interfaces/Wippersnapper_AIRLIFT.h

@@ -120,6 +120,8 @@ class Wippersnapper_AIRLIFT : public Wippersnapper {
     // Was the network within secrets.json found?
     for (int i = 0; i < n; ++i) {
       if (strcmp(_ssid, WiFi.SSID(i)) == 0) {
+        WS_DEBUG_PRINT("SSID found! RSSI: ");
+        WS_DEBUG_PRINTLN(WiFi.RSSI(i));
         return true;
       }
     }
@@ -331,7 +333,7 @@ class Wippersnapper_AIRLIFT : public Wippersnapper {
       _status = WS_NET_DISCONNECTED;
 
       // Use the macro to retry the status check until connected / timed out
-      int lastResult;
+      int lastResult = -1;
       RETRY_FUNCTION_UNTIL_TIMEOUT(
           []() -> int { return WiFi.status(); }, // Function call each cycle
           int,                                   // return type

src/network_interfaces/Wippersnapper_ESP32.h

@@ -110,6 +110,8 @@ class Wippersnapper_ESP32 : public Wippersnapper {
     // Was the network within secrets.json found?
     for (int i = 0; i < n; ++i) {
       if (strcmp(_ssid, WiFi.SSID(i).c_str()) == 0) {
+        WS_DEBUG_PRINT("SSID found! RSSI: ");
+        WS_DEBUG_PRINTLN(WiFi.RSSI(i));
         return true;
       }
     }

src/network_interfaces/Wippersnapper_ESP8266.h

@@ -133,6 +133,8 @@ class Wippersnapper_ESP8266 : public Wippersnapper {
     // Was the network within secrets.json found?
     for (int i = 0; i < n; ++i) {
       if (strcmp(_ssid, WiFi.SSID(i).c_str()) == 0) {
+        WS_DEBUG_PRINT("SSID found! RSSI: ");
+        WS_DEBUG_PRINTLN(WiFi.RSSI(i));
         return true;
       }
     }

src/network_interfaces/Wippersnapper_WIFININA.h

@@ -131,6 +131,8 @@ class Wippersnapper_WIFININA : public Wippersnapper {
     // Was the network within secrets.json found?
     for (int i = 0; i < n; ++i) {
       if (strcmp(_ssid, WiFi.SSID(i)) == 0) {
+        WS_DEBUG_PRINT("SSID found! RSSI: ");
+        WS_DEBUG_PRINTLN(WiFi.RSSI(i));
         return true;
       }
     }

src/network_interfaces/ws_networking_pico.h

@@ -109,6 +109,8 @@ class ws_networking_pico : public Wippersnapper {
     // Was the network within secrets.json found?
     for (int i = 0; i < n; ++i) {
       if (strcmp(_ssid, WiFi.SSID(i)) == 0) {
+        WS_DEBUG_PRINT("SSID found! RSSI: ");
+        WS_DEBUG_PRINTLN(WiFi.RSSI(i));
         return true;
       }
     }