diff --git a/examples/ZED-F9P/Example13_autoHPPOSLLH_with_Callback/Example13_autoHPPOSLLH_with_Callback.ino b/examples/ZED-F9P/Example13_autoHPPOSLLH_with_Callback/Example13_autoHPPOSLLH_with_Callback.ino index 94a6e75..e93464f 100644 --- a/examples/ZED-F9P/Example13_autoHPPOSLLH_with_Callback/Example13_autoHPPOSLLH_with_Callback.ino +++ b/examples/ZED-F9P/Example13_autoHPPOSLLH_with_Callback/Example13_autoHPPOSLLH_with_Callback.ino @@ -41,27 +41,27 @@ SFE_UBLOX_GNSS myGNSS; // | / _____ You can use any name you like for the struct // | | / // | | | -void printHPdata(UBX_NAV_HPPOSLLH_data_t ubxDataStruct) +void printHPdata(UBX_NAV_HPPOSLLH_data_t *ubxDataStruct) { Serial.println(); - long highResLatitude = ubxDataStruct.lat; + long highResLatitude = ubxDataStruct->lat; Serial.print(F("Hi Res Lat: ")); Serial.print(highResLatitude); - int highResLatitudeHp = ubxDataStruct.latHp; + int highResLatitudeHp = ubxDataStruct->latHp; Serial.print(F(" ")); Serial.print(highResLatitudeHp); - long highResLongitude = ubxDataStruct.lon; + long highResLongitude = ubxDataStruct->lon; Serial.print(F(" Hi Res Long: ")); Serial.print(highResLongitude); - int highResLongitudeHp = ubxDataStruct.lonHp; + int highResLongitudeHp = ubxDataStruct->lonHp; Serial.print(F(" ")); Serial.print(highResLongitudeHp); - float horizAccuracy = ((float)ubxDataStruct.hAcc) / 10000.0; // Convert hAcc from mm*0.1 to m + float horizAccuracy = ((float)ubxDataStruct->hAcc) / 10000.0; // Convert hAcc from mm*0.1 to m Serial.print(F(" Horiz accuracy: ")); Serial.println(horizAccuracy); } @@ -73,38 +73,38 @@ void printHPdata(UBX_NAV_HPPOSLLH_data_t ubxDataStruct) // | / _____ You can use any name you like for the struct // | | / // | | | -void printPVTdata(UBX_NAV_PVT_data_t ubxDataStruct) +void printPVTdata(UBX_NAV_PVT_data_t *ubxDataStruct) { Serial.println(); Serial.print(F("Time: ")); // Print the time - uint8_t hms = ubxDataStruct.hour; // Print the hours + uint8_t hms = ubxDataStruct->hour; // Print the hours if (hms < 10) Serial.print(F("0")); // Print a leading zero if required Serial.print(hms); Serial.print(F(":")); - hms = ubxDataStruct.min; // Print the minutes + hms = ubxDataStruct->min; // Print the minutes if (hms < 10) Serial.print(F("0")); // Print a leading zero if required Serial.print(hms); Serial.print(F(":")); - hms = ubxDataStruct.sec; // Print the seconds + hms = ubxDataStruct->sec; // Print the seconds if (hms < 10) Serial.print(F("0")); // Print a leading zero if required Serial.print(hms); Serial.print(F(".")); - unsigned long millisecs = ubxDataStruct.iTOW % 1000; // Print the milliseconds + unsigned long millisecs = ubxDataStruct->iTOW % 1000; // Print the milliseconds if (millisecs < 100) Serial.print(F("0")); // Print the trailing zeros correctly if (millisecs < 10) Serial.print(F("0")); Serial.print(millisecs); - long latitude = ubxDataStruct.lat; // Print the latitude + long latitude = ubxDataStruct->lat; // Print the latitude Serial.print(F(" Lat: ")); Serial.print(latitude); - long longitude = ubxDataStruct.lon; // Print the longitude + long longitude = ubxDataStruct->lon; // Print the longitude Serial.print(F(" Long: ")); Serial.print(longitude); Serial.print(F(" (degrees * 10^-7)")); - long altitude = ubxDataStruct.hMSL; // Print the height above mean sea level + long altitude = ubxDataStruct->hMSL; // Print the height above mean sea level Serial.print(F(" Height above MSL: ")); Serial.print(altitude); Serial.println(F(" (mm)")); @@ -135,9 +135,9 @@ void setup() myGNSS.setNavigationFrequency(2); //Produce two solutions per second - myGNSS.setAutoPVTcallback(&printPVTdata); // Enable automatic NAV PVT messages with callback to printPVTdata + myGNSS.setAutoPVTcallbackPtr(&printPVTdata); // Enable automatic NAV PVT messages with callback to printPVTdata - myGNSS.setAutoHPPOSLLHcallback(&printHPdata); // Enable automatic NAV HPPOSLLH messages with callback to printHPdata + myGNSS.setAutoHPPOSLLHcallbackPtr(&printHPdata); // Enable automatic NAV HPPOSLLH messages with callback to printHPdata } void loop() diff --git a/examples/ZED-F9P/Example17_NTRIPClient_With_GGA_Callback/Example17_NTRIPClient_With_GGA_Callback.ino b/examples/ZED-F9P/Example17_NTRIPClient_With_GGA_Callback/Example17_NTRIPClient_With_GGA_Callback.ino index 91751e5..4741b49 100644 --- a/examples/ZED-F9P/Example17_NTRIPClient_With_GGA_Callback/Example17_NTRIPClient_With_GGA_Callback.ino +++ b/examples/ZED-F9P/Example17_NTRIPClient_With_GGA_Callback/Example17_NTRIPClient_With_GGA_Callback.ino @@ -69,16 +69,16 @@ WiFiClient ntripClient; // The WiFi connection to the NTRIP server. This is glob // | / _____ You can use any name you like for the struct // | | / // | | | -void pushGPGGA(NMEA_GGA_data_t nmeaData) +void pushGPGGA(NMEA_GGA_data_t *nmeaData) { //Provide the caster with our current position as needed if ((ntripClient.connected() == true) && (transmitLocation == true)) { Serial.print(F("Pushing GGA to server: ")); - Serial.print((const char *)nmeaData.nmea); // .nmea is printable (NULL-terminated) and already has \r\n on the end + Serial.print((const char *)nmeaData->nmea); // .nmea is printable (NULL-terminated) and already has \r\n on the end //Push our current GGA sentence to caster - ntripClient.print((const char *)nmeaData.nmea); + ntripClient.print((const char *)nmeaData->nmea); } } @@ -91,26 +91,26 @@ void pushGPGGA(NMEA_GGA_data_t nmeaData) // | / _____ You can use any name you like for the struct // | | / // | | | -void printPVTdata(UBX_NAV_PVT_data_t ubxDataStruct) +void printPVTdata(UBX_NAV_PVT_data_t *ubxDataStruct) { - long latitude = ubxDataStruct.lat; // Print the latitude + long latitude = ubxDataStruct->lat; // Print the latitude Serial.print(F("Lat: ")); Serial.print(latitude / 10000000L); Serial.print(F(".")); Serial.print(abs(latitude % 10000000L)); - long longitude = ubxDataStruct.lon; // Print the longitude + long longitude = ubxDataStruct->lon; // Print the longitude Serial.print(F(" Long: ")); Serial.print(longitude / 10000000L); Serial.print(F(".")); Serial.print(abs(longitude % 10000000L)); - long altitude = ubxDataStruct.hMSL; // Print the height above mean sea level + long altitude = ubxDataStruct->hMSL; // Print the height above mean sea level Serial.print(F(" Height: ")); Serial.print(altitude); Serial.print(F(" (mm)")); - uint8_t fixType = ubxDataStruct.fixType; // Print the fix type + uint8_t fixType = ubxDataStruct->fixType; // Print the fix type Serial.print(F(" Fix: ")); Serial.print(fixType); if (fixType == 0) @@ -128,7 +128,7 @@ void printPVTdata(UBX_NAV_PVT_data_t ubxDataStruct) else Serial.print(F(" (UNKNOWN)")); - uint8_t carrSoln = ubxDataStruct.flags.bits.carrSoln; // Print the carrier solution + uint8_t carrSoln = ubxDataStruct->flags.bits.carrSoln; // Print the carrier solution Serial.print(F(" Carrier Solution: ")); Serial.print(carrSoln); if (carrSoln == 0) @@ -140,7 +140,7 @@ void printPVTdata(UBX_NAV_PVT_data_t ubxDataStruct) else Serial.print(F(" (UNKNOWN)")); - uint32_t hAcc = ubxDataStruct.hAcc; // Print the horizontal accuracy estimate + uint32_t hAcc = ubxDataStruct->hAcc; // Print the horizontal accuracy estimate Serial.print(F(" Horizontal Accuracy Estimate: ")); Serial.print(hAcc); Serial.print(F(" (mm)")); @@ -175,11 +175,11 @@ void setup() // Set the Main Talker ID to "GP". The NMEA GGA messages will be GPGGA instead of GNGGA myGNSS.setMainTalkerID(SFE_UBLOX_MAIN_TALKER_ID_GP); - myGNSS.setNMEAGPGGAcallback(&pushGPGGA); // Set up the callback for GPGGA + myGNSS.setNMEAGPGGAcallbackPtr(&pushGPGGA); // Set up the callback for GPGGA myGNSS.enableNMEAMessage(UBX_NMEA_GGA, COM_PORT_I2C, 10); // Tell the module to output GGA every 10 seconds - myGNSS.setAutoPVTcallback(&printPVTdata); // Enable automatic NAV PVT messages with callback to printPVTdata so we can watch the carrier solution go to fixed + myGNSS.setAutoPVTcallbackPtr(&printPVTdata); // Enable automatic NAV PVT messages with callback to printPVTdata so we can watch the carrier solution go to fixed //myGNSS.saveConfiguration(VAL_CFG_SUBSEC_IOPORT | VAL_CFG_SUBSEC_MSGCONF); //Optional: Save the ioPort and message settings to NVM