Merge pull request #831 from LeeLeahy2/web-sockets

Web sockets: Split out into WebSockets.ino, support multiple connections

Author: nseidle

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

@@ -171,7 +171,7 @@ void stateUpdate()
                                                 | Set fixedBase true
                                                 | STATE_BASE_NOT_STARTED falls into
                                                 | STATE_BASE_FIXED_NOT_STARTED
-                                                | 
+                                                |
                                                 V
                               .-----------------------------------.
                   startBase() |      STATE_BASE_NOT_STARTED       |
@@ -489,7 +489,7 @@ void stateUpdate()
                     // Confirm receipt so the web interface stops sending the config blob
                     if (settings.debugWebServer == true)
                         systemPrintln("Sending receipt confirmation of settings");
-                    sendStringToWebsocket("confirmDataReceipt,1,");
+                    webSocketsSendString("confirmDataReceipt,1,");
 
                     // Disallow new data to flow from websocket while we are parsing the current data
                     currentlyParsingData = true;
@@ -521,27 +521,19 @@ 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)
                 {
                     lastDynamicDataUpdate = millis();
-                    createDynamicDataString(settingsCSV);
-
-                    sendStringToWebsocket(settingsCSV);
+                    webSocketsSendSettings();
                 }
 
                 // If a firmware version was requested, and obtained, report it back to the web page
                 if (strlen(otaReportedVersion) > 0)
                 {
-                    createFirmwareVersionString(settingsCSV);
-
-                    if (settings.debugWebServer)
-                        systemPrintf("WebServer: Firmware version requested. Sending: %s\r\n", settingsCSV);
-
-                    sendStringToWebsocket(settingsCSV);
-
+                    webSocketsSendFirmwareVersion();
                     otaReportedVersion[0] = '\0'; // Zero out the reported version
                 }
             }