Increase baud limit to 921600. Add debug text to serial RX counter.

Author: Nathan Seidle

Firmware/OpenLog_Artemis/OpenLog_Artemis.ino

@@ -82,7 +82,7 @@ const int MAX_IDLE_TIME_MSEC = 500;
 bool newSerialData = false;
 char incomingBuffer[256 * 2]; //This size of this buffer is sensitive. Do not change without analysis using OpenLog_Serial.
 int incomingBufferSpot = 0;
-//int charsReceived = 0; //Used for verifying/debugging serial reception
+int charsReceived = 0; //Used for verifying/debugging serial reception
 //-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
 
 //Add ICM IMU interface
@@ -176,7 +176,7 @@ void setup() {
 
   Serial.flush(); //Complete any previous prints
   Serial.begin(settings.serialTerminalBaudRate);
-  Serial.printf("Artemis OpenLog v%f\n", FIRMWARE_VERSION);
+  Serial.printf("Artemis OpenLog v%.02f\n", FIRMWARE_VERSION);
 
   beginQwiic();
 
@@ -234,7 +234,7 @@ void loop() {
           serialDataFile.write(incomingBuffer, sizeof(incomingBuffer)); //Record the buffer to the card
           incomingBufferSpot = 0;
         }
-        //charsReceived++;
+        charsReceived++;
       }
 
       lastSeriaLogSyncTime = millis(); //Reset the last sync time to now
@@ -257,7 +257,7 @@ void loop() {
 
         newSerialData = false;
         lastSeriaLogSyncTime = millis(); //Reset the last sync time to now
-        //Serial.println("Total chars recevied: " + (String)charsReceived);
+        printDebug("Total chars received: " + (String)charsReceived);
       }
     }
   }
@@ -349,7 +349,7 @@ void beginSD()
       delay(250); //Give SD more time to power up, then try again
       if (sd.begin(SD_CONFIG) == false) //Slightly Faster SdFat Beta (we don't have dedicated SPI)
       {
-        Serial.println("SD init failed. Do you have the correct board selected in Arduino? Is card present? Formatted?");
+        Serial.println("SD init failed. Is card present? Formatted?");
         digitalWrite(PIN_MICROSD_CHIP_SELECT, HIGH); //Be sure SD is deselected
         online.microSD = false;
         return;

Firmware/OpenLog_Artemis/menuMain.ino

@@ -22,14 +22,7 @@ void menuMain()
     Serial.println("5) Configure Analog Pin Logging");
 
     Serial.println("6) Detect / Configure Attached Devices");
-    //Serial.println("1) Detect Qwiic Devices"); //Do this in sub menu
-    //If VL53L1X attached, set read distance, set read rate?
-    //Log internal temp sensor
-    //Set record freq
 
-    //Serial.println(") Configure Power Control");
-    //Power down ICM
-    //Turn off SD? RTC?...
     //Serial.println(") Configure Battery Voltage Logging");
     //Enable VCC logging
 
@@ -51,6 +44,13 @@ void menuMain()
       menuAnalogLogging();
     else if (incoming == '6')
       menuAttachedDevices();
+    else if (incoming == 'd')
+    {
+      Serial.print("Debug Messages ");
+      settings.printDebugMessages ^= 1;
+      if(settings.printDebugMessages == true) Serial.println("Enabled");
+      else Serial.println("Disabled");
+    }
     else if (incoming == 'r')
     {
       Serial.println("\n\rResetting to factory defaults. Continue? Press 'y':");

Firmware/OpenLog_Artemis/menuSerialLogging.ino

@@ -47,9 +47,9 @@ void menuSerialLogging()
     {
       if (incoming == '2')
       {
-        Serial.print("Enter baud rate (1200 to 460800): ");
+        Serial.print("Enter baud rate (1200 to 921600): ");
         int newBaud = getNumber(menuTimeout); //Timeout after x seconds
-        if (newBaud < 1200 || newBaud > 460800)
+        if (newBaud < 1200 || newBaud > 921600)
         {
           Serial.println("Error: baud rate out of range");
         }

Firmware/OpenLog_Artemis/nvm.ino

@@ -26,7 +26,7 @@ void loadSettings()
   EEPROM.get(0, settings);
 
   //Load any settings from config file
-  if(loadSettingsFromFile() == true)
+  if (loadSettingsFromFile() == true)
     recordSettings(); //Record these new settings to EEPROM and config file
 }
 
@@ -56,7 +56,7 @@ void recordSettingsToFile()
     settingsFile.println("sizeOfSettings=" + (String)settings.sizeOfSettings);
     settingsFile.println("nextSerialLogNumber=" + (String)settings.nextSerialLogNumber);
     settingsFile.println("nextDataLogNumber=" + (String)settings.nextDataLogNumber);
-    
+
     char temp[20];
     sprintf(temp, "%lu", settings.usBetweenReadings);
     settingsFile.println("usBetweenReadings=" + (String)temp);
@@ -89,6 +89,7 @@ void recordSettingsToFile()
     settingsFile.println("logA32=" + (String)settings.logA32);
     settingsFile.println("logAnalogVoltages=" + (String)settings.logAnalogVoltages);
     settingsFile.println("localUTCOffset=" + (String)settings.localUTCOffset);
+    settingsFile.println("printDebugMessages=" + (String)settings.printDebugMessages);
     //    settingsFile.println("=" + (String)settings.sensor_LPS25HB.);
 
     settingsFile.close();
@@ -109,7 +110,7 @@ bool loadSettingsFromFile()
       if (settingsFile.open("OLA_settings.cfg", O_READ) == false)
       {
         Serial.println("Failed to open settings file");
-        return(false);
+        return (false);
       }
 
       char line[50];
@@ -122,39 +123,40 @@ bool loadSettingsFromFile()
         }
         else if (line[n - 1] != '\n' && n == (sizeof(line) - 1)) {
           Serial.printf("Settings line %d too long\n", lineNumber);
-          if(lineNumber == 0)
+          if (lineNumber == 0)
           {
             //If we can't read the first line of the settings file, give up
             Serial.println("Giving up on settings file");
-            return(false);
+            return (false);
           }
         }
         else if (parseLine(line) == false) {
           Serial.printf("Failed to parse line %d: %s\n", lineNumber, line);
-          if(lineNumber == 0)
+          if (lineNumber == 0)
           {
             //If we can't read the first line of the settings file, give up
             Serial.println("Giving up on settings file");
-            return(false);
+            return (false);
           }
         }
+
         lineNumber++;
       }
 
       Serial.println("Config file read complete");
       settingsFile.close();
-      return(true);
+      return (true);
     }
     else
     {
-      Serial.println("No config file found. Loading defaults.");
+      Serial.println("No config file found. Using settings from EEPROM.");
       //The defaults of the struct will be recorded to a file later on.
-      return(false);
+      return (false);
     }
   }
 
   Serial.println("Config file read failed: SD offline");
-  return(false); //SD offline
+  return (false); //SD offline
 }
 
 // Check for extra characters in field or find minus sign.
@@ -168,6 +170,10 @@ char* skipSpace(char* str) {
 bool parseLine(char* str) {
   char* ptr;
 
+  //Debug
+  //Serial.printf("Line contents: %s", str);
+  //Serial.flush();
+
   // Set strtok start of line.
   str = strtok(str, "=");
   if (!str) return false;
@@ -180,16 +186,33 @@ bool parseLine(char* str) {
   str = strtok(nullptr, "\n");
   if (!str) return false;
 
+  //Serial.printf("s = %s\n", str);
+  //Serial.flush();
+
   // Convert string to double.
   double d = strtod(str, &ptr);
   if (str == ptr || *skipSpace(ptr)) return false;
 
+  //Serial.printf("d = %lf\n", d);
+  //Serial.flush();
+
   // Get setting name
   if (strcmp(settingName, "sizeOfSettings") == 0)
   {
+    //We may want to cause a factory reset from the settings file rather than the menu
+    //If user sets sizeOfSettings to -1 in config file, OLA will factory reset
+    if (d == -1)
+    {
+      EEPROM.erase();
+      sd.remove("OLA_settings.cfg");
+      Serial.println("OpenLog Artemis has been factory reset. Freezing. Please restart and open terminal at 115200bps.");
+      while(1);
+    }
+
     //Check to see if this setting file is compatible with this version of OLA
     if (d != sizeof(settings))
       Serial.printf("Warning: Settings size is %d but current firmware expects %d. Attempting to use settings from file.\n", d, sizeof(settings));
+
   }
   else if (strcmp(settingName, "nextSerialLogNumber") == 0)
     settings.nextSerialLogNumber = d;
@@ -253,8 +276,10 @@ bool parseLine(char* str) {
     settings.logAnalogVoltages = d;
   else if (strcmp(settingName, "localUTCOffset") == 0)
     settings.localUTCOffset = d;
-//  else if (strcmp(settingName, "") == 0)
-//    settings. = d;
+  else if (strcmp(settingName, "printDebugMessages") == 0)
+    settings.printDebugMessages = d;
+  //  else if (strcmp(settingName, "") == 0)
+  //    settings. = d;
   else
   {
     Serial.print("Unknown setting: ");

Firmware/OpenLog_Artemis/settings.h

@@ -155,6 +155,7 @@ struct struct_settings {
   bool logA32 = false;
   bool logAnalogVoltages = true;
   int localUTCOffset = -7; //Default to Denver because we can
+  bool printDebugMessages = false;
   struct_LPS25HB sensor_LPS25HB;
   struct_uBlox sensor_uBlox;
   struct_VL53L1X sensor_VL53L1X;

Firmware/OpenLog_Artemis/support.ino

@@ -1,3 +1,11 @@
+void printDebug(String thingToPrint)
+{
+  if(settings.printDebugMessages == true)
+  {
+    Serial.print(thingToPrint);    
+  }
+}
+
 
 //Option not known
 void printUnknown(uint8_t unknownChoice)