WebSockets: Use webSocketsIsConnected() instead of websocketConnected

Author: LeeLeahy2

Firmware/RTK_Everywhere/Developer.ino

@@ -304,6 +304,12 @@ void webServerVerifyTables() {}
 bool wifiAfterCommand(int cmdIndex){return false;}
 bool webServerIsRunning() {return false;}
 
+//----------------------------------------
+// Web Sockets
+//----------------------------------------
+
+bool webSocketsIsConnected() (return false;}
+
 #endif  // COMPILE_AP
 
 //======================================================================

Firmware/RTK_Everywhere/RTK_Everywhere.ino

@@ -430,7 +430,7 @@ bool savePossibleSettings = true; // Save possible vs. available settings. See r
 //-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
 #ifdef COMPILE_WIFI
 int packetRSSI;
-RTK_WIFI wifi(false); // wifi(false); is non-verbose. For verbose, change to wifi(true); 
+RTK_WIFI wifi(false); // wifi(false); is non-verbose. For verbose, change to wifi(true);
 #endif // COMPILE_WIFI
 
 // WiFi Globals - For other module direct access
@@ -708,7 +708,6 @@ char *incomingSettings;
 int incomingSettingsSpot;
 unsigned long timeSinceLastIncomingSetting;
 unsigned long lastDynamicDataUpdate;
-bool websocketConnected = false;
 
 #ifdef COMPILE_WIFI
 #ifdef COMPILE_AP

Firmware/RTK_Everywhere/States.ino

@@ -521,7 +521,7 @@ void stateUpdate()
 #ifdef COMPILE_WIFI
 #ifdef COMPILE_AP
             // Handle dynamic requests coming from web config page
-            if (websocketConnected == true)
+            if (webSocketsIsConnected() == true)
             {
                 // Update the coordinates on the AP page
                 if ((millis() - lastDynamicDataUpdate) > 1000)

Firmware/RTK_Everywhere/WebSockets.ino

@@ -18,6 +18,7 @@ static const int webSocketsStackSize = 1024 * 20;   // Needs to be large enough
 
 static int last_ws_fd;
 // httpd_req_t *last_ws_req;
+static bool webSocketsConnected;
 static httpd_handle_t webSocketsHandle;
 
 //----------------------------------------
@@ -137,7 +138,7 @@ static esp_err_t webSocketsHandler(httpd_req_t *req)
         if (settings.debugWebServer == true)
             systemPrintf("Handshake done, the new ws connection was opened with fd %d\r\n", last_ws_fd);
 
-        websocketConnected = true;
+        webSocketsConnected = true;
         lastDynamicDataUpdate = millis();
         webSocketsSendString(settingsCSV);
 
@@ -236,13 +237,21 @@ static esp_err_t webSocketsHandler(httpd_req_t *req)
             systemPrintln("Client closed or refreshed the web page");
 
         createSettingsString(settingsCSV);
-        websocketConnected = false;
+        webSocketsConnected = false;
     }
 
     rtkFree(buf, "Payload buffer (buf)");
     return ret;
 }
 
+//----------------------------------------
+// Determine if webSockets is connected to a client
+//----------------------------------------
+bool webSocketsIsConnected()
+{
+    return webSocketsConnected;
+}
+
 //----------------------------------------
 // Send the formware version via web sockets
 //----------------------------------------
@@ -270,7 +279,7 @@ void webSocketsSendSettings(void)
 //----------------------------------------
 void webSocketsSendString(const char *stringToSend)
 {
-    if (!websocketConnected)
+    if (!webSocketsConnected)
     {
         systemPrintf("webSocketsSendString: not connected - could not send: %s\r\n", stringToSend);
         return;
@@ -360,7 +369,7 @@ bool webSocketsStart(void)
 //----------------------------------------
 void webSocketsStop()
 {
-    websocketConnected = false;
+    webSocketsConnected = false;
 
     if (webSocketsHandle != nullptr)
     {

Firmware/RTK_Everywhere/menuFirmware.ino

@@ -884,7 +884,7 @@ void otaUpdate()
                 // is requesting the firmware update via those interfaces, thus we attempt an update
                 // only once, stopping the state machine on failure
 
-                if (websocketConnected)
+                if (webSocketsIsConnected())
                 {
                     // Report failed connection to web client
                     webSocketsSendString((char *)"newFirmwareVersion,NO_INTERNET,");
@@ -941,7 +941,7 @@ void otaUpdate()
                     {
                         otaRequestFirmwareVersionCheck = false;
 
-                        if (websocketConnected)
+                        if (webSocketsIsConnected())
                         {
                             char newVersionCSV[40];
                             snprintf(newVersionCSV, sizeof(newVersionCSV), "newFirmwareVersion,%s,",
@@ -966,7 +966,7 @@ void otaUpdate()
                 else
                 {
                     systemPrintln("Version Check: Firmware is up to date. No new firmware available.");
-                    if (websocketConnected)
+                    if (webSocketsIsConnected())
                         webSocketsSendString((char *)"newFirmwareVersion,CURRENT,");
 
                     otaUpdateStop();
@@ -976,7 +976,7 @@ void otaUpdate()
             {
                 // Failed to get version number
                 systemPrintln("Failed to get version number from server.");
-                if (websocketConnected)
+                if (webSocketsIsConnected())
                     webSocketsSendString((char *)"newFirmwareVersion,NO_SERVER,");
 
                 // Report failure over the CLI
@@ -995,7 +995,7 @@ void otaUpdate()
             {
                 otaUpdateStop();
 
-                if (websocketConnected)
+                if (webSocketsIsConnected())
                     webSocketsSendString((char *)"gettingNewFirmware,ERROR,");
 
                 // Report failure over the CLI
@@ -1009,7 +1009,7 @@ void otaUpdate()
                 otaUpdateFirmware();
 
                 // Update triggers ESP.restart(). If we get this far, the firmware update has failed
-                if (websocketConnected)
+                if (webSocketsIsConnected())
                     webSocketsSendString((char *)"gettingNewFirmware,ERROR,");
 
                 // Report failure over the CLI