Merge pull request #16 from sparkfun/release_candidate

Update u-blox

Author: PaulZC

examples/SARA-R5_Example15_GNSS_NTRIP_Caster_With_Callbacks/GNSS_Callbacks.ino

@@ -30,22 +30,17 @@ void pushGPGGA(NMEA_GGA_data_t nmeaData)
 //        |                 |              |
 void printPVTdata(UBX_NAV_PVT_data_t ubxDataStruct)
 {
-  long latitude = ubxDataStruct.lat; // Print the latitude
+  double latitude = ubxDataStruct.lat; // Print the latitude
   Serial.print(F("Lat: "));
-  Serial.print(latitude / 10000000L);
-  Serial.print(F("."));
-  Serial.print(abs(latitude % 10000000L));
+  Serial.print(latitude / 10000000.0, 7);
 
-  long longitude = ubxDataStruct.lon; // Print the longitude
+  double longitude = ubxDataStruct.lon; // Print the longitude
   Serial.print(F("  Long: "));
-  Serial.print(longitude / 10000000L);
-  Serial.print(F("."));
-  Serial.print(abs(longitude % 10000000L));
+  Serial.print(longitude / 10000000.0, 7);
 
-  long altitude = ubxDataStruct.hMSL; // Print the height above mean sea level
+  double altitude = ubxDataStruct.hMSL; // Print the height above mean sea level
   Serial.print(F("  Height: "));
-  Serial.print(altitude);
-  Serial.print(F(" (mm)"));
+  Serial.print(altitude / 1000.0, 3);
 
   uint8_t fixType = ubxDataStruct.fixType; // Print the fix type
   Serial.print(F("  Fix: "));

examples/SARA-R5_Example16_GNSS_NTRIP_Caster__Polling/SARA-R5_NTRIP_Client.ino

@@ -220,22 +220,17 @@ bool checkConnection(int theSocket, bool connectionIsOpen)
   // See if new PVT data is available
   if (myGNSS.getPVT()) // getPVT will return true if fresh data is available
   {
-    long latitude = myGNSS.getLatitude(); // Print the latitude
+    double latitude = (double)myGNSS.getLatitude(); // Print the latitude
     Serial.print(F("checkConnection: Lat: "));
-    Serial.print(latitude / 10000000L);
-    Serial.print(F("."));
-    Serial.print(abs(latitude % 10000000L));
+    Serial.print(latitude / 10000000.0, 7);
 
-    long longitude = myGNSS.getLongitude(); // Print the longitude
+    double longitude = (double)myGNSS.getLongitude(); // Print the longitude
     Serial.print(F("  Long: "));
-    Serial.print(longitude / 10000000L);
-    Serial.print(F("."));
-    Serial.print(abs(longitude % 10000000L));
+    Serial.print(longitude / 10000000.0, 7);
 
-    long altitude = myGNSS.getAltitudeMSL(); // Print the height above mean sea level
+    double altitude = (double)myGNSS.getAltitudeMSL(); // Print the height above mean sea level
     Serial.print(F("  Height: "));
-    Serial.print(altitude);
-    Serial.print(F(" (mm)"));
+    Serial.print(altitude / 1000.0, 3);
 
     uint8_t fixType = myGNSS.getFixType(); // Print the fix type
     Serial.print(F("  Fix: "));

src/SparkFun_u-blox_SARA-R5_Arduino_Library.cpp

@@ -2432,7 +2432,7 @@ SARA_R5_error_t SARA_R5::socketWrite(int socket, const char *str, int len)
   {
     unsigned long writeDelay = millis();
     while (millis() < (writeDelay + 50))
-      delay(1); //uBlox specification says to wait 50ms after receiving "@" to write data.
+      delay(1); //u-blox specification says to wait 50ms after receiving "@" to write data.
 
     if (len == -1)
     {