Use Michael's lock and unlock hooks

Author: PaulZC

Firmware/RTK_Surveyor/Begin.ino

@@ -577,8 +577,6 @@ void beginGNSS()
   {
     SPI.begin(); // Begin SPI here - beginSD has not yet been called
 
-    theGNSS._enableCheckUbloxLock = true; // Enable simple checkUblox locking
-    
     // setFileBufferSize must be called _before_ .begin
     // Use gnssHandlerBufferSize for now. TODO: work out if the SPI GNSS needs its own buffer size setting
     // Also used by Tasks.ino

Firmware/RTK_Surveyor/RTK_Surveyor.ino

@@ -231,34 +231,32 @@ char neoFirmwareVersion[20]; //Output to system status menu.
 uint8_t zedFirmwareVersionInt = 0; //Controls which features (constellations) can be configured (v1.12 doesn't support SBAS). Note: will fail above 2.55!
 uint8_t zedModuleType = PLATFORM_F9P; //Controls which messages are supported and configured
 
-SFE_UBLOX_GNSS_SUPER theGNSS;
-
-//// Use Michael's lock/unlock methods to prevent the UART2 task from calling checkUblox during a sendCommand and waitForResponse.
-//// Also prevents pushRawData from being called too.
-//class SFE_UBLOX_GNSS_SUPER_DERIVED : public SFE_UBLOX_GNSS_SUPER
-//{
-//public:
-//  volatile bool _iAmLocked = false;
-//  bool lock(void)
-//  {
-//    if (_iAmLocked)
-//    {
-//      unsigned long startTime = millis();
-//      while (_iAmLocked && (millis() < (startTime + 2200)))
-//        delay(1); // YIELD
-//      if (_iAmLocked)
-//        return false;
-//    }
-//    _iAmLocked = true;
-//    return true;
-//  }
-//  void unlock(void)
-//  {
-//    _iAmLocked = false;  
-//  }
-//};
-//
-//SFE_UBLOX_GNSS_SUPER_DERIVED theGNSS;
+// Use Michael's lock/unlock methods to prevent the UART2 task from calling checkUblox during a sendCommand and waitForResponse.
+// Also prevents pushRawData from being called too.
+class SFE_UBLOX_GNSS_SUPER_DERIVED : public SFE_UBLOX_GNSS_SUPER
+{
+public:
+  volatile bool _iAmLocked = false;
+  bool lock(void)
+  {
+    if (_iAmLocked)
+    {
+      unsigned long startTime = millis();
+      while (_iAmLocked && (millis() < (startTime + 2100)))
+        delay(1); // YIELD
+      if (_iAmLocked)
+        return false;
+    }
+    _iAmLocked = true;
+    return true;
+  }
+  void unlock(void)
+  {
+    _iAmLocked = false;  
+  }
+};
+
+SFE_UBLOX_GNSS_SUPER_DERIVED theGNSS;
 
 //These globals are updated regularly via the storePVTdata callback
 bool pvtUpdated = false;