Add RTCM packet counting. Add log icon.

nseidle · nseidle · commit 93ecea18a7e6 · 2021-05-03T15:49:22.000-06:00
We display log icon only when the file sizes are increasing in size. This will hopefully help warn the user when logging has failed.
diff --git a/Firmware/RTK_Surveyor/Base.ino b/Firmware/RTK_Surveyor/Base.ino
@@ -68,15 +68,15 @@ bool surveyIn()
   if (response == false)
   {
     Serial.println(F("Survey start failed"));
-    return(false);
+    return (false);
   }
 
   Serial.printf("Survey started. This will run until %d seconds have passed and less than %0.03f meter accuracy is achieved.\n",
                 settings.observationSeconds,
                 settings.observationPositionAccuracy
                );
 
-  return(true);
+  return (true);
 }
 
 void resetSurvey()
@@ -113,9 +113,9 @@ bool startFixedBase()
     //Units are cm with a high precision extension so -1234.5678 should be called: (-123456, -78)
     //-1280208.308,-4716803.847,4086665.811 is SparkFun HQ so...
     response = i2cGNSS.setStaticPosition(majorEcefX, minorEcefX,
-                                       majorEcefY, minorEcefY,
-                                       majorEcefZ, minorEcefZ
-                                      ); //With high precision 0.1mm parts
+                                         majorEcefY, minorEcefY,
+                                         majorEcefZ, minorEcefZ
+                                        ); //With high precision 0.1mm parts
   }
   else if (settings.fixedBaseCoordinateType == COORD_TYPE_GEOGRAPHIC)
   {
@@ -128,17 +128,17 @@ bool startFixedBase()
     int32_t majorAlt = settings.fixedAltitude * 100;
     int32_t minorAlt = ((settings.fixedAltitude * 100) - majorAlt) * 100;
 
-//    Serial.printf("fixedLat (should be -105.184774720): %0.09f\n", settings.fixedLat);
-//    Serial.printf("major (should be -1051847747): %lld\n", majorLat);
-//    Serial.printf("minor (should be -20): %lld\n", minorLat);
-//
-//    Serial.printf("fixedLong (should be 40.090335429): %0.09f\n", settings.fixedLong);
-//    Serial.printf("major (should be 400903354): %lld\n", majorLong);
-//    Serial.printf("minor (should be 29): %lld\n", minorLong);
-//
-//    Serial.printf("fixedAlt (should be 1560.2284): %0.04f\n", settings.fixedAltitude);
-//    Serial.printf("major (should be 156022): %ld\n", majorAlt);
-//    Serial.printf("minor (should be 84): %ld\n", minorAlt);
+    //    Serial.printf("fixedLat (should be -105.184774720): %0.09f\n", settings.fixedLat);
+    //    Serial.printf("major (should be -1051847747): %lld\n", majorLat);
+    //    Serial.printf("minor (should be -20): %lld\n", minorLat);
+    //
+    //    Serial.printf("fixedLong (should be 40.090335429): %0.09f\n", settings.fixedLong);
+    //    Serial.printf("major (should be 400903354): %lld\n", majorLong);
+    //    Serial.printf("minor (should be 29): %lld\n", minorLong);
+    //
+    //    Serial.printf("fixedAlt (should be 1560.2284): %0.04f\n", settings.fixedAltitude);
+    //    Serial.printf("major (should be 156022): %ld\n", majorAlt);
+    //    Serial.printf("minor (should be 84): %ld\n", minorAlt);
 
     response = i2cGNSS.setStaticPosition(
                  majorLat, minorLat,
@@ -180,7 +180,7 @@ bool updateNtripServer()
         return (false);
       }
 
-      if(Serial.available()) return(false); //User has pressed a key
+      if (Serial.available()) return (false); //User has pressed a key
     }
     Serial.println();
 
@@ -247,7 +247,7 @@ bool updateNtripServer()
         //Reset flags
         lastServerReport_ms = millis();
         lastServerSent_ms = millis();
-        serverBytesSent = 0;
+        casterBytesSent = 0;
       }
     } //End attempt to connect
     else
@@ -273,7 +273,7 @@ bool updateNtripServer()
   if (millis() - lastServerReport_ms > 250)
   {
     lastServerReport_ms = millis();
-    Serial.printf("Total bytes sent to caster: %d\n", serverBytesSent);
+    Serial.printf("Total bytes sent to caster: %d\n", casterBytesSent);
   }
 
   return (true);
@@ -284,10 +284,28 @@ bool updateNtripServer()
 //Useful for passing the RTCM correction data to a radio, Ntrip broadcaster, etc.
 void SFE_UBLOX_GNSS::processRTCM(uint8_t incoming)
 {
+  //Count outgoing packets for display
+  //Assume 1Hz RTCM transmissions
+  if (millis() - lastRTCMPacketSent > 500)
+  {
+    lastRTCMPacketSent = millis();
+    rtcmPacketsSent++;
+  }
+
+  //Check for too many digits
+  if (logIncreasing == true)
+  {
+    if (rtcmPacketsSent > 999) rtcmPacketsSent = 1; //Trim to three digits to avoid logging icon
+  }
+  else
+  {
+    if (rtcmPacketsSent > 9999) rtcmPacketsSent = 1;
+  }
+
   if (caster.connected() == true)
   {
     caster.write(incoming); //Send this byte to socket
-    serverBytesSent++;
+    casterBytesSent++;
     lastServerSent_ms = millis();
   }
 }
diff --git a/Firmware/RTK_Surveyor/Display.ino b/Firmware/RTK_Surveyor/Display.ino
@@ -380,6 +380,19 @@ void paintSIV()
   }
 }
 
+//Draw log icon
+//Turn off icon if  log file gets bigger
+void paintLogging()
+{
+  if (online.display == true)
+  {
+    if (logIncreasing == true)
+    {
+      oled.drawIcon(63 - Logging_Width, 47 - Logging_Height, Logging_Width, Logging_Height, Logging, sizeof(Logging), true); //Draw the icon
+    }
+  }
+}
+
 //Base screen. Display BLE, rover, battery, HorzAcc and SIV
 //Blink SIV until fix
 void paintRoverNoFix()
@@ -395,6 +408,8 @@ void paintRoverNoFix()
     paintHorizontalAccuracy();
 
     paintSIV();
+
+    paintLogging();
   }
 }
 
@@ -412,6 +427,8 @@ void paintRoverFix()
     paintHorizontalAccuracy();
 
     paintSIV();
+
+    paintLogging();
   }
 }
 
@@ -429,6 +446,8 @@ void paintRoverRTKFloat()
     paintHorizontalAccuracy();
 
     paintSIV();
+
+    paintLogging();
   }
 }
 
@@ -445,6 +464,8 @@ void paintRoverRTKFix()
     paintHorizontalAccuracy();
 
     paintSIV();
+
+    paintLogging();
   }
 }
 
@@ -464,6 +485,8 @@ void paintBaseTempSurveyNotStarted()
     paintHorizontalAccuracy(); //2nd line
 
     paintSIV();
+
+    paintLogging();
   }
 }
 
@@ -481,10 +504,6 @@ void paintBaseTempSurveyStarted()
     float meanAccuracy = i2cGNSS.getSurveyInMeanAccuracy(100);
     int elapsedTime = i2cGNSS.getSurveyInObservationTime(100);
 
-    //Stopped. We either need a call back or we accept a 2s update to screen. Something is taking a lot of polling time.
-
-    //  deleteMeElapsedTime++;
-
     oled.setFontType(0);
     oled.setCursor(0, 22); //x, y
     oled.print("Mean:");
@@ -500,6 +519,8 @@ void paintBaseTempSurveyStarted()
     oled.setCursor(30, 36); //x, y
     oled.setFontType(1);
     oled.print(elapsedTime);
+
+    paintLogging();
   }
 }
 
@@ -527,10 +548,9 @@ void paintBaseTempTransmitting()
     oled.setCursor(29, 36); //x, y
     oled.setFontType(1); //Set font to type 1: 8x16
 
-    //Check for too many digits
-    if (rtcmPacketsSent > 9999) rtcmPacketsSent = 1;
-
     oled.print(rtcmPacketsSent); //rtcmPacketsSent is controlled in processRTCM()
+
+    paintLogging();
   }
 }
 
@@ -559,10 +579,9 @@ void paintBaseTempWiFiStarted()
     oled.setCursor(29, 36); //x, y
     oled.setFontType(1); //Set font to type 1: 8x16
 
-    //Check for too many digits
-    if (rtcmPacketsSent > 9999) rtcmPacketsSent = 1;
-
     oled.print(rtcmPacketsSent); //rtcmPacketsSent is controlled in processRTCM()
+
+    paintLogging();
   }
 }
 
@@ -592,10 +611,9 @@ void paintBaseTempWiFiConnected()
     oled.setCursor(29, 36); //x, y
     oled.setFontType(1); //Set font to type 1: 8x16
 
-    //Check for too many digits
-    if (rtcmPacketsSent > 9999) rtcmPacketsSent = 1;
-
     oled.print(rtcmPacketsSent); //rtcmPacketsSent is controlled in processRTCM()
+
+    paintLogging();
   }
 }
 
@@ -651,10 +669,9 @@ void paintBaseTempCasterConnected()
     oled.setCursor(29, 36); //x, y
     oled.setFontType(1); //Set font to type 1: 8x16
 
-    //Check for too many digits
-    if (rtcmPacketsSent > 9999) rtcmPacketsSent = 1;
-
     oled.print(rtcmPacketsSent); //rtcmPacketsSent is controlled in processRTCM()
+
+    paintLogging();
   }
 }
 
@@ -682,10 +699,9 @@ void paintBaseFixedTransmitting()
     oled.setCursor(29, 36); //x, y
     oled.setFontType(1); //Set font to type 1: 8x16
 
-    //Check for too many digits
-    if (rtcmPacketsSent > 9999) rtcmPacketsSent = 1;
-
     oled.print(rtcmPacketsSent); //rtcmPacketsSent is controlled in processRTCM()
+
+    paintLogging();
   }
 }
 
@@ -714,10 +730,9 @@ void paintBaseFixedWiFiStarted()
     oled.setCursor(29, 36); //x, y
     oled.setFontType(1); //Set font to type 1: 8x16
 
-    //Check for too many digits
-    if (rtcmPacketsSent > 9999) rtcmPacketsSent = 1;
-
     oled.print(rtcmPacketsSent); //rtcmPacketsSent is controlled in processRTCM()
+
+    paintLogging();
   }
 }
 
@@ -747,10 +762,9 @@ void paintBaseFixedWiFiConnected()
     oled.setCursor(29, 36); //x, y
     oled.setFontType(1); //Set font to type 1: 8x16
 
-    //Check for too many digits
-    if (rtcmPacketsSent > 9999) rtcmPacketsSent = 1;
-
     oled.print(rtcmPacketsSent); //rtcmPacketsSent is controlled in processRTCM()
+
+    paintLogging();
   }
 }
 
@@ -806,10 +820,9 @@ void paintBaseFixedCasterConnected()
     oled.setCursor(29, 36); //x, y
     oled.setFontType(1); //Set font to type 1: 8x16
 
-    //Check for too many digits
-    if (rtcmPacketsSent > 9999) rtcmPacketsSent = 1;
-
     oled.print(rtcmPacketsSent); //rtcmPacketsSent is controlled in processRTCM()
+
+    paintLogging();
   }
 }
 
diff --git a/Firmware/RTK_Surveyor/RTK_Surveyor.ino b/Firmware/RTK_Surveyor/RTK_Surveyor.ino
@@ -116,7 +116,8 @@ unsigned long lastServerSent_ms = 0; //Time of last data pushed to caster
 unsigned long lastServerReport_ms = 0; //Time of last report of caster bytes sent
 int maxTimeBeforeHangup_ms = 10000; //If we fail to get a complete RTCM frame after 10s, then disconnect from caster
 
-uint32_t serverBytesSent = 0; //Just a running total
+uint32_t casterBytesSent = 0; //Just a running total
+uint32_t casterResponseWaitStartTime = 0; //Used to detect if caster service times out
 //=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
 
 //GNSS configuration
@@ -229,14 +230,15 @@ bool satelliteDishIconDisplayed = false; //Toggles as lastSatelliteDishIconUpdat
 uint32_t lastCrosshairIconUpdate = 0;
 bool crosshairIconDisplayed = false; //Toggles as lastCrosshairIconUpdate goes above 1000ms
 uint32_t lastBaseIconUpdate = 0;
-bool baseIconDisplayed = false; //Toggles as lastSatelliteDishIconUpdate goes above 1000ms
+bool baseIconDisplayed = false; //Toggles as lastBaseIconUpdate goes above 1000ms
 uint32_t lastWifiIconUpdate = 0;
 bool wifiIconDisplayed = false; //Toggles as lastWifiIconUpdate goes above 1000ms
 
-uint32_t lastRTCMPacketSent = 0; //Used to count RTCM packets sent during base mode
-uint32_t rtcmPacketsSent = 0; //Used to count RTCM packets sent during base mode
+uint32_t lastLogSize = 0;
+bool logIncreasing = false; //Goes true when log file is greater than lastLogSize
 
-uint32_t casterResponseWaitStartTime = 0; //Used to detect if caster service times out
+uint32_t lastRTCMPacketSent = 0; //Used to count RTCM packets sent during base mode
+uint32_t rtcmPacketsSent = 0; //Used to count RTCM packets sent via processRTCM()
 
 uint32_t maxSurveyInWait_s = 60L * 15L; //Re-start survey-in after X seconds
 
@@ -383,6 +385,15 @@ void updateLogs()
                       (systemTime_minutes - startLogTime_minutes));
 
       Serial.println();
+
+      //Update for display
+      if (ubxFile.fileSize() > lastLogSize)
+      {
+        lastLogSize = ubxFile.fileSize();
+        logIncreasing = true;
+      }
+      else
+        logIncreasing = false;
     }
   }
 }
diff --git a/Firmware/RTK_Surveyor/States.ino b/Firmware/RTK_Surveyor/States.ino
@@ -253,7 +253,7 @@ void updateSystemState()
               //Reset flags
               lastServerReport_ms = millis();
               lastServerSent_ms = millis();
-              serverBytesSent = 0;
+              casterBytesSent = 0;
 
               changeState(STATE_BASE_TEMP_CASTER_CONNECTED);
             }
@@ -385,7 +385,7 @@ void updateSystemState()
               //Reset flags
               lastServerReport_ms = millis();
               lastServerSent_ms = millis();
-              serverBytesSent = 0;
+              casterBytesSent = 0;
 
               changeState(STATE_BASE_FIXED_CASTER_CONNECTED);
             }
diff --git a/Firmware/RTK_Surveyor/icons.h b/Firmware/RTK_Surveyor/icons.h
@@ -93,3 +93,10 @@ uint8_t Battery_0 [] = {
 };
 int Battery_0_Height = 12;
 int Battery_0_Width = 19;
+
+uint8_t Logging [] = {
+0xFF, 0x01, 0x51, 0x51, 0x51, 0x51, 0x53, 0x06, 0xFC, 0x0F, 0x08, 0x09, 0x09, 0x09, 0x09, 0x09,
+0x08, 0x0F, 
+};
+int Logging_Height = 12;
+int Logging_Width = 9;

Original file line number	Diff line number	Diff line change
`@@ -380,6 +380,19 @@ void paintSIV()`
`380`	`380`	`}`
`381`	`381`	`}`
`382`	`382`
	`383`	`+//Draw log icon`
	`384`	`+//Turn off icon if log file gets bigger`
	`385`	`+void paintLogging()`
	`386`	`+{`
	`387`	`+ if (online.display == true)`
	`388`	`+ {`
	`389`	`+ if (logIncreasing == true)`
	`390`	`+ {`
	`391`	`+ oled.drawIcon(63 - Logging_Width, 47 - Logging_Height, Logging_Width, Logging_Height, Logging, sizeof(Logging), true); //Draw the icon`
	`392`	`+ }`
	`393`	`+ }`
	`394`	`+}`
	`395`	`+`
`383`	`396`	`//Base screen. Display BLE, rover, battery, HorzAcc and SIV`
`384`	`397`	`//Blink SIV until fix`
`385`	`398`	`void paintRoverNoFix()`
`@@ -395,6 +408,8 @@ void paintRoverNoFix()`
`395`	`408`	`paintHorizontalAccuracy();`
`396`	`409`
`397`	`410`	`paintSIV();`
	`411`	`+`
	`412`	`+ paintLogging();`
`398`	`413`	`}`
`399`	`414`	`}`
`400`	`415`
`@@ -412,6 +427,8 @@ void paintRoverFix()`
`412`	`427`	`paintHorizontalAccuracy();`
`413`	`428`
`414`	`429`	`paintSIV();`
	`430`	`+`
	`431`	`+ paintLogging();`
`415`	`432`	`}`
`416`	`433`	`}`
`417`	`434`
`@@ -429,6 +446,8 @@ void paintRoverRTKFloat()`
`429`	`446`	`paintHorizontalAccuracy();`
`430`	`447`
`431`	`448`	`paintSIV();`
	`449`	`+`
	`450`	`+ paintLogging();`
`432`	`451`	`}`
`433`	`452`	`}`
`434`	`453`
`@@ -445,6 +464,8 @@ void paintRoverRTKFix()`
`445`	`464`	`paintHorizontalAccuracy();`
`446`	`465`
`447`	`466`	`paintSIV();`
	`467`	`+`
	`468`	`+ paintLogging();`
`448`	`469`	`}`
`449`	`470`	`}`
`450`	`471`
`@@ -464,6 +485,8 @@ void paintBaseTempSurveyNotStarted()`
`464`	`485`	`paintHorizontalAccuracy(); //2nd line`
`465`	`486`
`466`	`487`	`paintSIV();`
	`488`	`+`
	`489`	`+ paintLogging();`
`467`	`490`	`}`
`468`	`491`	`}`
`469`	`492`
`@@ -481,10 +504,6 @@ void paintBaseTempSurveyStarted()`
`481`	`504`	`float meanAccuracy = i2cGNSS.getSurveyInMeanAccuracy(100);`
`482`	`505`	`int elapsedTime = i2cGNSS.getSurveyInObservationTime(100);`
`483`	`506`
`484`		`- //Stopped. We either need a call back or we accept a 2s update to screen. Something is taking a lot of polling time.`
`485`		`-`
`486`		`- // deleteMeElapsedTime++;`
`487`		`-`
`488`	`507`	`oled.setFontType(0);`
`489`	`508`	`oled.setCursor(0, 22); //x, y`
`490`	`509`	`oled.print("Mean:");`
`@@ -500,6 +519,8 @@ void paintBaseTempSurveyStarted()`
`500`	`519`	`oled.setCursor(30, 36); //x, y`
`501`	`520`	`oled.setFontType(1);`
`502`	`521`	`oled.print(elapsedTime);`
	`522`	`+`
	`523`	`+ paintLogging();`
`503`	`524`	`}`
`504`	`525`	`}`
`505`	`526`
`@@ -527,10 +548,9 @@ void paintBaseTempTransmitting()`
`527`	`548`	`oled.setCursor(29, 36); //x, y`
`528`	`549`	`oled.setFontType(1); //Set font to type 1: 8x16`
`529`	`550`
`530`		`- //Check for too many digits`
`531`		`- if (rtcmPacketsSent > 9999) rtcmPacketsSent = 1;`
`532`		`-`
`533`	`551`	`oled.print(rtcmPacketsSent); //rtcmPacketsSent is controlled in processRTCM()`
	`552`	`+`
	`553`	`+ paintLogging();`
`534`	`554`	`}`
`535`	`555`	`}`
`536`	`556`
`@@ -559,10 +579,9 @@ void paintBaseTempWiFiStarted()`
`559`	`579`	`oled.setCursor(29, 36); //x, y`
`560`	`580`	`oled.setFontType(1); //Set font to type 1: 8x16`
`561`	`581`
`562`		`- //Check for too many digits`
`563`		`- if (rtcmPacketsSent > 9999) rtcmPacketsSent = 1;`
`564`		`-`
`565`	`582`	`oled.print(rtcmPacketsSent); //rtcmPacketsSent is controlled in processRTCM()`
	`583`	`+`
	`584`	`+ paintLogging();`
`566`	`585`	`}`
`567`	`586`	`}`
`568`	`587`
`@@ -592,10 +611,9 @@ void paintBaseTempWiFiConnected()`
`592`	`611`	`oled.setCursor(29, 36); //x, y`
`593`	`612`	`oled.setFontType(1); //Set font to type 1: 8x16`
`594`	`613`
`595`		`- //Check for too many digits`
`596`		`- if (rtcmPacketsSent > 9999) rtcmPacketsSent = 1;`
`597`		`-`
`598`	`614`	`oled.print(rtcmPacketsSent); //rtcmPacketsSent is controlled in processRTCM()`
	`615`	`+`
	`616`	`+ paintLogging();`
`599`	`617`	`}`
`600`	`618`	`}`
`601`	`619`
`@@ -651,10 +669,9 @@ void paintBaseTempCasterConnected()`
`651`	`669`	`oled.setCursor(29, 36); //x, y`
`652`	`670`	`oled.setFontType(1); //Set font to type 1: 8x16`
`653`	`671`
`654`		`- //Check for too many digits`
`655`		`- if (rtcmPacketsSent > 9999) rtcmPacketsSent = 1;`
`656`		`-`
`657`	`672`	`oled.print(rtcmPacketsSent); //rtcmPacketsSent is controlled in processRTCM()`
	`673`	`+`
	`674`	`+ paintLogging();`
`658`	`675`	`}`
`659`	`676`	`}`
`660`	`677`
`@@ -682,10 +699,9 @@ void paintBaseFixedTransmitting()`
`682`	`699`	`oled.setCursor(29, 36); //x, y`
`683`	`700`	`oled.setFontType(1); //Set font to type 1: 8x16`
`684`	`701`
`685`		`- //Check for too many digits`
`686`		`- if (rtcmPacketsSent > 9999) rtcmPacketsSent = 1;`
`687`		`-`
`688`	`702`	`oled.print(rtcmPacketsSent); //rtcmPacketsSent is controlled in processRTCM()`
	`703`	`+`
	`704`	`+ paintLogging();`
`689`	`705`	`}`
`690`	`706`	`}`
`691`	`707`
`@@ -714,10 +730,9 @@ void paintBaseFixedWiFiStarted()`
`714`	`730`	`oled.setCursor(29, 36); //x, y`
`715`	`731`	`oled.setFontType(1); //Set font to type 1: 8x16`
`716`	`732`
`717`		`- //Check for too many digits`
`718`		`- if (rtcmPacketsSent > 9999) rtcmPacketsSent = 1;`
`719`		`-`
`720`	`733`	`oled.print(rtcmPacketsSent); //rtcmPacketsSent is controlled in processRTCM()`
	`734`	`+`
	`735`	`+ paintLogging();`
`721`	`736`	`}`
`722`	`737`	`}`
`723`	`738`
`@@ -747,10 +762,9 @@ void paintBaseFixedWiFiConnected()`
`747`	`762`	`oled.setCursor(29, 36); //x, y`
`748`	`763`	`oled.setFontType(1); //Set font to type 1: 8x16`
`749`	`764`
`750`		`- //Check for too many digits`
`751`		`- if (rtcmPacketsSent > 9999) rtcmPacketsSent = 1;`
`752`		`-`
`753`	`765`	`oled.print(rtcmPacketsSent); //rtcmPacketsSent is controlled in processRTCM()`
	`766`	`+`
	`767`	`+ paintLogging();`
`754`	`768`	`}`
`755`	`769`	`}`
`756`	`770`
`@@ -806,10 +820,9 @@ void paintBaseFixedCasterConnected()`
`806`	`820`	`oled.setCursor(29, 36); //x, y`
`807`	`821`	`oled.setFontType(1); //Set font to type 1: 8x16`
`808`	`822`
`809`		`- //Check for too many digits`
`810`		`- if (rtcmPacketsSent > 9999) rtcmPacketsSent = 1;`
`811`		`-`
`812`	`823`	`oled.print(rtcmPacketsSent); //rtcmPacketsSent is controlled in processRTCM()`
	`824`	`+`
	`825`	`+ paintLogging();`
`813`	`826`	`}`
`814`	`827`	`}`
`815`	`828`