Merge pull request #3 from sparkfun/v12

Fix low power SD logging bug

Author: nseidle

CHANGELOG.md

@@ -1,6 +1,13 @@
 Change Log
 ======================
 
+v1.2
+---------
+
+* Fix bug in findNextAvailableLog() that was causing logging to fail during after a sleep/wakeup and sometimes corrupt the microSD card.
+* Fix calculation of actualHz when power sleeping >2s.
+* Log sensor configurations to config file. This allows users to configure an OpenLog Artemis and then deploy that configuration to multiple units as needed.
+
 v1.1
 ---------
 

Firmware/OpenLog_Artemis/OpenLog_Artemis-v12.bin

@@ -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/OpenLog_Artemis.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/OpenLog_Artemis.ino.axf

@@ -2,7 +2,7 @@
 void msg(const char * message)
 {
   Serial.println(message);
-  if(online.microSD)
+  if (online.microSD)
     sensorDataFile.println(message);
 }
 
@@ -17,15 +17,16 @@ char* findNextAvailableLog(int &newFileNumber, const char *fileLeader)
     newFileNumber--; //Check if last log file was empty
 
   //Search for next available log spot
-  static char newFileName[13];
+  static char newFileName[40];
   while (1)
   {
     sprintf(newFileName, "%s%05u.TXT", fileLeader, newFileNumber); //Splice the new file number into this file name
 
     if (sd.exists(newFileName) == false) break; //File name not found so we will use it.
 
     //File exists so open and see if it is empty. If so, use it.
-    newFile.open(newFileName, O_READ);
+    //newFile = sd.open(newFileName, O_READ);
+    newFile.open(newFileName, O_READ); //exFat
     if (newFile.size() == 0) break; // File is empty so we will use it.
 
     newFile.close(); // Close this existing file we just opened.

Firmware/OpenLog_Artemis/OpenLog_Artemis.ino.bin

@@ -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
@@ -108,14 +108,16 @@ void goToSleep()
   am_hal_pwrctrl_periph_disable(AM_HAL_PWRCTRL_PERIPH_UART0);
   am_hal_pwrctrl_periph_disable(AM_HAL_PWRCTRL_PERIPH_UART1);
 
-
   //Disable all pads
   for (int x = 0 ; x < 50 ; x++)
     am_hal_gpio_pinconfig(x, g_AM_HAL_GPIO_DISABLE);
 
   //We can't leave these power control pins floating
   imuPowerOff();
-  microSDPowerOff();
+  //microSDPowerOff();
+
+  //Testing file record issues
+  microSDPowerOn();
 
   //Keep Qwiic bus powered on if user desires it
   if (settings.powerDownQwiicBusBetweenReads == true)
@@ -173,8 +175,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();
 
@@ -193,12 +193,8 @@ void wakeFromSleep()
 
   beginSD(); //285 - 293ms
 
-  //loadSettings(); //50 - 250ms
-
   beginQwiic();
 
-  //analogReadResolution(14); //Increase from default of 10
-
   beginDataLogging(); //180ms
 
   beginSerialLogging(); //20 - 99ms
@@ -207,8 +203,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 +241,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/Sensors.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.

Firmware/OpenLog_Artemis/logging.ino

@@ -46,7 +46,8 @@ void recordSettingsToFile()
     if (sd.exists("OLA_settings.cfg"))
       sd.remove("OLA_settings.cfg");
 
-    FsFile settingsFile;
+    //File settingsFile; //FAT16/32
+    FsFile settingsFile; //exFat
     if (settingsFile.open("OLA_settings.cfg", O_CREAT | O_APPEND | O_WRITE) == false)
     {
       Serial.println("Failed to create settings file");
@@ -94,6 +95,14 @@ void recordSettingsToFile()
     settingsFile.println("qwiicBusMaxSpeed=" + (String)settings.qwiicBusMaxSpeed);
     //    settingsFile.println("=" + (String)settings.sensor_LPS25HB.);
 
+    settingsFile.println("sensor_MS8607.log=" + (String)settings.sensor_MS8607.log);
+    settingsFile.println("sensor_MS8607.logHumidity=" + (String)settings.sensor_MS8607.logHumidity);
+    settingsFile.println("sensor_MS8607.logPressure=" + (String)settings.sensor_MS8607.logPressure);
+    settingsFile.println("sensor_MS8607.logTemperature=" + (String)settings.sensor_MS8607.logTemperature);
+    settingsFile.println("sensor_MS8607.enableHeater=" + (String)settings.sensor_MS8607.enableHeater);
+    settingsFile.println("sensor_MS8607.pressureResolution=" + (String)settings.sensor_MS8607.pressureResolution);
+    settingsFile.println("sensor_MS8607.humidityResolution=" + (String)settings.sensor_MS8607.humidityResolution);
+
     settingsFile.close();
   }
 }
@@ -108,7 +117,8 @@ bool loadSettingsFromFile()
   {
     if (sd.exists("OLA_settings.cfg"))
     {
-      FsFile settingsFile;
+      //File settingsFile; //FAT16/32
+      FsFile settingsFile; //exFat
       if (settingsFile.open("OLA_settings.cfg", O_READ) == false)
       {
         Serial.println("Failed to open settings file");
@@ -284,6 +294,29 @@ bool parseLine(char* str) {
     settings.powerDownQwiicBusBetweenReads = d;
   else if (strcmp(settingName, "qwiicBusMaxSpeed") == 0)
     settings.qwiicBusMaxSpeed = d;
+
+  /*
+   LPS25HB
+   NAU7802
+   MCP9600
+   VCNL4040
+   */
+  
+  else if (strcmp(settingName, "sensor_MS8607.log") == 0)
+    settings.sensor_MS8607.log = d;
+  else if (strcmp(settingName, "sensor_MS8607.logHumidity") == 0)
+    settings.sensor_MS8607.logHumidity = d;
+  else if (strcmp(settingName, "sensor_MS8607.logPressure") == 0)
+    settings.sensor_MS8607.logPressure = d;
+  else if (strcmp(settingName, "sensor_MS8607.logTemperature") == 0)
+    settings.sensor_MS8607.logTemperature = d;
+  else if (strcmp(settingName, "sensor_MS8607.enableHeater") == 0)
+    settings.sensor_MS8607.enableHeater = d;
+  else if (strcmp(settingName, "sensor_MS8607.pressureResolution") == 0)
+    settings.sensor_MS8607.pressureResolution = (MS8607_pressure_resolution)d;
+  else if (strcmp(settingName, "sensor_MS8607.humidityResolution") == 0)
+    settings.sensor_MS8607.humidityResolution = (MS8607_humidity_resolution)d;
+
   //  else if (strcmp(settingName, "") == 0)
   //    settings. = d;
   else