adafruit-mirror/Adafruit_Wippersnapper_Arduino
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

GPS - Fix pointer in update(), GPSEvent not filled yet

Browse source
This commit is contained in:
brentru 2025-07-08 12:19:05 -04:00
parent c9d9595732
commit 6589b401a3
1 changed files with 12 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/components/gps/controller.cpp
View file

@ -169,7 +169,7 @@ void GPSController::update() {
if (drv->GetDriverType() == GPS_DRV_MTK) { if (drv->GetDriverType() == GPS_DRV_MTK) {
// Interface shouldn't matter here because we already set it up in the // Interface shouldn't matter here because we already set it up in the
// initialization phase, so we can just grab the Adafruit_GPS instance // initialization phase, so we can just grab the Adafruit_GPS instance
Adafruit_GPS *ada_gps = drv->GetAdaGps(); ada_gps = drv->GetAdaGps();
if (ada_gps == nullptr) { if (ada_gps == nullptr) {
WS_DEBUG_PRINTLN( WS_DEBUG_PRINTLN(
"[gps] ERROR: Can't read - GPS instance not initialized!"); "[gps] ERROR: Can't read - GPS instance not initialized!");
@ -215,22 +215,28 @@ void GPSController::update() {
ada_gps->read(); ada_gps->read();
WS_DEBUG_PRINTLN("...OK!"); WS_DEBUG_PRINTLN("...OK!");
} }
} else if (drv->GetIfaceType() == GPS_IFACE_I2C) {
// For I2C, request and discard any stale data from the device
WS_DEBUG_PRINT("[gps] Discarding stale I2C data...");
drv->I2cReadDiscard();
} }
} else if (drv->GetIfaceType() == GPS_IFACE_I2C) {
// For I2C, request and discard any stale data from the device
WS_DEBUG_PRINTLN("[gps] Discarding stale I2C data...");
drv->I2cReadDiscard();
}
// if (drv->GetIfaceType() == GPS_IFACE_UART_HW) {
// Unset the RX flag // Unset the RX flag
WS_DEBUG_PRINTLN("[gps] Unsetting RX flag..."); WS_DEBUG_PRINT("[gps] Unsetting RX flag...");
if (ada_gps->newNMEAreceived()) { if (ada_gps->newNMEAreceived()) {
ada_gps->lastNMEA(); ada_gps->lastNMEA();
} }
WS_DEBUG_PRINT("ok");
// Let's attempt to get a sentence from the GPS module // Let's attempt to get a sentence from the GPS module
// Read from the GPS module for update_rate milliseconds // Read from the GPS module for update_rate milliseconds
WS_DEBUG_PRINT("[gps] GetNmeaUpdateRate...");
ulong update_rate = 1000 / drv->GetNmeaUpdateRate(); ulong update_rate = 1000 / drv->GetNmeaUpdateRate();
ulong start_time = millis(); ulong start_time = millis();
WS_DEBUG_PRINT("ok");
WS_DEBUG_PRINT("[gps] Reading GPS data for "); WS_DEBUG_PRINT("[gps] Reading GPS data for ");
WS_DEBUG_PRINT(update_rate); WS_DEBUG_PRINT(update_rate);
@ -302,6 +308,5 @@ void GPSController::update() {
} }
} }
drv->SetPollPeriodPrv(cur_time); drv->SetPollPeriodPrv(cur_time);
}
} }
} }