Add rtcMillis() calculation. Fix actual read rate output for >2s logging.

Author: nseidle

Firmware/OpenLog_Artemis/OpenLog_Artemis.ino

@@ -17,7 +17,7 @@
 
 */
 
-const float FIRMWARE_VERSION = 1.1;
+const float FIRMWARE_VERSION = 1.2;
 
 #include "settings.h"
 
@@ -145,7 +145,7 @@ MS8607 pressureSensor_MS8607;
 
 //Global variables
 //-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
-unsigned long measurementStartTime; //Used to calc the actual update rate.
+uint64_t measurementStartTime; //Used to calc the actual update rate. Max is ~80,000,000ms in a 24 hour period.
 unsigned long measurementCount = 0; //Used to calc the actual update rate.
 String outputData;
 String beginSensorOutput;
@@ -158,7 +158,9 @@ const uint32_t maxUsBeforeSleep = 2000000; //Number of us between readings befor
 const byte menuTimeout = 45; //Menus will exit/timeout after this number of seconds
 //-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
 
-unsigned long startTime = 0;
+//unsigned long startTime = 0;
+
+#define DUMP(varname) {Serial.printf("%s: %llu\n", #varname, varname);}
 
 void setup() {
   //If 3.3V rail drops below 3V, system will power down and maintain RTC
@@ -210,16 +212,18 @@ void setup() {
   if (beginSensors() == true) Serial.println(beginSensorOutput); //159 - 865ms but varies based on number of devices attached
   else msg("No sensors detected");
 
-  measurementStartTime = millis();
+  //If we are sleeping between readings then we cannot rely on millis() as it is powered down. Used RTC instead.
+  if (settings.usBetweenReadings >= maxUsBeforeSleep)
+    measurementStartTime = rtcMillis();
+  else
+    measurementStartTime = millis();
 
   //Serial.printf("Setup time: %.02f ms\n", (micros() - startTime) / 1000.0);
 
   //If we are immediately going to go to sleep after the first reading then
   //first present the user with the config menu in case they need to change something
   if (settings.usBetweenReadings >= maxUsBeforeSleep)
-  {
-    menuMain(); //Present user menu at startup to allow configuration even in LP mode
-  }
+    menuMain();
 }
 
 void loop() {

Firmware/OpenLog_Artemis/Sensors.ino

@@ -212,11 +212,11 @@ bool beginSensors()
   {
     if (pressureSensor_MS8607.begin(qwiic) == true) //Wire port. This checks both 0x40 and 0x76 sensor addresses
     {
-      if(settings.sensor_MS8607.enableHeater == true)
+      if (settings.sensor_MS8607.enableHeater == true)
         pressureSensor_MS8607.enable_heater();
       else
         pressureSensor_MS8607.disable_heater();
-      
+
       pressureSensor_MS8607.set_pressure_resolution(settings.sensor_MS8607.pressureResolution);
       pressureSensor_MS8607.set_humidity_resolution(settings.sensor_MS8607.humidityResolution);
 
@@ -683,10 +683,22 @@ void getData()
 
   if (settings.logHertz)
   {
-    //Calculate the actual update rate based on the sketch start time and the
-    //number of updates we've completed.
-    float actualRate = measurementCount * 1000.0 / (millis() - measurementStartTime);
+    uint64_t currentMillis;
+
+    //If we are sleeping between readings then we cannot rely on millis() as it is powered down
+    //Used RTC instead
+    if (settings.usBetweenReadings >= maxUsBeforeSleep)
+    {
+      currentMillis = rtcMillis();
+    }
+    else
+    {
+      //Calculate the actual update rate based on the sketch start time and the
+      //number of updates we've completed.
+      currentMillis = millis();
+    }
 
+    float actualRate = measurementCount * 1000.0 / (currentMillis - measurementStartTime);
     outputData += (String)actualRate + ","; //Hz
     helperText += "output_Hz,";
   }
@@ -717,7 +729,7 @@ void determineMaxI2CSpeed()
     maxSpeed = 100000;
 
   //If user wants to limit the I2C bus speed, do it here
-  if(maxSpeed > settings.qwiicBusMaxSpeed)
+  if (maxSpeed > settings.qwiicBusMaxSpeed)
     maxSpeed = settings.qwiicBusMaxSpeed;
 
   qwiic.setClock(maxSpeed);

Firmware/OpenLog_Artemis/lowerPower.ino

@@ -9,15 +9,15 @@ void powerDown()
   detachInterrupt(digitalPinToInterrupt(PIN_POWER_LOSS)); //Prevent voltage supervisor from waking us from sleep
 
   //Save files before going to sleep
-//  if (online.dataLogging == true)
-//  {
-//    sensorDataFile.sync();
-//  }
-//  if (online.serialLogging == true)
-//  {
-//    serialDataFile.sync();
-//  }
-  
+  //  if (online.dataLogging == true)
+  //  {
+  //    sensorDataFile.sync();
+  //  }
+  //  if (online.serialLogging == true)
+  //  {
+  //    serialDataFile.sync();
+  //  }
+
   //Serial.flush(); //Don't waste time waiting for prints to finish
 
   //  Wire.end(); //Power down I2C
@@ -29,7 +29,7 @@ void powerDown()
 
   Serial.end(); //Power down UART
   Serial1.end();
-  
+
   //Force the peripherals off
   am_hal_pwrctrl_periph_disable(AM_HAL_PWRCTRL_PERIPH_IOM0);
   am_hal_pwrctrl_periph_disable(AM_HAL_PWRCTRL_PERIPH_IOM1);
@@ -49,7 +49,7 @@ void powerDown()
   qwiicPowerOff();
   imuPowerOff();
   microSDPowerOff();
-  
+
   //Power down Flash, SRAM, cache
   am_hal_pwrctrl_memory_deepsleep_powerdown(AM_HAL_PWRCTRL_MEM_CACHE); //Turn off CACHE
   am_hal_pwrctrl_memory_deepsleep_powerdown(AM_HAL_PWRCTRL_MEM_FLASH_512K); //Turn off everything but lower 512k
@@ -77,12 +77,12 @@ void goToSleep()
   if (online.dataLogging == true)
   {
     sensorDataFile.sync();
-    sensorDataFile.close(); //No need to close files. https://forum.arduino.cc/index.php?topic=149504.msg1125098#msg1125098
+    //sensorDataFile.close(); //No need to close files. https://forum.arduino.cc/index.php?topic=149504.msg1125098#msg1125098
   }
   if (online.serialLogging == true)
   {
     serialDataFile.sync();
-    serialDataFile.close();
+    //serialDataFile.close();
   }
 
   Serial.flush(); //Finish any prints
@@ -173,8 +173,6 @@ void wakeFromSleep()
   am_hal_stimer_config(AM_HAL_STIMER_CFG_CLEAR | AM_HAL_STIMER_CFG_FREEZE);
   am_hal_stimer_config(AM_HAL_STIMER_HFRC_3MHZ);
 
-  startTime = micros();
-
   //Turn on ADC
   ap3_adc_setup();
 
@@ -207,8 +205,6 @@ void wakeFromSleep()
 
   beginSensors(); //159 - 865ms but varies based on number of devices attached
 
-  measurementStartTime = millis();
-
   //Serial.printf("Wake up time: %.02f ms\n", (micros() - startTime) / 1000.0);
 
   //When we wake up micros has been reset to zero so we need to let the main loop know to take a reading
@@ -247,3 +243,17 @@ void imuPowerOff()
   pinMode(PIN_IMU_POWER, OUTPUT);
   digitalWrite(PIN_IMU_POWER, LOW);
 }
+
+//Returns the number of milliseconds according to the RTC
+//Watch out for 24 hour roll over at 86,400,000ms
+uint32_t rtcMillis()
+{
+    myRTC.getTime();
+    uint32_t millisToday = 0;
+    millisToday += (myRTC.hour * 3600000UL);
+    millisToday += (myRTC.minute * 60000UL);
+    millisToday += (myRTC.seconds * 1000UL);
+    millisToday += (myRTC.hundredths * 10UL);
+
+    return(millisToday);  
+}

Firmware/OpenLog_Artemis/menuMain.ino

@@ -76,9 +76,13 @@ void menuMain()
   while (Serial.available()) Serial.read(); //Empty buffer of any newline chars
 
   //Reset measurements
-  measurementStartTime = millis(); //Update time
   measurementCount = 0;
   totalCharactersPrinted = 0;
+  //If we are sleeping between readings then we cannot rely on millis() as it is powered down. Used RTC instead.
+  if (settings.usBetweenReadings >= maxUsBeforeSleep)
+    measurementStartTime = rtcMillis();
+  else
+    measurementStartTime = millis();
 
   //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.