Keep WiFi on during Temp Base Survey In

Fix #386

Author: nseidle

Firmware/RTK_Surveyor/NtripClient.ino

@@ -306,19 +306,32 @@ void ntripClientStop(bool wifiClientAllocated)
 #endif  //COMPILE_WIFI
 }
 
-//Check for the arrival of any correction data. Push it to the GNSS.
-//Stop task if the connection has dropped or if we receive no data for maxTimeBeforeHangup_ms
-void ntripClientUpdate()
+//Determine if NTRIP Client is needed
+bool ntripClientIsNeeded()
 {
   if (settings.enableNtripClient == false)
   {
     //If user turns off NTRIP Client via settings, stop server
     if (ntripClientState > NTRIP_CLIENT_OFF)
       ntripClientStop(true);  //Don't allocate new wifiClient
-    return;
+    return(false);
   }
 
-  if (wifiInConfigMode()) return; //Do not service NTRIP during WiFi config
+  if (wifiInConfigMode()) return(false); //Do not service NTRIP during WiFi config
+
+  //Allow NTRIP Client to run during Survey-In,
+  //but do not allow NTRIP Client to run during Base
+  if (systemState == STATE_BASE_TEMP_TRANSMITTING)
+    return(false);
+
+  return(true);
+}
+
+//Check for the arrival of any correction data. Push it to the GNSS.
+//Stop task if the connection has dropped or if we receive no data for maxTimeBeforeHangup_ms
+void ntripClientUpdate()
+{
+  if(ntripClientIsNeeded() == false) return;
 
 #ifdef COMPILE_WIFI
   //Periodically display the NTRIP client state

Firmware/RTK_Surveyor/States.ino

@@ -234,7 +234,9 @@ void updateSystemState()
 
           displayBaseStart(0); //Show 'Base'
 
-          wifiStop(); //Stop WiFi. Re-enable in each specific base start state.
+          //Allow WiFi to continue running if NTRIP Client is needed for assisted survey in
+          if(wifiIsNeeded() == false)
+            wifiStop();
 
           bluetoothStop();
           bluetoothStart(); //Restart Bluetooth with 'Base' identifier

Firmware/RTK_Surveyor/WiFi.ino

@@ -460,6 +460,13 @@ bool wifiIsNeeded()
      )
     needed = true;
 
+  //If the user has enabled NTRIP Client for an Assisted Survey-In, and Survey-In is running, keep WiFi on.
+  if (systemState >= STATE_BASE_NOT_STARTED && systemState <= STATE_BASE_TEMP_SURVEY_STARTED
+      && settings.enableNtripClient == true
+      && settings.fixedBase == false
+     )
+    needed = true;
+
   //If WiFi is on while we are in the following states, allow WiFi to continue to operate
   if (systemState >= STATE_BUBBLE_LEVEL && systemState <= STATE_PROFILE)
   {