Change internal checkUblox to checkUbloxInternal

Author: PaulZC

src/u-blox_GNSS.cpp

@@ -4621,6 +4621,8 @@ void DevUBLOXGNSS::addToChecksum(uint8_t incoming)
 // Given a packet and payload, send everything including CRC bytes via I2C port
 sfe_ublox_status_e DevUBLOXGNSS::sendCommand(ubxPacket *outgoingUBX, uint16_t maxWait, bool expectACKonly)
 {
+  if (!lock()) return SFE_UBLOX_STATUS_FAIL;
+
   sfe_ublox_status_e retVal = SFE_UBLOX_STATUS_SUCCESS;
 
   calcChecksum(outgoingUBX); // Sets checksum A and B bytes of the packet
@@ -4633,7 +4635,6 @@ sfe_ublox_status_e DevUBLOXGNSS::sendCommand(ubxPacket *outgoingUBX, uint16_t ma
   }
 #endif
 
-  if (!lock()) return SFE_UBLOX_STATUS_FAIL;
   if (_commType == COMM_TYPE_I2C)
   {
     retVal = sendI2cCommand(outgoingUBX);
@@ -4656,6 +4657,7 @@ sfe_ublox_status_e DevUBLOXGNSS::sendCommand(ubxPacket *outgoingUBX, uint16_t ma
   {
     sendSpiCommand(outgoingUBX);
   }
+  
   unlock();
 
   if (maxWait > 0)
@@ -6050,7 +6052,7 @@ size_t DevUBLOXGNSS::pushAssistNowDataInternal(size_t offset, bool skipTime, con
           bool keepGoing = true;
           while (keepGoing && (millis() < (startTime + maxWait))) // Keep checking for the ACK until we time out
           {
-            checkUblox();
+            checkUbloxInternal(&packetCfg, UBX_CLASS_MGA, UBX_MGA_ACK_DATA0); // Was checkUblox();
             if (packetUBXMGAACK->head != packetUBXMGAACK->tail) // Does the MGA ACK ringbuffer contain any ACK's?
             {
               bool dataAckd = true;                                                                                        // Check if we've received the correct ACK
@@ -6573,7 +6575,7 @@ size_t DevUBLOXGNSS::readNavigationDatabase(uint8_t *dataBytes, size_t maxNumDat
 
   while (keepGoing && (millis() < (startTime + maxWait)))
   {
-    checkUblox();
+    checkUbloxInternal(&packetCfg, UBX_CLASS_MGA, UBX_MGA_ACK_DATA0); // Was checkUblox();
 
     while (packetUBXMGADBD->head != packetUBXMGADBD->tail) // Does the MGA DBD ringbuffer contain any data?
     {

src/u-blox_GNSS.h

@@ -140,6 +140,7 @@ class DevUBLOXGNSS
   // the idea is that in a RTOS you override this class and the two functions in which you take and give a mutex.
   virtual bool lock(void) { return true; }
   virtual void unlock(void) { }
+
 public:
   void connectedToUART2(bool connected = true) { _UART2 = connected; }
 
@@ -1377,8 +1378,8 @@ class DevUBLOXGNSS
   SparkFun_UBLOX_GNSS::SfePrint _ubxOutputPort;  // The user can assign an output port to print UBX sentences if they wish
   SparkFun_UBLOX_GNSS::SfePrint _outputPort;     // The user can assign an output port to print ALL characters to if they wish
   SparkFun_UBLOX_GNSS::SfePrint _debugSerial;    // The stream to send debug messages to if enabled
-  bool _printDebug = false;                       // Flag to print the serial commands we are sending to the Serial port for debug
-  bool _printLimitedDebug = false;                // Flag to print limited debug messages. Useful for I2C debugging or high navigation rates
+  bool _printDebug = false;                      // Flag to print the serial commands we are sending to the Serial port for debug
+  bool _printLimitedDebug = false;               // Flag to print limited debug messages. Useful for I2C debugging or high navigation rates
 
   // The packet buffers
   // These are pointed at from within the ubxPacket