From 0921d01340f9b021609a1e0fb82115a0cd6da4c6 Mon Sep 17 00:00:00 2001
From: richonguzman <richon2001@hotmail.com>
Date: Wed, 22 May 2024 11:41:08 -0400
Subject: [PATCH] starting mods

---
 src/LoRa_APRS_iGate.cpp | 22 ++++++++++++----------
 src/wifi_utils.cpp      | 39 ++++++++++++++++++++++++++++++++-------
 2 files changed, 44 insertions(+), 17 deletions(-)

diff --git a/src/LoRa_APRS_iGate.cpp b/src/LoRa_APRS_iGate.cpp
index ef5ae5d..d75f249 100644
--- a/src/LoRa_APRS_iGate.cpp
+++ b/src/LoRa_APRS_iGate.cpp
@@ -40,20 +40,10 @@ ________________________________________________________________________________
 String          versionDate             = "2024.05.20";
 Configuration   Config;
 WiFiClient      espClient;
-uint8_t         myWiFiAPIndex           = 0;
-int             myWiFiAPSize            = Config.wifiAPs.size();
-WiFi_AP         *currentWiFi            = &Config.wifiAPs[myWiFiAPIndex];
 
 bool            isUpdatingOTA           = false;
-uint32_t        previousWiFiMillis      = 0;
 uint32_t        lastScreenOn            = millis();
 
-uint32_t        lastWiFiCheck           = 0;
-bool            WiFiConnect             = true;
-bool            WiFiConnected           = false;
-bool            WiFiAutoAPStarted       = false;
-long            WiFiAutoAPTime          = false;
-
 uint32_t        lastBatteryCheck        = 0;
 String          batteryVoltage;
 
@@ -63,6 +53,18 @@ bool            modemLoggedToAPRSIS     = false;
 
 String firstLine, secondLine, thirdLine, fourthLine, fifthLine, sixthLine, seventhLine;
 
+/*uint8_t         myWiFiAPIndex           = 0;
+int             myWiFiAPSize            = Config.wifiAPs.size();
+WiFi_AP         *currentWiFi            = &Config.wifiAPs[myWiFiAPIndex];*/
+//uint32_t        previousWiFiMillis      = 0;
+//uint32_t        lastWiFiCheck           = 0;
+//bool            WiFiConnect             = true;
+//bool            WiFiConnected           = false;
+//bool            WiFiAutoAPStarted       = false;
+//long            WiFiAutoAPTime          = false;
+
+
+
 //#define STARTUP_DELAY 5 //min
 
 void setup() {
diff --git a/src/wifi_utils.cpp b/src/wifi_utils.cpp
index 57a81f8..11aa7d4 100644
--- a/src/wifi_utils.cpp
+++ b/src/wifi_utils.cpp
@@ -6,14 +6,21 @@
 #include "utils.h"
 
 extern Configuration  Config;
-extern WiFi_AP        *currentWiFi;
-extern uint8_t        myWiFiAPIndex;
-extern int            myWiFiAPSize;
-extern uint32_t       previousWiFiMillis;
-extern bool           WiFiConnected;
-extern long           WiFiAutoAPTime;
-extern bool           WiFiAutoAPStarted;
 
+//extern WiFi_AP        *currentWiFi;
+//extern uint8_t        myWiFiAPIndex;
+//extern int            myWiFiAPSize;
+//extern uint32_t       previousWiFiMillis;
+
+uint8_t     myWiFiAPIndex       = 0;
+int         myWiFiAPSize        = Config.wifiAPs.size();
+WiFi_AP     *currentWiFi        = &Config.wifiAPs[myWiFiAPIndex];
+
+uint8_t     wifiCounter         = 0;
+bool        WiFiConnected       = false;
+uint32_t    WiFiAutoAPTime      = millis();
+bool        WiFiAutoAPStarted   = false;
+uint32_t    previousWiFiMillis  = 0;
 
 namespace WIFI_Utils {
 
@@ -24,9 +31,27 @@ namespace WIFI_Utils {
             WiFi.disconnect();
             WiFi.reconnect();
             previousWiFiMillis = millis();
+            wifiCounter++;
+        } else if (WiFi.status() == WL_CONNECTED) {
+            wifiCounter = 0;
+            Serial.println(wifiCounter);
         }
     }
 
+    /*void checkWiFiInterval() {
+        uint32_t WiFiCheck = millis() - lastWiFiCheck;
+        if (WiFi.status() != WL_CONNECTED && WiFiCheck >= 15 * 60 * 1000) {
+            WiFiConnect = true;
+        }
+        if (WiFiConnect) {
+            Serial.println("\nConnecting to WiFi ...");
+            WIFI_Utils::startWiFi();
+            lastWiFiCheck = millis();
+            WiFiConnect = false;
+        }
+    }*/
+
+
     void startAutoAP() {
         WiFi.mode(WIFI_MODE_NULL);