Merge pull request #37 from sparkfun/v16_Candidate

Merging v16_Candidate

Author: PaulZC

Binaries/OpenLog_Artemis-V10-v16.bin

@@ -7,7 +7,10 @@ If you'd like to contribute, start by searching through the [issues](https://git
 If you decide to add a feature or support for a new sensor to OpenLog Artemis, please create a PR and follow these best practices:
 
 * Change as little as possible. Do not sumbit a PR that changes 100 lines of whitespace. Break up into multiple PRs if necessary.
-* If you add a new feature document how it works in the PR.
+* If you add a new feature, please document how it works in the PR.
+* Please submit your PR using the [release-candidate branch](https://github.com/sparkfun/OpenLog_Artemis/tree/release_candidate). That way, we can merge and test your PR quickly without changing the _master_ branch
+
+![Contributing.JPG](./img/Contributing.JPG)
 
 ## Style guide
 

Binaries/OpenLog_Artemis-X04-v16.bin

@@ -2,6 +2,7 @@
 void getData()
 {
   measurementCount++;
+  measurementTotal++;
 
   char tempData[50];
   outputData[0] = '\0'; //Clear string contents
@@ -110,8 +111,12 @@ void getData()
 
   if (online.IMU)
   {
+    //printDebug("getData: online.IMU = " + (String)online.IMU + "\r\n");
+
     if (myICM.dataReady())
     {
+      //printDebug("getData: myICM.dataReady = " + (String)myICM.dataReady() + "\r\n");
+      
       myICM.getAGMT(); //Update values
 
       if (settings.logIMUAccel)
@@ -135,6 +140,10 @@ void getData()
         strcat(outputData, tempData);
       }
     }
+    //else
+    //{
+    //  printDebug("getData: myICM.dataReady = " + (String)myICM.dataReady() + "\r\n");
+    //}
   }
 
   //Append all external sensor data on linked list to outputData
@@ -164,11 +173,11 @@ void getData()
 
   if (settings.printMeasurementCount)
   {
-    sprintf(tempData, "%d,", measurementCount);
+    sprintf(tempData, "%d,", measurementTotal);
     strcat(outputData, tempData);
   }
 
-  strcat(outputData, "\n");
+  strcat(outputData, "\r\n");
 
   totalCharactersPrinted += strlen(outputData);
 }
@@ -670,7 +679,7 @@ void gatherDeviceValues()
           }
           break;
         default:
-          Serial.printf("printDeviceValue unknown device type: %s\n", getDeviceName(temp->deviceType));
+          Serial.printf("printDeviceValue unknown device type: %s\r\n", getDeviceName(temp->deviceType));
           break;
       }
 
@@ -981,7 +990,7 @@ void printHelperText(bool terminalOnly)
           }
           break;
         default:
-          Serial.printf("\nprinterHelperText device not found: %d\n", temp->deviceType);
+          Serial.printf("\nprinterHelperText device not found: %d\r\n", temp->deviceType);
           break;
       }
     }
@@ -994,12 +1003,13 @@ void printHelperText(bool terminalOnly)
   if (settings.printMeasurementCount)
     strcat(helperText, "count,");
 
-  strcat(helperText, "\n");
+  strcat(helperText, "\r\n");
 
   Serial.print(helperText);
   if ((terminalOnly == false) && (settings.logData == true) && (online.microSD) && (settings.enableSD && online.microSD))
     sensorDataFile.print(helperText);
 }
+
 //If certain devices are attached, we need to reduce the I2C max speed
 void setMaxI2CSpeed()
 {
@@ -1036,6 +1046,7 @@ void setMaxI2CSpeed()
   qwiic.setClock(maxSpeed);
   for (int i = 0; i < 100; i++) //Allow time for the speed to change
   {
+    checkBattery();
     delay(1);
   }  
 }

CONTRIBUTING.md

@@ -226,7 +226,7 @@ bool addDevice(deviceType_e deviceType, uint8_t address, uint8_t muxAddress, uin
       }
       break;
     default:
-      Serial.printf("addDevice Device type not found: %d\n", deviceType);
+      Serial.printf("addDevice Device type not found: %d\r\n", deviceType);
       break;
   }
 
@@ -252,12 +252,16 @@ bool beginQwiicDevices()
 {
   bool everythingStarted = true;
 
+  waitForQwiicBusPowerDelay(); // Wait while the qwiic devices power up - if required
+  
+  qwiicPowerOnDelayMillis = settings.qwiicBusPowerUpDelayMs; // Set qwiicPowerOnDelayMillis to the _minimum_ defined by settings.qwiicBusPowerUpDelayMs. It will be increased if required.
+
   //Step through the list
   node *temp = head;
 
   if (temp == NULL)
   {
-    Serial.println(F("beginQwiicDevices: No devices detected"));
+    printDebug(F("beginQwiicDevices: No devices detected\r\n"));
     return (true);
   }
 
@@ -277,20 +281,24 @@ bool beginQwiicDevices()
       case DEVICE_MULTIPLEXER:
         {
           QWIICMUX *tempDevice = (QWIICMUX *)temp->classPtr;
+          struct_multiplexer *nodeSetting = (struct_multiplexer *)temp->configPtr; //Create a local pointer that points to same spot as node does
+          if (nodeSetting->powerOnDelayMillis > qwiicPowerOnDelayMillis) qwiicPowerOnDelayMillis = nodeSetting->powerOnDelayMillis; // Increase qwiicPowerOnDelayMillis if required
           temp->online = tempDevice->begin(temp->address, qwiic); //Address, Wire port
         }
         break;
       case DEVICE_LOADCELL_NAU7802:
         {
           NAU7802 *tempDevice = (NAU7802 *)temp->classPtr;
           struct_NAU7802 *nodeSetting = (struct_NAU7802 *)temp->configPtr; //Create a local pointer that points to same spot as node does
+          if (nodeSetting->powerOnDelayMillis > qwiicPowerOnDelayMillis) qwiicPowerOnDelayMillis = nodeSetting->powerOnDelayMillis; // Increase qwiicPowerOnDelayMillis if required
           temp->online = tempDevice->begin(qwiic); //Wire port
         }
         break;
       case DEVICE_DISTANCE_VL53L1X:
         {
           SFEVL53L1X *tempDevice = (SFEVL53L1X *)temp->classPtr;
           struct_VL53L1X *nodeSetting = (struct_VL53L1X *)temp->configPtr; //Create a local pointer that points to same spot as node does
+          if (nodeSetting->powerOnDelayMillis > qwiicPowerOnDelayMillis) qwiicPowerOnDelayMillis = nodeSetting->powerOnDelayMillis; // Increase qwiicPowerOnDelayMillis if required
           if (tempDevice->begin() == 0) //Returns 0 if init was successful. Wire port passed in constructor.
             temp->online = true;
         }
@@ -300,6 +308,7 @@ bool beginQwiicDevices()
           qwiic.setPullups(0); //Disable pullups for u-blox comms.
           SFE_UBLOX_GPS *tempDevice = (SFE_UBLOX_GPS *)temp->classPtr;
           struct_uBlox *nodeSetting = (struct_uBlox *)temp->configPtr; //Create a local pointer that points to same spot as node does
+          if (nodeSetting->powerOnDelayMillis > qwiicPowerOnDelayMillis) qwiicPowerOnDelayMillis = nodeSetting->powerOnDelayMillis; // Increase qwiicPowerOnDelayMillis if required
           temp->online = tempDevice->begin(qwiic, temp->address); //Wire port, Address
           qwiic.setPullups(settings.qwiicBusPullUps); //Re-enable pullups.
         }
@@ -308,86 +317,113 @@ bool beginQwiicDevices()
         {
           VCNL4040 *tempDevice = (VCNL4040 *)temp->classPtr;
           struct_VCNL4040 *nodeSetting = (struct_VCNL4040 *)temp->configPtr; //Create a local pointer that points to same spot as node does
+          if (nodeSetting->powerOnDelayMillis > qwiicPowerOnDelayMillis) qwiicPowerOnDelayMillis = nodeSetting->powerOnDelayMillis; // Increase qwiicPowerOnDelayMillis if required
           temp->online = tempDevice->begin(qwiic); //Wire port
         }
         break;
       case DEVICE_TEMPERATURE_TMP117:
         {
           TMP117 *tempDevice = (TMP117 *)temp->classPtr;
+          struct_TMP117 *nodeSetting = (struct_TMP117 *)temp->configPtr; //Create a local pointer that points to same spot as node does
+          if (nodeSetting->powerOnDelayMillis > qwiicPowerOnDelayMillis) qwiicPowerOnDelayMillis = nodeSetting->powerOnDelayMillis; // Increase qwiicPowerOnDelayMillis if required
           temp->online = tempDevice->begin(temp->address, qwiic); //Address, Wire port
         }
         break;
       case DEVICE_PRESSURE_LPS25HB:
         {
           LPS25HB *tempDevice = (LPS25HB *)temp->classPtr;
+          struct_LPS25HB *nodeSetting = (struct_LPS25HB *)temp->configPtr; //Create a local pointer that points to same spot as node does
+          if (nodeSetting->powerOnDelayMillis > qwiicPowerOnDelayMillis) qwiicPowerOnDelayMillis = nodeSetting->powerOnDelayMillis; // Increase qwiicPowerOnDelayMillis if required
           temp->online = tempDevice->begin(qwiic, temp->address); //Wire port, Address
         }
         break;
       case DEVICE_PRESSURE_MS5637:
         {
           MS5637 *tempDevice = (MS5637 *)temp->classPtr;
+          struct_MS5637 *nodeSetting = (struct_MS5637 *)temp->configPtr; //Create a local pointer that points to same spot as node does
+          if (nodeSetting->powerOnDelayMillis > qwiicPowerOnDelayMillis) qwiicPowerOnDelayMillis = nodeSetting->powerOnDelayMillis; // Increase qwiicPowerOnDelayMillis if required
           temp->online = tempDevice->begin(qwiic); //Wire port
         }
         break;
       case DEVICE_PHT_BME280:
         {
           BME280 *tempDevice = (BME280 *)temp->classPtr;
+          struct_BME280 *nodeSetting = (struct_BME280 *)temp->configPtr; //Create a local pointer that points to same spot as node does
+          if (nodeSetting->powerOnDelayMillis > qwiicPowerOnDelayMillis) qwiicPowerOnDelayMillis = nodeSetting->powerOnDelayMillis; // Increase qwiicPowerOnDelayMillis if required
           tempDevice->setI2CAddress(temp->address);
           temp->online = tempDevice->beginI2C(qwiic); //Wire port
         }
         break;
       case DEVICE_UV_VEML6075:
         {
           VEML6075 *tempDevice = (VEML6075 *)temp->classPtr;
+          struct_VEML6075 *nodeSetting = (struct_VEML6075 *)temp->configPtr; //Create a local pointer that points to same spot as node does
+          if (nodeSetting->powerOnDelayMillis > qwiicPowerOnDelayMillis) qwiicPowerOnDelayMillis = nodeSetting->powerOnDelayMillis; // Increase qwiicPowerOnDelayMillis if required
           temp->online = tempDevice->begin(qwiic); //Wire port
         }
         break;
       case DEVICE_VOC_CCS811:
         {
           CCS811 *tempDevice = (CCS811 *)temp->classPtr;
+          struct_CCS811 *nodeSetting = (struct_CCS811 *)temp->configPtr; //Create a local pointer that points to same spot as node does
+          if (nodeSetting->powerOnDelayMillis > qwiicPowerOnDelayMillis) qwiicPowerOnDelayMillis = nodeSetting->powerOnDelayMillis; // Increase qwiicPowerOnDelayMillis if required
           temp->online = tempDevice->begin(qwiic); //Wire port
         }
         break;
       case DEVICE_VOC_SGP30:
         {
           SGP30 *tempDevice = (SGP30 *)temp->classPtr;
+          struct_SGP30 *nodeSetting = (struct_SGP30 *)temp->configPtr; //Create a local pointer that points to same spot as node does
+          if (nodeSetting->powerOnDelayMillis > qwiicPowerOnDelayMillis) qwiicPowerOnDelayMillis = nodeSetting->powerOnDelayMillis; // Increase qwiicPowerOnDelayMillis if required
           temp->online = tempDevice->begin(qwiic); //Wire port
         }
         break;
       case DEVICE_CO2_SCD30:
         {
           SCD30 *tempDevice = (SCD30 *)temp->classPtr;
+          struct_SCD30 *nodeSetting = (struct_SCD30 *)temp->configPtr; //Create a local pointer that points to same spot as node does
+          if (nodeSetting->powerOnDelayMillis > qwiicPowerOnDelayMillis) qwiicPowerOnDelayMillis = nodeSetting->powerOnDelayMillis; // Increase qwiicPowerOnDelayMillis if required
           temp->online = tempDevice->begin(qwiic); //Wire port
         }
         break;
       case DEVICE_PHT_MS8607:
         {
           MS8607 *tempDevice = (MS8607 *)temp->classPtr;
+          struct_MS8607 *nodeSetting = (struct_MS8607 *)temp->configPtr; //Create a local pointer that points to same spot as node does
+          if (nodeSetting->powerOnDelayMillis > qwiicPowerOnDelayMillis) qwiicPowerOnDelayMillis = nodeSetting->powerOnDelayMillis; // Increase qwiicPowerOnDelayMillis if required
           temp->online = tempDevice->begin(qwiic); //Wire port
         }
         break;
       case DEVICE_TEMPERATURE_MCP9600:
         {
           MCP9600 *tempDevice = (MCP9600 *)temp->classPtr;
+          struct_MCP9600 *nodeSetting = (struct_MCP9600 *)temp->configPtr; //Create a local pointer that points to same spot as node does
+          if (nodeSetting->powerOnDelayMillis > qwiicPowerOnDelayMillis) qwiicPowerOnDelayMillis = nodeSetting->powerOnDelayMillis; // Increase qwiicPowerOnDelayMillis if required
           temp->online = tempDevice->begin(temp->address, qwiic); //Address, Wire port
         }
         break;
       case DEVICE_HUMIDITY_AHT20:
         {
           AHT20 *tempDevice = (AHT20 *)temp->classPtr;
+          struct_AHT20 *nodeSetting = (struct_AHT20 *)temp->configPtr; //Create a local pointer that points to same spot as node does
+          if (nodeSetting->powerOnDelayMillis > qwiicPowerOnDelayMillis) qwiicPowerOnDelayMillis = nodeSetting->powerOnDelayMillis; // Increase qwiicPowerOnDelayMillis if required
           temp->online = tempDevice->begin(qwiic); //Wire port
         }
         break;
       case DEVICE_HUMIDITY_SHTC3:
         {
           SHTC3 *tempDevice = (SHTC3 *)temp->classPtr;
+          struct_SHTC3 *nodeSetting = (struct_SHTC3 *)temp->configPtr; //Create a local pointer that points to same spot as node does
+          if (nodeSetting->powerOnDelayMillis > qwiicPowerOnDelayMillis) qwiicPowerOnDelayMillis = nodeSetting->powerOnDelayMillis; // Increase qwiicPowerOnDelayMillis if required
           if (tempDevice->begin(qwiic) == 0) //Wire port. Returns 0 on success.
             temp->online = true;
         }
         break;
       case DEVICE_ADC_ADS122C04:
         {
           SFE_ADS122C04 *tempDevice = (SFE_ADS122C04 *)temp->classPtr;
+          struct_ADS122C04 *nodeSetting = (struct_ADS122C04 *)temp->configPtr; //Create a local pointer that points to same spot as node does
+          if (nodeSetting->powerOnDelayMillis > qwiicPowerOnDelayMillis) qwiicPowerOnDelayMillis = nodeSetting->powerOnDelayMillis; // Increase qwiicPowerOnDelayMillis if required
           if (tempDevice->begin(temp->address, qwiic) == true) //Address, Wire port. Returns true on success.
             temp->online = true;
         }
@@ -423,7 +459,7 @@ void printOnlineDevice()
 
   if (temp == NULL)
   {
-    Serial.println(F("printOnlineDevice: No devices detected"));
+    printDebug(F("printOnlineDevice: No devices detected"));
     return;
   }
 
@@ -433,23 +469,23 @@ void printOnlineDevice()
     if (temp->online)
     {
       if (temp->muxAddress == 0)
-        sprintf(sensorOnlineText, "%s online at address 0x%02X\n", getDeviceName(temp->deviceType), temp->address);
+        sprintf(sensorOnlineText, "%s online at address 0x%02X\r\n", getDeviceName(temp->deviceType), temp->address);
       else
-        sprintf(sensorOnlineText, "%s online at address 0x%02X.0x%02X.%d\n", getDeviceName(temp->deviceType), temp->address, temp->muxAddress, temp->portNumber);
+        sprintf(sensorOnlineText, "%s online at address 0x%02X.0x%02X.%d\r\n", getDeviceName(temp->deviceType), temp->address, temp->muxAddress, temp->portNumber);
 
       deviceCount++;
     }
     else
     {
-      sprintf(sensorOnlineText, "%s failed to respond\n", getDeviceName(temp->deviceType));
+      sprintf(sensorOnlineText, "%s failed to respond\r\n", getDeviceName(temp->deviceType));
     }
     Serial.print(sensorOnlineText);
 
     temp = temp->next;
   }
 
   if (settings.printDebugMessages == true)
-    Serial.printf("Device count: %d\n", deviceCount);
+    Serial.printf("Device count: %d\r\n", deviceCount);
 }
 
 //Given the node number, apply the node's configuration settings to the device
@@ -633,7 +669,7 @@ void configureDevice(node * temp)
       }
       break;
     default:
-      Serial.printf("configureDevice: Unknown device type %d: %s\n", deviceType, getDeviceName((deviceType_e)deviceType));
+      Serial.printf("configureDevice: Unknown device type %d: %s\r\n", deviceType, getDeviceName((deviceType_e)deviceType));
       break;
   }
 }
@@ -1154,14 +1190,14 @@ deviceType_e testDevice(uint8_t i2cAddress, uint8_t muxAddress, uint8_t portNumb
     default:
       {
         if (muxAddress == 0)
-          Serial.printf("Unknown device at address (0x%02X)\n", i2cAddress);
+          Serial.printf("Unknown device at address (0x%02X)\r\n", i2cAddress);
         else
-          Serial.printf("Unknown device at address (0x%02X)(Mux:0x%02X Port:%d)\n", i2cAddress, muxAddress, portNumber);
+          Serial.printf("Unknown device at address (0x%02X)(Mux:0x%02X Port:%d)\r\n", i2cAddress, muxAddress, portNumber);
         return DEVICE_UNKNOWN_DEVICE;
       }
       break;
   }
-  Serial.printf("Known I2C address but device failed identification at address 0x%02X\n", i2cAddress);
+  Serial.printf("Known I2C address but device failed identification at address 0x%02X\r\n", i2cAddress);
   return DEVICE_UNKNOWN_DEVICE;
 }
 
@@ -1191,9 +1227,9 @@ deviceType_e testMuxDevice(uint8_t i2cAddress, uint8_t muxAddress, uint8_t portN
     default:
       {
         if (muxAddress == 0)
-          Serial.printf("Unknown device at address (0x%02X)\n", i2cAddress);
+          Serial.printf("Unknown device at address (0x%02X)\r\n", i2cAddress);
         else
-          Serial.printf("Unknown device at address (0x%02X)(Mux:0x%02X Port:%d)\n", i2cAddress, muxAddress, portNumber);
+          Serial.printf("Unknown device at address (0x%02X)(Mux:0x%02X Port:%d)\r\n", i2cAddress, muxAddress, portNumber);
         return DEVICE_UNKNOWN_DEVICE;
       }
       break;