Fix code after rebase.

Author: nseidle

Firmware/RTK_Surveyor/NtripClient.ino

@@ -224,181 +224,7 @@ void ntripClientSetState(byte newState)
   }
 }
 
-#endif  //COMPILE_WIFI
-
-//----------------------------------------
-// Constants - compiled out
-//----------------------------------------
-
-#ifdef  COMPILE_WIFI
-
-//Size of the credentials buffer in bytes
-static const int CREDENTIALS_BUFFER_SIZE = 512;
-
-//Give up connecting after this number of attempts
-static const int MAX_NTRIP_CLIENT_CONNECTION_ATTEMPTS = 3;
-
-//NTRIP caster response timeout
-static const uint32_t NTRIP_CLIENT_RESPONSE_TIMEOUT = 5 * 1000; //Milliseconds
-
-//NTRIP client receive data timeout
-static const uint32_t NTRIP_CLIENT_RECEIVE_DATA_TIMEOUT = 10 * 1000; //Milliseconds
-
-//Most incoming data is around 500 bytes but may be larger
-static const int RTCM_DATA_SIZE = 512 * 4;
-
-//NTRIP client server request buffer size
-static const int SERVER_BUFFER_SIZE = CREDENTIALS_BUFFER_SIZE + 3;
-
-//----------------------------------------
-// Locals - compiled out
-//----------------------------------------
-
-//The WiFi connection to the NTRIP caster to obtain RTCM data.
-static WiFiClient * ntripClient;
-
-//Count the number of connection attempts
-static int ntripClientConnectionAttempts;
-
-//NTRIP client timer usage:
-//  * Measure the connection response time
-//  * Receive NTRIP data timeout
-static uint32_t ntripClientTimer;
-
-//----------------------------------------
-// NTRIP Client Routines - compiled out
-//----------------------------------------
-
-void ntripClientAllowMoreConnections()
-{
-  ntripClientConnectionAttempts = 0;
-}
-
-bool ntripClientConnect()
-{
-  if (!ntripClient->connect(settings.ntripClient_CasterHost, settings.ntripClient_CasterPort))
-    return false;
-  Serial.printf("NTRIP Client connected to %s:%d\n\r", settings.ntripClient_CasterHost, settings.ntripClient_CasterPort);
-
-  // Set up the server request (GET)
-  char serverRequest[SERVER_BUFFER_SIZE];
-  snprintf(serverRequest,
-           SERVER_BUFFER_SIZE,
-           "GET /%s HTTP/1.0\r\nUser-Agent: NTRIP SparkFun_RTK_%s_v%d.%d\r\n",
-           settings.ntripClient_MountPoint, platformPrefix, FIRMWARE_VERSION_MAJOR, FIRMWARE_VERSION_MINOR);
-
-  // Set up the credentials
-  char credentials[CREDENTIALS_BUFFER_SIZE];
-  if (strlen(settings.ntripClient_CasterUser) == 0)
-  {
-    strncpy(credentials, "Accept: */*\r\nConnection: close\r\n", sizeof(credentials));
-  }
-  else
-  {
-    //Pass base64 encoded user:pw
-    char userCredentials[sizeof(settings.ntripClient_CasterUser) + sizeof(settings.ntripClient_CasterUserPW) + 1]; //The ':' takes up a spot
-    snprintf(userCredentials, sizeof(userCredentials), "%s:%s", settings.ntripClient_CasterUser, settings.ntripClient_CasterUserPW);
-
-    Serial.print(F("NTRIP Client sending credentials: "));
-    Serial.println(userCredentials);
-
-    //Encode with ESP32 built-in library
-    base64 b;
-    String strEncodedCredentials = b.encode(userCredentials);
-    char encodedCredentials[strEncodedCredentials.length() + 1];
-    strEncodedCredentials.toCharArray(encodedCredentials, sizeof(encodedCredentials)); //Convert String to char array
-
-    snprintf(credentials, sizeof(credentials), "Authorization: Basic %s\r\n", encodedCredentials);
-  }
-
-  // Add the encoded credentials to the server request
-  strncat(serverRequest, credentials, SERVER_BUFFER_SIZE - 1);
-  strncat(serverRequest, "\r\n", SERVER_BUFFER_SIZE - 1);
-
-  Serial.print(F("NTRIP Client serverRequest size: "));
-  Serial.print(strlen(serverRequest));
-  Serial.print(F(" of "));
-  Serial.print(sizeof(serverRequest));
-  Serial.println(F(" bytes available"));
-
-  // Send the server request
-  Serial.println(F("NTRIP Client sending server request: "));
-  Serial.println(serverRequest);
-  ntripClient->write(serverRequest, strlen(serverRequest));
-  ntripClientTimer = millis();
-  return true;
-}
-
-//Determine if another connection is possible or if the limit has been reached
-bool ntripClientConnectLimitReached()
-{
-  //Shutdown the NTRIP client
-  ntripClientStop();
-
-  //Retry the connection a few times
-  bool limitReached = (ntripClientConnectionAttempts++ >= MAX_NTRIP_CLIENT_CONNECTION_ATTEMPTS);
-  if (!limitReached)
-    //Display the heap state
-    reportHeapNow();
-  else
-    //No more connection attempts, switching to Bluetooth
-    ntripClientSwitchToBluetooth();
-  return limitReached;
-}
-
-//Determine if NTRIP client data is available
-int ntripClientReceiveDataAvailable()
-{
-  return ntripClient->available();
-}
-
-//Read the response from the NTRIP client
-void ntripClientResponse(char * response, size_t maxLength)
-{
-  char * responseEnd;
-
-  //Make sure that we can zero terminate the response
-  responseEnd = &response[maxLength - 1];
-
-  // Read bytes from the caster and store them
-  while ((response < responseEnd) && ntripClientReceiveDataAvailable())
-    *response++ = ntripClient->read();
-
-  // Zero terminate the response
-  *response = '\0';
-}
-
-//Stop the NTRIP client
-void ntripClientStop()
-{
-  if (ntripClient)
-  {
-    if (ntripClient->connected())
-      ntripClient->stop();
-    delete ntripClient;
-    ntripClient = NULL;
-  }
-  if (ntripClientState > NTRIP_CLIENT_ON)
-    wifiStop();
-  ntripClientState = NTRIP_CLIENT_ON;
-}
-
-//Switch to Bluetooth operation
-void ntripClientSwitchToBluetooth()
-{
-  Serial.println(F("NTRIP Client failure, switching to Bluetooth!"));
-
-  //Stop WiFi operations
-  ntripClientStop();
-
-  //No more connection attempts
-  ntripClientState = NTRIP_CLIENT_OFF;
-
-  //Turn on Bluetooth with 'Rover' name
-  startBluetooth();
-}
-
-#endif  //COMPILE_WIFI
+#endif
 
 //----------------------------------------
 // Global NTRIP Client Routines

Firmware/RTK_Surveyor/WiFi.ino

@@ -75,9 +75,10 @@ void wifiDisplayIpAddress()
   wifiTimer = millis();
 }
 
-//----------------------------------------
-// WiFi Config Support Routines - compiled out
-//----------------------------------------
+IPAddress wifiGetIpAddress()
+{
+  return WiFi.localIP();
+}
 
 byte wifiGetStatus()
 {