Merge pull request #229 from LeeLeahy2/uptime

Display the uptime in the system menu

Author: nseidle

Firmware/RTK_Surveyor/RTK_Surveyor.ino

@@ -45,6 +45,10 @@ const int FIRMWARE_VERSION_MINOR = 3;
 #define IDLE_COUNT_PER_SECOND       196289
 #define IDLE_TIME_DISPLAY_SECONDS   5
 #define MAX_IDLE_TIME_COUNT         (IDLE_TIME_DISPLAY_SECONDS * IDLE_COUNT_PER_SECOND)
+#define MILLISECONDS_IN_A_SECOND    1000
+#define MILLISECONDS_IN_A_MINUTE    (60 * MILLISECONDS_IN_A_SECOND)
+#define MILLISECONDS_IN_AN_HOUR     (60 * MILLISECONDS_IN_A_MINUTE)
+#define MILLISECONDS_IN_A_DAY       (24 * MILLISECONDS_IN_AN_HOUR)
 
 //Hardware connections
 //=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
@@ -425,6 +429,9 @@ uint32_t cpuIdleCount[MAX_CPU_CORES];
 TaskHandle_t idleTaskHandle[MAX_CPU_CORES];
 uint32_t cpuLastIdleDisplayTime;
 
+uint64_t uptime;
+uint32_t previousMilliseconds;
+
 //-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
 
 void setup()
@@ -482,6 +489,9 @@ void setup()
 
 void loop()
 {
+  uint32_t delayTime;
+  uint32_t currentMilliseconds;
+
   if (online.gnss == true)
   {
     i2cGNSS.checkUblox(); //Regularly poll to get latest data and any RTCM
@@ -520,6 +530,13 @@ void loop()
   if (settings.enablePrintIdleTime)
     printIdleTimes();
 
+  //Monitor the days in uptime
+  currentMilliseconds = millis();
+  uptime = (uptime & 0xffffffff00000000ull) | currentMilliseconds;
+  if (currentMilliseconds < previousMilliseconds)
+    uptime += 0x100000000ull;
+  previousMilliseconds = currentMilliseconds;
+
   //A small delay prevents panic if no other I2C or functions are called
   delay(10);
 }

Firmware/RTK_Surveyor/menuSystem.ino

@@ -65,7 +65,6 @@ void menuSystem()
     //Display MAC address
     char macAddress[5];
     sprintf(macAddress, "%02X%02X", unitMACAddress[4], unitMACAddress[5]);
-
     Serial.print(F("Bluetooth ("));
     Serial.print(macAddress);
     Serial.print(F("): "));
@@ -103,6 +102,36 @@ void menuSystem()
     }
     Serial.println();
 
+    //Display the uptime
+    uint64_t uptimeMilliseconds = uptime;
+    uint32_t uptimeDays = 0;
+    while (uptimeMilliseconds >= MILLISECONDS_IN_A_DAY) {
+      uptimeMilliseconds -= MILLISECONDS_IN_A_DAY;
+      uptimeDays += 1;
+    }
+    byte uptimeHours = 0;
+    while (uptimeMilliseconds >= MILLISECONDS_IN_AN_HOUR) {
+      uptimeMilliseconds -= MILLISECONDS_IN_AN_HOUR;
+      uptimeHours += 1;
+    }
+    byte uptimeMinutes = 0;
+    while (uptimeMilliseconds >= MILLISECONDS_IN_A_MINUTE) {
+      uptimeMilliseconds -= MILLISECONDS_IN_A_MINUTE;
+      uptimeMinutes += 1;
+    }
+    byte uptimeSeconds = 0;
+    while (uptimeMilliseconds >= MILLISECONDS_IN_A_SECOND) {
+      uptimeMilliseconds -= MILLISECONDS_IN_A_SECOND;
+      uptimeSeconds += 1;
+    }
+    Serial.print(F("Uptime: "));
+    Serial.printf("%d %02d:%02d:%02d.%03ld\r\n",
+                  uptimeDays,
+                  uptimeHours,
+                  uptimeMinutes,
+                  uptimeSeconds,
+                  uptimeMilliseconds);
+
     if (settings.enableSD == true)
     {
       Serial.println(F("f) Display microSD Files"));