Merge pull request #1 from sparkfun/v11

Add 512GB SD support, MS8607 support, Qwiic power control, I2C speed adjustment

Author: nseidle

CHANGELOG.md

@@ -0,0 +1,15 @@
+Change Log
+======================
+
+v1.1
+---------
+
+* Add support for exFat microSD cards. Tested up to 512GB. Smaller FAT16 and FAT32 formatted cards are still supported.
+* Add support for MS8607 PHT sensor
+* Add ability to turn on/off power on Qwiic bus when time between sensor readings is > 2s. By default the bus powers down to save power but there may be instances where user wants to keep sensors powered up and running between reads. This can be accessed via the Attached Devices menu.
+* Add ability to limit I2C bus speed. Most devices operate at 400kHz I2C. Some (MCP9600) are automatically limited by OLA to 100kHz. There may be instances, because of bus length or other, where the user may want to artifically limit the bus speed. This can be access via the Attached Devices menu.
+
+
+v1.0
+---------
+Initial release.

Firmware/OpenLog_Artemis/OpenLog_Artemis.ino

@@ -17,7 +17,7 @@
 
 */
 
-const float FIRMWARE_VERSION = 1.0;
+const float FIRMWARE_VERSION = 1.1;
 
 #include "settings.h"
 
@@ -33,7 +33,7 @@ enum returnStatus {
 
 //Setup Qwiic Port
 //-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
-#include "Wire.h"
+#include <Wire.h>
 TwoWire qwiic(1); //Will use pads 8/9
 const byte PIN_QWIIC_POWER = 18;
 //-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
@@ -54,9 +54,16 @@ const byte PIN_MICROSD_POWER = 15; //x04
 #define SD_CONFIG SdSpiConfig(PIN_MICROSD_CHIP_SELECT, SHARED_SPI, SD_SCK_MHZ(24)) //Max of 24MHz
 #define SD_CONFIG_MAX_SPEED SdSpiConfig(PIN_MICROSD_CHIP_SELECT, DEDICATED_SPI, SD_SCK_MHZ(24)) //Max of 24MHz
 
-SdFat sd;
-File sensorDataFile; //File that all sensor data is written to
-File serialDataFile; //File that all incoming serial data is written to
+//ExFat
+SdFs sd;
+FsFile sensorDataFile; //File that all sensor data is written to
+FsFile serialDataFile; //File that all incoming serial data is written to
+
+//Fat16/32
+//SdFat sd;
+//File sensorDataFile; //File that all sensor data is written to
+//File serialDataFile; //File that all incoming serial data is written to
+
 char sensorDataFileName[30] = ""; //We keep a record of this file name so that we can re-open it upon wakeup from sleep
 char serialDataFileName[30] = ""; //We keep a record of this file name so that we can re-open it upon wakeup from sleep
 //-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
@@ -75,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
@@ -131,6 +138,9 @@ SGP30 vocSensor_SGP30;
 #include "SparkFun_SCD30_Arduino_Library.h" //Click here to get the library: http://librarymanager/All#SparkFun_SCD30
 SCD30 co2Sensor_SCD30;
 
+#include "MS8607_Library.h" //Click here to get the library: http://librarymanager/All#Qwiic_MS8607
+MS8607 pressureSensor_MS8607;
+
 //-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
 
 //Global variables
@@ -169,7 +179,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();
 
@@ -227,7 +237,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
@@ -250,7 +260,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);
       }
     }
   }
@@ -342,7 +352,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/Sensors.ino

@@ -207,6 +207,26 @@ bool beginSensors()
     else
       beginSensorOutput += "SCD30 failed to respond. Check wiring.\n";
   }
+
+  if (qwiicAvailable.MS8607 && settings.sensor_MS8607.log && !qwiicOnline.MS8607)
+  {
+    if (pressureSensor_MS8607.begin(qwiic) == true) //Wire port. This checks both 0x40 and 0x76 sensor addresses
+    {
+      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);
+
+      qwiicOnline.MS8607 = true;
+      beginSensorOutput += "MS8607 Online\n";
+    }
+    else
+      beginSensorOutput += "MS8607 failed to respond. Check wiring.\n";
+  }
+
   return true;
 }
 
@@ -642,6 +662,25 @@ void getData()
     }
   }
 
+  if (qwiicOnline.MS8607 && settings.sensor_MS8607.log)
+  {
+    if (settings.sensor_MS8607.logPressure)
+    {
+      outputData += (String)pressureSensor_MS8607.getPressure() + ",";
+      helperText += "hPa,";
+    }
+    if (settings.sensor_MS8607.logHumidity)
+    {
+      outputData += (String)pressureSensor_MS8607.getHumidity() + ",";
+      helperText += "humidity_%,";
+    }
+    if (settings.sensor_MS8607.logPressure)
+    {
+      outputData += (String)pressureSensor_MS8607.getTemperature() + ",";
+      helperText += "degC,";
+    }
+  }
+
   if (settings.logHertz)
   {
     //Calculate the actual update rate based on the sketch start time and the
@@ -677,5 +716,9 @@ void determineMaxI2CSpeed()
   else if (settings.sensor_uBlox.i2cSpeed == 100000)
     maxSpeed = 100000;
 
+  //If user wants to limit the I2C bus speed, do it here
+  if(maxSpeed > settings.qwiicBusMaxSpeed)
+    maxSpeed = settings.qwiicBusMaxSpeed;
+
   qwiic.setClock(maxSpeed);
 }

Firmware/OpenLog_Artemis/logging.ino

@@ -25,7 +25,7 @@ char* findNextAvailableLog(int &newFileNumber, const char *fileLeader)
     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 = sd.open(newFileName, O_READ);
+    newFile.open(newFileName, O_READ);
     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/lowerPower.ino

@@ -114,10 +114,15 @@ void goToSleep()
     am_hal_gpio_pinconfig(x, g_AM_HAL_GPIO_DISABLE);
 
   //We can't leave these power control pins floating
-  qwiicPowerOff();
   imuPowerOff();
   microSDPowerOff();
 
+  //Keep Qwiic bus powered on if user desires it
+  if (settings.powerDownQwiicBusBetweenReads == true)
+    qwiicPowerOff();
+  else
+    qwiicPowerOn(); //Make sure pins stays as output
+
   //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