Enable logging during base. Trim display for reset count.

Author: nseidle

Firmware/RTK_Surveyor/Base.ino

@@ -41,7 +41,7 @@ bool configureUbloxModuleBase()
   getPortSettings(COM_PORT_I2C); //Load the settingPayload with this port's settings
   if (settingPayload[OUTPUT_SETTING] != (COM_TYPE_UBX | COM_TYPE_NMEA | COM_TYPE_RTCM3))
     response &= i2cGNSS.setPortOutput(COM_PORT_I2C, COM_TYPE_UBX | COM_TYPE_NMEA | COM_TYPE_RTCM3); //Set the I2C port to output UBX (config), and RTCM3 (casting)
-  //response &= i2cGNSS.setPortOutput(COM_PORT_I2C, COM_TYPE_UBX | COM_TYPE_RTCM3); //Not a valid state. Goes to UBX+NMEA+RTCM3 - 
+  //response &= i2cGNSS.setPortOutput(COM_PORT_I2C, COM_TYPE_UBX | COM_TYPE_RTCM3); //Not a valid state. Goes to UBX+NMEA+RTCM3 -
 
   //In base mode the Surveyor should output RTCM over UART2 and I2C ports:
   //(Primary) UART2 in case the Surveyor is connected via radio to rover
@@ -99,10 +99,10 @@ bool beginSurveyIn()
   //Wait until active becomes true
   long maxTime = 5000;
   long startTime = millis();
-  while(i2cGNSS.getSurveyInActive(100) == false)
+  while (i2cGNSS.getSurveyInActive(100) == false)
   {
     delay(100);
-    if(millis() - startTime > maxTime) return(false); //Reset of survey failed
+    if (millis() - startTime > maxTime) return (false); //Reset of survey failed
   }
 
   return (true);
@@ -119,19 +119,19 @@ bool resetSurvey()
   delay(1000);
   response &= i2cGNSS.disableSurveyMode(maxWait); //Disable survey
 
-  if(response == false)
-    return(response);
+  if (response == false)
+    return (response);
 
   //Wait until active and valid becomes false
   long maxTime = 5000;
   long startTime = millis();
-  while(i2cGNSS.getSurveyInActive(100) == true || i2cGNSS.getSurveyInValid(100) == true)
+  while (i2cGNSS.getSurveyInActive(100) == true || i2cGNSS.getSurveyInValid(100) == true)
   {
     delay(100);
-    if(millis() - startTime > maxTime) return(false); //Reset of survey failed
+    if (millis() - startTime > maxTime) return (false); //Reset of survey failed
   }
 
-  return(true);
+  return (true);
 }
 
 //Start the base using fixed coordinates
@@ -212,7 +212,11 @@ void SFE_UBLOX_GNSS::processRTCM(uint8_t incoming)
   }
 
   //Check for too many digits
-  if (logIncreasing == true)
+  if (settings.enableResetDisplay == true)
+  {
+    if (rtcmPacketsSent > 99) rtcmPacketsSent = 1; //Trim to two digits to avoid overlap
+  }
+  else if (logIncreasing == true)
   {
     if (rtcmPacketsSent > 999) rtcmPacketsSent = 1; //Trim to three digits to avoid log icon
   }

Firmware/RTK_Surveyor/Display.ino

@@ -445,12 +445,7 @@ void paintSIV()
       oled.print(i2cGNSS.getSIV());
     }
 
-    if (settings.enableResetDisplay == true)
-    {
-      oled.setFontType(0); //Small font
-      oled.setCursor(16 + (8 * 3) + 6, 38); //x, y
-      oled.print(settings.resetCount);
-    }
+    paintResets();
   }
 }
 
@@ -646,6 +641,8 @@ void paintBaseTempTransmitting()
     oled.setFontType(1); //Set font to type 1: 8x16
     oled.print(rtcmPacketsSent); //rtcmPacketsSent is controlled in processRTCM()
 
+    paintResets();
+
     paintLogging();
   }
 }
@@ -680,6 +677,8 @@ void paintBaseTempWiFiStarted()
     oled.setFontType(1); //Set font to type 1: 8x16
     oled.print(rtcmPacketsSent); //rtcmPacketsSent is controlled in processRTCM()
 
+    paintResets();
+
     paintLogging();
   }
 }
@@ -715,6 +714,8 @@ void paintBaseTempWiFiConnected()
     oled.setFontType(1); //Set font to type 1: 8x16
     oled.print(rtcmPacketsSent); //rtcmPacketsSent is controlled in processRTCM()
 
+    paintResets();
+
     paintLogging();
   }
 }
@@ -776,6 +777,8 @@ void paintBaseTempCasterConnected()
     oled.setFontType(1); //Set font to type 1: 8x16
     oled.print(rtcmPacketsSent); //rtcmPacketsSent is controlled in processRTCM()
 
+    paintResets();
+
     paintLogging();
   }
 }
@@ -822,6 +825,8 @@ void paintBaseFixedTransmitting()
     oled.setFontType(1); //Set font to type 1: 8x16
     oled.print(rtcmPacketsSent); //rtcmPacketsSent is controlled in processRTCM()
 
+    paintResets();
+
     paintLogging();
   }
 }
@@ -856,6 +861,8 @@ void paintBaseFixedWiFiStarted()
     oled.setFontType(1); //Set font to type 1: 8x16
     oled.print(rtcmPacketsSent); //rtcmPacketsSent is controlled in processRTCM()
 
+    paintResets();
+
     paintLogging();
   }
 }
@@ -891,6 +898,8 @@ void paintBaseFixedWiFiConnected()
     oled.setFontType(1); //Set font to type 1: 8x16
     oled.print(rtcmPacketsSent); //rtcmPacketsSent is controlled in processRTCM()
 
+    paintResets();
+
     paintLogging();
   }
 }
@@ -952,6 +961,8 @@ void paintBaseFixedCasterConnected()
     oled.setFontType(1); //Set font to type 1: 8x16
     oled.print(rtcmPacketsSent); //rtcmPacketsSent is controlled in processRTCM()
 
+    paintResets();
+
     paintLogging();
   }
 }
@@ -1558,3 +1569,16 @@ void displayMessage(const char* message, uint16_t displayTime)
     delay(displayTime);
   }
 }
+
+void paintResets()
+{
+  if (online.display == true)
+  {
+    if (settings.enableResetDisplay == true)
+    {
+      oled.setFontType(0); //Small font
+      oled.setCursor(16 + (8 * 3) + 6, 38); //x, y
+      oled.print(settings.resetCount);
+    }
+  }
+}

Firmware/RTK_Surveyor/States.ino

@@ -124,6 +124,7 @@ void updateSystemState()
           //Stop all WiFi and BT. Re-enable in each specific base start state.
           stopWiFi();
           stopBluetooth();
+          startUART2Tasks(); //Start monitoring the UART1 from ZED for NMEA and UBX data (enables logging)
 
           if (configureUbloxModuleBase() == true)
           {