@@ -481,6 +481,7 @@ void SFE_UBLOX_GPS::process(uint8_t incoming, ubxPacket *incomingUBX, uint8_t re
481481 rollingChecksumB = 0 ;
482482 packetBuf.counter = 0 ; // Reset the packetBuf.counter (again)
483483 packetBuf.valid = SFE_UBLOX_PACKET_VALIDITY_NOT_DEFINED; // Reset the packet validity (redundant?)
484+ packetBuf.startingSpot = incomingUBX->startingSpot ; // Copy the startingSpot
484485 }
485486 else if (ubxFrameCounter == 3 ) // ID
486487 {
@@ -1313,6 +1314,7 @@ sfe_ublox_status_e SFE_UBLOX_GPS::waitForACKResponse(ubxPacket *outgoingUBX, uin
13131314 // If (e.g.) a PVT packet is _being_ received: outgoingUBX->valid will be NOT_DEFINED
13141315 // If (e.g.) a PVT packet _has been_ received: outgoingUBX->valid will be VALID (or just possibly NOT_VALID)
13151316 // So we cannot use outgoingUBX->valid as part of this check.
1317+ // Note: the addition of packetBuf should make this check redundant!
13161318 else if ((outgoingUBX->classAndIDmatch == SFE_UBLOX_PACKET_VALIDITY_VALID)
13171319 && (packetAck.classAndIDmatch == SFE_UBLOX_PACKET_VALIDITY_VALID)
13181320 && !((outgoingUBX->cls != requestedClass)
@@ -1348,6 +1350,7 @@ sfe_ublox_status_e SFE_UBLOX_GPS::waitForACKResponse(ubxPacket *outgoingUBX, uin
13481350 // but outgoingUBX->cls and outgoingUBX->id would not match...
13491351 // So I think this is telling us we need a special state for packetAck.classAndIDmatch to tell us
13501352 // 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.
13511354 else if (packetAck.classAndIDmatch == SFE_UBLOX_PACKET_NOTACKNOWLEDGED)
13521355 {
13531356 if (_printDebug == true )
@@ -1481,6 +1484,7 @@ sfe_ublox_status_e SFE_UBLOX_GPS::waitForNoACKResponse(ubxPacket *outgoingUBX, u
14811484 // If (e.g.) a PVT packet is _being_ received: outgoingUBX->valid will be NOT_DEFINED
14821485 // If (e.g.) a PVT packet _has been_ received: outgoingUBX->valid will be VALID (or just possibly NOT_VALID)
14831486 // So we cannot use outgoingUBX->valid as part of this check.
1487+ // Note: the addition of packetBuf should make this check redundant!
14841488 else if ((outgoingUBX->classAndIDmatch == SFE_UBLOX_PACKET_VALIDITY_VALID)
14851489 && !((outgoingUBX->cls != requestedClass)
14861490 || (outgoingUBX->id != requestedID)))
0 commit comments