@@ -481,6 +481,7 @@ void SFE_UBLOX_GPS::process(uint8_t incoming, ubxPacket *incomingUBX, uint8_t re
481
481
rollingChecksumB = 0 ;
482
482
packetBuf.counter = 0 ; // Reset the packetBuf.counter (again)
483
483
packetBuf.valid = SFE_UBLOX_PACKET_VALIDITY_NOT_DEFINED; // Reset the packet validity (redundant?)
484
+ packetBuf.startingSpot = incomingUBX->startingSpot ; // Copy the startingSpot
484
485
}
485
486
else if (ubxFrameCounter == 3 ) // ID
486
487
{
@@ -1313,6 +1314,7 @@ sfe_ublox_status_e SFE_UBLOX_GPS::waitForACKResponse(ubxPacket *outgoingUBX, uin
1313
1314
// If (e.g.) a PVT packet is _being_ received: outgoingUBX->valid will be NOT_DEFINED
1314
1315
// If (e.g.) a PVT packet _has been_ received: outgoingUBX->valid will be VALID (or just possibly NOT_VALID)
1315
1316
// So we cannot use outgoingUBX->valid as part of this check.
1317
+ // Note: the addition of packetBuf should make this check redundant!
1316
1318
else if ((outgoingUBX->classAndIDmatch == SFE_UBLOX_PACKET_VALIDITY_VALID)
1317
1319
&& (packetAck.classAndIDmatch == SFE_UBLOX_PACKET_VALIDITY_VALID)
1318
1320
&& !((outgoingUBX->cls != requestedClass)
@@ -1348,6 +1350,7 @@ sfe_ublox_status_e SFE_UBLOX_GPS::waitForACKResponse(ubxPacket *outgoingUBX, uin
1348
1350
// but outgoingUBX->cls and outgoingUBX->id would not match...
1349
1351
// So I think this is telling us we need a special state for packetAck.classAndIDmatch to tell us
1350
1352
// the packet was definitely NACK'd otherwise we are possibly just guessing...
1353
+ // Note: the addition of packetBuf changes the logic of this, but we'll leave the code as is for now.
1351
1354
else if (packetAck.classAndIDmatch == SFE_UBLOX_PACKET_NOTACKNOWLEDGED)
1352
1355
{
1353
1356
if (_printDebug == true )
@@ -1481,6 +1484,7 @@ sfe_ublox_status_e SFE_UBLOX_GPS::waitForNoACKResponse(ubxPacket *outgoingUBX, u
1481
1484
// If (e.g.) a PVT packet is _being_ received: outgoingUBX->valid will be NOT_DEFINED
1482
1485
// If (e.g.) a PVT packet _has been_ received: outgoingUBX->valid will be VALID (or just possibly NOT_VALID)
1483
1486
// So we cannot use outgoingUBX->valid as part of this check.
1487
+ // Note: the addition of packetBuf should make this check redundant!
1484
1488
else if ((outgoingUBX->classAndIDmatch == SFE_UBLOX_PACKET_VALIDITY_VALID)
1485
1489
&& !((outgoingUBX->cls != requestedClass)
1486
1490
|| (outgoingUBX->id != requestedID)))
0 commit comments