Add support for yyyy/mm/dd and ISO 8601 date. Add fix for Serial.end.

Add support for missing / not-populated IMU.
Note: we're not out of the woods yet... The IMU is not restarting after sleep. More changes to follow!

Author: PaulZC

Firmware/OpenLog_Artemis/OpenLog_Artemis.ino

@@ -13,10 +13,6 @@
 
   The Board should be set to SparkFun Apollo3 \ RedBoard Artemis ATP.
 
-  Please note: this version of the firmware compiles on v2.1.0 of the Apollo3 boards.
-
-  (At the time of writing, data logging with the the u-blox ZED-F9P is problematic when using v2.1.1 of the core.)
-
   v1.0 Power Consumption:
    Sleep between reads, RTC fully charged, no Qwiic, SD, no USB, no Power LED: 260uA
    10Hz logging IMU, no Qwiic, SD, no USB, no Power LED: 9-27mA
@@ -112,10 +108,17 @@
   (done) Add a fix for issue #109 - check if a BME280 is connected before calling multiplexerBegin: https://github.com/sparkfun/OpenLog_Artemis/issues/109
   (done) Correct issue #104. enableSD was redundant. The microSD power always needs to be on if there is a card inserted, otherwise the card pulls
          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!)
+      https://github.com/sparkfun/OpenLog_Artemis/issues/117#issuecomment-1034973065
+    Use SdFat v2.1.2
+    Compensate for missing / not-populated IMU
+    Add support for yyyy/mm/dd and ISO 8601 date style (Issue 118)
 */
 
 const int FIRMWARE_VERSION_MAJOR = 2;
-const int FIRMWARE_VERSION_MINOR = 1;
+const int FIRMWARE_VERSION_MINOR = 2;
 
 //Define the OLA board identifier:
 //  This is an int which is unique to this variant of the OLA and which allows us
@@ -125,7 +128,7 @@ const int FIRMWARE_VERSION_MINOR = 1;
 //    the variant * 0x100 (OLA = 1; GNSS_LOGGER = 2; GEOPHONE_LOGGER = 3)
 //    the major firmware version * 0x10
 //    the minor firmware version
-#define OLA_IDENTIFIER 0x121 // Stored as 289 decimal in OLA_settings.txt
+#define OLA_IDENTIFIER 0x122 // Stored as 290 decimal in OLA_settings.txt
 
 #include "settings.h"
 
@@ -448,7 +451,7 @@ void setup() {
   else SerialPrintln(F("Serial logging offline"));
 
   if (online.IMU == true) SerialPrintln(F("IMU online"));
-  else SerialPrintln(F("IMU offline"));
+  else SerialPrintln(F("IMU offline - or not present"));
 
   if (settings.logMaxRate == true) SerialPrintln(F("Logging analog pins at max data rate"));
 

Firmware/OpenLog_Artemis/Sensors.ino

@@ -299,12 +299,18 @@ void gatherDeviceValues()
                 else
                   sprintf(gnssMonthStr, "%d", gnssMonth);
                 sprintf(gnssYearStr, "%d", gnssYear);
-                if (settings.americanDateStyle == true)
+                if (settings.dateStyle == 0)
                 {
                   sprintf(tempData, "%s/%s/%s,", gnssMonthStr, gnssDayStr, gnssYearStr);
                 }
-                else
+                else if (settings.dateStyle == 1)
+                {
                   sprintf(tempData, "%s/%s/%s,", gnssDayStr, gnssMonthStr, gnssYearStr);
+                }
+                else // if (settings.dateStyle == 2)
+                {
+                  sprintf(tempData, "%s/%s/%s,", gnssYearStr, gnssMonthStr, gnssDayStr);
+                }
                 strcat(outputData, tempData);
               }
               if (nodeSetting->logTime)

Firmware/OpenLog_Artemis/lowerPower.ino

@@ -318,16 +318,16 @@ void goToSleep(uint32_t sysTicksToSleep)
   am_hal_gpio_pinconfig(PIN_QWIIC_SCL , g_AM_HAL_GPIO_DISABLE);
 
   //If requested, disable pins 48 and 49 (UART0) to stop them back-feeding the CH340
-if (settings.serialTxRxDuringSleep == false)
-{
+  if (settings.serialTxRxDuringSleep == false)
+  {
     am_hal_gpio_pinconfig(48 , g_AM_HAL_GPIO_DISABLE); //TX0
     am_hal_gpio_pinconfig(49 , g_AM_HAL_GPIO_DISABLE); //RX0
     if (settings.useTxRxPinsForTerminal == true)
     {
-        am_hal_gpio_pinconfig(12 , g_AM_HAL_GPIO_DISABLE); //TX1
-        am_hal_gpio_pinconfig(13 , g_AM_HAL_GPIO_DISABLE); //RX1
+      am_hal_gpio_pinconfig(12 , g_AM_HAL_GPIO_DISABLE); //TX1
+      am_hal_gpio_pinconfig(13 , g_AM_HAL_GPIO_DISABLE); //RX1
     }
-}
+  }
 
   //Make sure PIN_POWER_LOSS is configured as an input for the WDT
   pinMode(PIN_POWER_LOSS, INPUT); // BD49K30G-TL has CMOS output and does not need a pull-up
@@ -475,7 +475,6 @@ void wakeFromSleep()
     pin_config(PinName(48), g_AM_BSP_GPIO_COM_UART_TX);    
     pin_config(PinName(49), g_AM_BSP_GPIO_COM_UART_RX);
   }
-  
 
   //Re-enable CIPO, COPI, SCK and the chip selects but may as well leave ICM_INT disabled
   pin_config(PinName(PIN_SPI_CIPO), g_AM_BSP_GPIO_IOM0_MISO);

Firmware/OpenLog_Artemis/menuMain.ino

@@ -12,7 +12,8 @@ void menuMain()
 
     SerialPrintln(F("2) Configure Time Stamp"));
 
-    SerialPrintln(F("3) Configure IMU Logging"));
+    if (online.IMU)
+      SerialPrintln(F("3) Configure IMU Logging"));
 
     if (settings.useTxRxPinsForTerminal == false)
       SerialPrintln(F("4) Configure Serial Logging"));
@@ -42,7 +43,7 @@ void menuMain()
       menuLogRate();
     else if (incoming == '2')
       menuTimeStamp();
-    else if (incoming == '3')
+    else if ((incoming == '3') && (online.IMU))
       restartIMU = menuIMU();
     else if ((incoming == '4') && (settings.useTxRxPinsForTerminal == false))
       menuSerialLogging();

Firmware/OpenLog_Artemis/menuTimeStamp.ino

@@ -23,10 +23,12 @@ void menuTimeStamp()
       sprintf(rtcYear, "200%d", myRTC.year);
     else
       sprintf(rtcYear, "20%d", myRTC.year);
-    if (settings.americanDateStyle == true)
+    if (settings.dateStyle == 0)
       sprintf(rtcDate, "%s/%s/%s,", rtcMonth, rtcDay, rtcYear);
-    else
+    else if (settings.dateStyle == 1)
       sprintf(rtcDate, "%s/%s/%s,", rtcDay, rtcMonth, rtcYear);
+    else
+      sprintf(rtcDate, "%s/%s/%s,", rtcYear, rtcMonth, rtcDay);
 
     SerialPrint(rtcDate);
     SerialPrint(F(" "));
@@ -79,8 +81,10 @@ void menuTimeStamp()
       SerialPrintln(F("4) Manually set RTC date"));
 
       SerialPrint(F("5) Toggle date style: "));
-      if (settings.americanDateStyle == true) SerialPrintln(F("mm/dd/yyyy"));
-      else SerialPrintln(F("dd/mm/yyyy"));
+      if (settings.dateStyle == 0) SerialPrintln(F("mm/dd/yyyy"));
+      else if (settings.dateStyle == 1) SerialPrintln(F("dd/mm/yyyy"));
+      else if (settings.dateStyle == 2) SerialPrintln(F("yyyy/mm/dd"));
+      else SerialPrintln(F("ISO 8601"));
     }
 
     if (settings.logTime == true)
@@ -181,7 +185,9 @@ void menuTimeStamp()
       }
       else if (incoming == 5)
       {
-        settings.americanDateStyle ^= 1;
+        settings.dateStyle += 1;
+        if (settings.dateStyle == 4)
+          settings.dateStyle = 0;
       }
     }
 

Firmware/OpenLog_Artemis/nvm.ino

@@ -125,7 +125,7 @@ void recordSystemSettingsToFile()
     settingsFile.println("logRTC=" + (String)settings.logRTC);
     settingsFile.println("logHertz=" + (String)settings.logHertz);
     settingsFile.println("correctForDST=" + (String)settings.correctForDST);
-    settingsFile.println("americanDateStyle=" + (String)settings.americanDateStyle);
+    settingsFile.println("dateStyle=" + (String)settings.dateStyle);
     settingsFile.println("hour24Style=" + (String)settings.hour24Style);
     settingsFile.println("serialTerminalBaudRate=" + (String)settings.serialTerminalBaudRate);
     settingsFile.println("serialLogBaudRate=" + (String)settings.serialLogBaudRate);
@@ -348,8 +348,10 @@ bool parseLine(char* str) {
     settings.logHertz = d;
   else if (strcmp(settingName, "correctForDST") == 0)
     settings.correctForDST = d;
-  else if (strcmp(settingName, "americanDateStyle") == 0)
-    settings.americanDateStyle = d;
+  else if (strcmp(settingName, "dateStyle") == 0)
+    settings.dateStyle = d;
+  else if (strcmp(settingName, "americanDateStyle") == 0) // Included for backward-compatibility
+    settings.dateStyle = d;
   else if (strcmp(settingName, "hour24Style") == 0)
     settings.hour24Style = d;
   else if (strcmp(settingName, "serialTerminalBaudRate") == 0)

Firmware/OpenLog_Artemis/settings.h

@@ -364,7 +364,7 @@ struct struct_settings {
   bool logRTC = true;
   bool logHertz = true;
   bool correctForDST = false;
-  bool americanDateStyle = true;
+  int dateStyle = 0; // 0 : mm/dd/yyyy, 1 : dd/mm/yyyy, 2 : yyyy/mm/dd, 3 : ISO8601 (date and time)
   bool hour24Style = true;
   int  serialTerminalBaudRate = 115200;
   int  serialLogBaudRate = 9600;

Firmware/OpenLog_Artemis/timeStamp.ino

@@ -26,16 +26,20 @@ void getTimeString(char timeStringBuffer[])
       sprintf(rtcYear, "200%d", myRTC.year);
     else
       sprintf(rtcYear, "20%d", myRTC.year);
-    if (settings.americanDateStyle == true)
+    if (settings.dateStyle == 0)
       sprintf(rtcDate, "%s/%s/%s,", rtcMonth, rtcDay, rtcYear);
-    else
+    else if (settings.dateStyle == 1)
       sprintf(rtcDate, "%s/%s/%s,", rtcDay, rtcMonth, rtcYear);
+    else if (settings.dateStyle == 2)
+      sprintf(rtcDate, "%s/%s/%s,", rtcYear, rtcMonth, rtcDay);
+    else // if (settings.dateStyle == 3)
+      sprintf(rtcDate, "%s-%s-%sT", rtcYear, rtcMonth, rtcDay);
     strcat(timeStringBuffer, rtcDate);
   }
 
-  if (settings.logTime)
+  if ((settings.logTime) || ((settings.logDate) && (settings.dateStyle == 3)))
   {
-    char rtcTime[13]; //09:14:37.41,
+    char rtcTime[16]; //09:14:37.41, or 09:14:37+00:00,
     int adjustedHour = myRTC.hour;
     if (settings.hour24Style == false)
     {
@@ -45,6 +49,7 @@ void getTimeString(char timeStringBuffer[])
     char rtcMin[3];
     char rtcSec[3];
     char rtcHundredths[3];
+    char timeZone[4];
     if (adjustedHour < 10)
       sprintf(rtcHour, "0%d", adjustedHour);
     else
@@ -61,8 +66,30 @@ void getTimeString(char timeStringBuffer[])
       sprintf(rtcHundredths, "0%d", myRTC.hundredths);
     else
       sprintf(rtcHundredths, "%d", myRTC.hundredths);
-    sprintf(rtcTime, "%s:%s:%s.%s,", rtcHour, rtcMin, rtcSec, rtcHundredths);
-    strcat(timeStringBuffer, rtcTime);
+    if (settings.localUTCOffset >= 0)
+    {
+      if (settings.localUTCOffset < 10)
+        sprintf(timeZone, "+0%d", settings.localUTCOffset);
+      else
+        sprintf(timeZone, "+%d", settings.localUTCOffset);
+    }
+    else
+    {
+      if (settings.localUTCOffset <= -10)
+        sprintf(timeZone, "-%d", 0 - settings.localUTCOffset);
+      else
+        sprintf(timeZone, "-0%d", 0 - settings.localUTCOffset);
+    }
+    if ((settings.logDate) && (settings.dateStyle == 3))
+    {
+      sprintf(rtcTime, "%s:%s:%s%s:00,", rtcHour, rtcMin, rtcSec, timeZone);
+      strcat(timeStringBuffer, rtcTime);      
+    }
+    if (settings.logTime)
+    {
+      sprintf(rtcTime, "%s:%s:%s.%s,", rtcHour, rtcMin, rtcSec, rtcHundredths);
+      strcat(timeStringBuffer, rtcTime);
+    }
   }
 
   if (settings.logMicroseconds)
@@ -155,7 +182,7 @@ void correctDate(int &year, int &month, int &day, int &hour)
       adjustMonth = true;
     else if (month == 2)
     {
-      if (year % 4 == 0 && day == 30)
+      if (year % 4 == 0 && day == 30) // Note: this will fail in 2100. 2100 is not a leap year.
         adjustMonth = true;
       else if (day == 29)
         adjustMonth = true;
@@ -213,7 +240,7 @@ void correctDate(int &year, int &month, int &day, int &hour)
           day = 31;
           break;
         case 2: //February
-          if (year % 4 == 0) day = 29;
+          if (year % 4 == 0) day = 29; // Note: this will fail in 2100. 2100 is not a leap year.
           else day = 28;
           break;
         case 3: //March