Increase NTRIP Client and WiFi connection timeouts

Related to issue #285

Author: nseidle

Firmware/RTK_Surveyor/NtripClient.ino

@@ -47,7 +47,7 @@ static const int MAX_NTRIP_CLIENT_CONNECTION_ATTEMPTS = 3;
 static const uint32_t NTRIP_CLIENT_RESPONSE_TIMEOUT = 10 * 1000; //Milliseconds
 
 //NTRIP client receive data timeout
-static const uint32_t NTRIP_CLIENT_RECEIVE_DATA_TIMEOUT = 10 * 1000; //Milliseconds
+static const uint32_t NTRIP_CLIENT_RECEIVE_DATA_TIMEOUT = 30 * 1000; //Milliseconds
 
 //Most incoming data is around 500 bytes but may be larger
 static const int RTCM_DATA_SIZE = 512 * 4;
@@ -317,8 +317,6 @@ void ntripClientUpdate()
           if (ntripClientConnectLimitReached())
             //Display the WiFi failure
             paintNtripWiFiFail(4000, true);
-
-          //TODO WiFi not available, give up, disable future attempts
         }
       }
       else

Firmware/RTK_Surveyor/WiFi.ino

@@ -45,7 +45,7 @@
 //----------------------------------------
 
 //If we cannot connect to local wifi, give up/go to Rover
-static const int WIFI_CONNECTION_TIMEOUT = 8 * 1000;  //Milliseconds
+static const int WIFI_CONNECTION_TIMEOUT = 10 * 1000;  //Milliseconds
 
 //Interval to use when displaying the IP address
 static const int WIFI_IP_ADDRESS_DISPLAY_INTERVAL = 12 * 1000;  //Milliseconds
@@ -215,6 +215,8 @@ void wifiStart(char* ssid, char* pw)
   {
     wifiSetState(WIFI_NOTCONNECTED);
 
+    WiFi.mode(WIFI_STA);
+
 #ifdef COMPILE_ESPNOW
     if (espnowState > ESPNOW_OFF)
     {
@@ -231,8 +233,6 @@ void wifiStart(char* ssid, char* pw)
     esp_wifi_set_protocol(WIFI_IF_STA, WIFI_PROTOCOL_11B | WIFI_PROTOCOL_11G | WIFI_PROTOCOL_11N); //Set basic WiFi protocols. Stops WiFi Station.
 #endif
 
-    WiFi.mode(WIFI_STA);
-
     Serial.printf("WiFi connecting to %s\r\n", ssid);
     WiFi.begin(ssid, pw);
     wifiTimer = millis();