Stop NTRIP Client/Server if SSID is blank

Author: nseidle

Firmware/RTK_Surveyor/NtripClient.ino

@@ -71,6 +71,7 @@ static int ntripClientConnectionAttempts;
 //  * Measure the connection response time
 //  * Receive NTRIP data timeout
 static uint32_t ntripClientTimer;
+static uint32_t ntripClientStartTime; //For calculating uptime
 
 //Last time the NTRIP client state was displayed
 static uint32_t lastNtripClientState = 0;
@@ -99,7 +100,7 @@ bool ntripClientConnect()
   if (token != NULL)
   {
     token = strtok(NULL, "//"); //Advance to data after //
-    if(token != NULL)
+    if (token != NULL)
       strcpy(settings.ntripClient_CasterHost, token);
   }
 
@@ -324,8 +325,16 @@ void ntripClientUpdate()
 
     //Start WiFi
     case NTRIP_CLIENT_ON:
-      wifiStart(settings.ntripClient_wifiSSID, settings.ntripClient_wifiPW);
-      ntripClientSetState(NTRIP_CLIENT_WIFI_CONNECTING);
+      if (strlen(settings.ntripClient_wifiSSID) == 0)
+      {
+        Serial.println("Error: Please enter SSID before starting NTRIP Client");
+        ntripClientSetState(NTRIP_CLIENT_OFF);
+      }
+      else
+      {
+        wifiStart(settings.ntripClient_wifiSSID, settings.ntripClient_wifiPW);
+        ntripClientSetState(NTRIP_CLIENT_WIFI_CONNECTING);
+      }
       break;
 
     case NTRIP_CLIENT_WIFI_CONNECTING:
@@ -446,6 +455,7 @@ void ntripClientUpdate()
 
           //We don't use a task because we use I2C hardware (and don't have a semphore).
           online.ntripClient = true;
+          ntripClientStartTime = millis();
           ntripClientAllowMoreConnections();
           ntripClientSetState(NTRIP_CLIENT_CONNECTED);
         }

Firmware/RTK_Surveyor/NtripServer.ino

@@ -101,7 +101,7 @@ bool ntripServerConnectCaster()
   if (token != NULL)
   {
     token = strtok(NULL, "//"); //Advance to data after //
-    if(token != NULL)
+    if (token != NULL)
       strcpy(settings.ntripServer_CasterHost, token);
   }
 
@@ -358,22 +358,30 @@ void ntripServerUpdate()
 
     //Start WiFi
     case NTRIP_SERVER_ON:
-      //Pause until connection timeout has passed
-      if (millis() - ntripServerLastConnectionAttempt > ntripServerConnectionAttemptTimeout)
+      if (strlen(settings.ntripServer_wifiSSID) == 0)
       {
-        ntripServerLastConnectionAttempt = millis();
-        wifiStart(settings.ntripServer_wifiSSID, settings.ntripServer_wifiPW);
-        ntripServerSetState(NTRIP_SERVER_WIFI_CONNECTING);
+        Serial.println("Error: Please enter SSID before starting NTRIP Server");
+        ntripClientSetState(NTRIP_SERVER_OFF);
       }
       else
       {
-        if (millis() - ntripServerTimeoutPrint > 1000)
+        //Pause until connection timeout has passed
+        if (millis() - ntripServerLastConnectionAttempt > ntripServerConnectionAttemptTimeout)
         {
-          ntripServerTimeoutPrint = millis();
-          Serial.printf("NTRIP Server connection timeout wait: %d of %d seconds \n\r",
-                        (millis() - ntripServerLastConnectionAttempt) / 1000,
-                        ntripServerConnectionAttemptTimeout / 1000
-                       );
+          ntripServerLastConnectionAttempt = millis();
+          wifiStart(settings.ntripServer_wifiSSID, settings.ntripServer_wifiPW);
+          ntripServerSetState(NTRIP_SERVER_WIFI_CONNECTING);
+        }
+        else
+        {
+          if (millis() - ntripServerTimeoutPrint > 1000)
+          {
+            ntripServerTimeoutPrint = millis();
+            Serial.printf("NTRIP Server connection timeout wait: %d of %d seconds \n\r",
+                          (millis() - ntripServerLastConnectionAttempt) / 1000,
+                          ntripServerConnectionAttemptTimeout / 1000
+                         );
+          }
         }
       }
       break;