Call checkUbloxSerial during serial pushRawData

Author: PaulZC

src/u-blox_GNSS.cpp

@@ -6072,7 +6072,7 @@ void DevUBLOXGNSS::checkCallbacks(void)
 // Push (e.g.) RTCM data directly to the module
 // Returns true if all numDataBytes were pushed successfully
 // Warning: this function does not check that the data is valid. It is the user's responsibility to ensure the data is valid before pushing.
-bool DevUBLOXGNSS::pushRawData(uint8_t *dataBytes, size_t numDataBytes, bool callProcessSpiBuffer)
+bool DevUBLOXGNSS::pushRawData(uint8_t *dataBytes, size_t numDataBytes, bool callProcessBuffer)
 {
   // Return now if numDataBytes is zero
   if (numDataBytes == 0)
@@ -6089,22 +6089,26 @@ bool DevUBLOXGNSS::pushRawData(uint8_t *dataBytes, size_t numDataBytes, bool cal
   bool ok = false;
   if (_commType == COMM_TYPE_SERIAL)
   {
-    // Serial: writeBytes can only write 255 bytes maximum, so we need to divide up into chunks if required
+    // Serial: divide pushes up into 16 byte chunks and call checkUbloxSerial between pushes
+    // (if callProcessBuffer is true) to try and avoid data loss
     ok = true;
     size_t bytesLeftToWrite = numDataBytes;
     while (bytesLeftToWrite > 0)
     {
       uint8_t bytesToWrite;
 
-      if (bytesLeftToWrite < 0x100)
+      if (bytesLeftToWrite < 16)
         bytesToWrite = (uint8_t)bytesLeftToWrite;
       else
-        bytesToWrite = 0xFF;
+        bytesToWrite = 16;
 
       ok &= (writeBytes(dataBytes, bytesToWrite) == bytesToWrite); // Will set ok to false if any one write fails
 
       bytesLeftToWrite -= (size_t)bytesToWrite;
       dataBytes += bytesToWrite;
+
+      if (callProcessBuffer) // Try and prevent data loss during large pushes by calling checkUbloxSerial between chunks
+        checkUbloxSerial(&packetCfg, 0, 0); // Don't call checkUbloxInternal as we already have the lock!
     }
   }
   else if (_commType == COMM_TYPE_I2C)
@@ -6204,7 +6208,7 @@ bool DevUBLOXGNSS::pushRawData(uint8_t *dataBytes, size_t numDataBytes, bool cal
 
       bytesLeftToWrite -= bytesToWrite; // Update the totals
 
-      if (callProcessSpiBuffer)
+      if (callProcessBuffer)
         processSpiBuffer(&packetCfg, 0, 0); // This will hopefully prevent any lost data?
     }
 
@@ -6324,7 +6328,7 @@ size_t DevUBLOXGNSS::pushAssistNowDataInternal(size_t offset, bool skipTime, con
       }
       else
       {
-        bool pushResult = pushRawData((uint8_t *)(dataBytes + dataPtr), packetLength + ((size_t)8), checkForAcks ? false : true); // Push the data. Don't call processSpiBuffer when using ACKs
+        bool pushResult = pushRawData((uint8_t *)(dataBytes + dataPtr), packetLength + ((size_t)8), checkForAcks ? false : true); // Push the data. Don't call processSpiBuffer / checkUbloxSerial when using ACKs
 
         if (pushResult)
           bytesPushed += packetLength + ((size_t)8); // Increment bytesPushed if the push was successful

src/u-blox_GNSS.h

@@ -262,10 +262,14 @@ class DevUBLOXGNSS
   // Push (e.g.) RTCM or Assist Now data directly to the module
   // Warning: this function does not check that the data is valid. It is the user's responsibility to ensure the data is valid before pushing.
   //
-  // For SPI: callProcessSpiBuffer defaults to true and forces pushRawData to call processSpiBuffer in between push transactions.
+  // For SPI: callProcessBuffer defaults to true and forces pushRawData to call processSpiBuffer in between push transactions.
   // This is to try and prevent incoming data being 'lost' during large (bi-directional) pushes.
-  // If you are only pushing limited amounts of data and/or will be calling checkUblox manually, it might be advantageous to set callProcessSpiBuffer to false.
-  bool pushRawData(uint8_t *dataBytes, size_t numDataBytes, bool callProcessSpiBuffer = true);
+  // If you are only pushing limited amounts of data and/or will be calling checkUblox manually, it might be advantageous to set callProcessBuffer to false.
+  //
+  // Likewise for Serial: callProcessBuffer defaults to true and forces pushRawData to call checkUbloxSerial in between pushing data.
+  // This is to try and prevent incoming data being 'lost' (overflowing the serial RX buffer) during a large push.
+  // If you are only pushing limited amounts of data and/or will be calling checkUblox manually, it might be advantageous to set callProcessBuffer to false.
+  bool pushRawData(uint8_t *dataBytes, size_t numDataBytes, bool callProcessBuffer = true);
 #ifndef SFE_UBLOX_DISABLE_RTCM_LOGGING
   // RTCM parsing - used inside pushRawData
 protected: