Use rtcMillis everywhere

Author: PaulZC

Firmware/OpenLog_Artemis/OpenLog_Artemis.ino

@@ -110,10 +110,18 @@
          the SPI lines low, preventing communication with the IMU:  https://github.com/sparkfun/OpenLog_Artemis/issues/104
 
   v2.2:
-    Use Apollo3 v2.2.0 with changes by paulvha to fix Issue 117 (Thank you Paul!)
+    Use Apollo3 v2.1.0 with changes by paulvha to fix Issue 117 (Thank you Paul!)
       https://github.com/sparkfun/OpenLog_Artemis/issues/117#issuecomment-1034973065
+      https://github.com/sparkfun/Arduino_Apollo3/issues/279#issuecomment-710060977
     Also includes Paul's SPI.end fix
       https://github.com/sparkfun/Arduino_Apollo3/issues/442
+      In libraries/SPI/src/SPI.cpp change end() to:
+        void arduino::MbedSPI::end() {
+            if (dev) {
+                delete dev;
+                dev = NULL;
+            }
+        }      
     Use SdFat v2.1.2
     Compensate for missing / not-populated IMU
     Add support for yyyy/mm/dd and ISO 8601 date style (Issue 118)
@@ -486,7 +494,7 @@ void setup() {
 
   //If we are sleeping between readings then we cannot rely on millis() as it is powered down
   //Use RTC instead
-  measurementStartTime = bestMillis();
+  measurementStartTime = rtcMillis();
 
   digitalWrite(PIN_STAT_LED, LOW); // Turn the STAT LED off now that everything is configured
 
@@ -553,12 +561,12 @@ void loop() {
 
       //If we are sleeping between readings then we cannot rely on millis() as it is powered down
       //Use RTC instead
-      lastSeriaLogSyncTime = bestMillis(); //Reset the last sync time to now
+      lastSeriaLogSyncTime = rtcMillis(); //Reset the last sync time to now
       newSerialData = true;
     }
     else if (newSerialData == true)
     {
-      if ((bestMillis() - lastSeriaLogSyncTime) > MAX_IDLE_TIME_MSEC) //If we haven't received any characters recently then sync log file
+      if ((rtcMillis() - lastSeriaLogSyncTime) > MAX_IDLE_TIME_MSEC) //If we haven't received any characters recently then sync log file
       {
         if (incomingBufferSpot > 0)
         {
@@ -574,7 +582,7 @@ void loop() {
         }
 
         newSerialData = false;
-        lastSeriaLogSyncTime = bestMillis(); //Reset the last sync time to now
+        lastSeriaLogSyncTime = rtcMillis(); //Reset the last sync time to now
         printDebug("Total chars received: " + (String)charsReceived + "\r\n");
       }
     }
@@ -666,9 +674,9 @@ void loop() {
       }
 
       //Force sync every 500ms
-      if (bestMillis() - lastDataLogSyncTime > 500)
+      if (rtcMillis() - lastDataLogSyncTime > 500)
       {
-        lastDataLogSyncTime = bestMillis();
+        lastDataLogSyncTime = rtcMillis();
         sensorDataFile.sync();
         if (settings.frequentFileAccessTimestamps == true)
           updateDataFileAccess(&sensorDataFile); // Update the file access time & date
@@ -725,7 +733,7 @@ void loop() {
     {
       // Check if we have been awake long enough (millis is reset to zero when waking from sleep)
       // goToSleep will automatically compensate for how long we have been awake
-      if ((bestMillis() - lastAwakeTimeMillis) < settings.minimumAwakeTimeMillis)
+      if ((rtcMillis() - lastAwakeTimeMillis) < settings.minimumAwakeTimeMillis)
         return; // Too early to sleep - leave sleepAfterRead set true
     }
 

Firmware/OpenLog_Artemis/Sensors.ino

@@ -188,7 +188,7 @@ void getData()
 
     //If we are sleeping between readings then we cannot rely on millis() as it is powered down
     //Use RTC instead
-    currentMillis = bestMillis();
+    currentMillis = rtcMillis();
     float actualRate;
     if ((currentMillis - measurementStartTime) < 1) // Avoid divide by zero
       actualRate = 0.0;

Firmware/OpenLog_Artemis/lowerPower.ino

@@ -562,11 +562,13 @@ void waitForQwiicBusPowerDelay() // Wait while the qwiic devices power up
   //Depending on what hardware is configured, the Qwiic bus may have only been turned on a few ms ago
   //Give sensors, specifically those with a low I2C address, time to turn on
   // If we're not using the SD card, everything will have happened much quicker than usual.
-  uint64_t qwiicPowerHasBeenOnFor = bestMillis() - qwiicPowerOnTime;
-  if (qwiicPowerHasBeenOnFor < qwiicPowerOnDelayMillis)
+  uint64_t qwiicPowerHasBeenOnFor = rtcMillis() - qwiicPowerOnTime;
+  printDebug("waitForQwiicBusPowerDelay: qwiicPowerHasBeenOnFor " + (String)((unsigned long)qwiicPowerHasBeenOnFor) + "ms\r\n");
+  if (qwiicPowerHasBeenOnFor < (uint64_t)qwiicPowerOnDelayMillis)
   {
-    unsigned long delayFor = qwiicPowerOnDelayMillis - qwiicPowerHasBeenOnFor;
-    for (unsigned long i = 0; i < delayFor; i++)
+    uint64_t delayFor = (uint64_t)qwiicPowerOnDelayMillis - qwiicPowerHasBeenOnFor;
+    printDebug("waitForQwiicBusPowerDelay: delaying for " + (String)((unsigned long)delayFor) + "\r\n");
+    for (uint64_t i = 0; i < delayFor; i++)
     {
       checkBattery();
       delay(1);
@@ -584,7 +586,7 @@ void qwiicPowerOn()
   digitalWrite(PIN_QWIIC_POWER, HIGH);
 #endif
 
-  qwiicPowerOnTime = bestMillis(); //Record this time so we wait enough time before detecting certain sensors
+  qwiicPowerOnTime = rtcMillis(); //Record this time so we wait enough time before detecting certain sensors
 }
 void qwiicPowerOff()
 {

Firmware/OpenLog_Artemis/menuMain.ino

@@ -176,7 +176,7 @@ void menuMain()
   totalCharactersPrinted = 0;
   //If we are sleeping between readings then we cannot rely on millis() as it is powered down
   //Use RTC instead
-  measurementStartTime = bestMillis();
+  measurementStartTime = rtcMillis();
 
   //Edge case: after 10Hz reading, user sets the log rate above 2s mark. We never go to sleep because 
   //takeReading is not true. And since we don't wake up, takeReading never gets set to true.

Firmware/OpenLog_Artemis/support.ino

@@ -90,7 +90,7 @@ uint8_t getByteChoice(int numberOfSeconds, bool updateDZSERIAL)
   if (settings.useTxRxPinsForTerminal == true)
     while (Serial1.available() > 0) Serial1.read(); //Clear buffer
 
-  long startTime = millis();
+  unsigned long startTime = millis();
   byte incoming;
   while (1)
   {
@@ -160,7 +160,7 @@ int64_t getNumber(int numberOfSeconds)
   //Get input from user
   char cleansed[20]; //Good for very large numbers: 123,456,789,012,345,678\0
 
-  long startTime = millis();
+  unsigned long startTime = millis();
   int spot = 0;
   while (spot < 20 - 1) //Leave room for terminating \0
   {
@@ -265,7 +265,7 @@ double getDouble(int numberOfSeconds)
   //Get input from user
   char cleansed[20]; //Good for very large numbers: 123,456,789,012,345,678\0
 
-  long startTime = millis();
+  unsigned long startTime = millis();
   int spot = 0;
   bool dpSeen = false;
   while (spot < 20 - 1) //Leave room for terminating \0