Add getMeasurementInterval helper. Re-sort .h and keywords to match.

Author: nseidle

examples/Example2_SetOptions/Example2_SetOptions.ino

@@ -40,27 +40,34 @@ void setup()
       ;
   }
 
-  airSensor.setMeasurementInterval(4); //Change number of seconds between measurements: 2 to 1800 (30 minutes)
+  airSensor.setMeasurementInterval(16); //Change number of seconds between measurements: 2 to 1800 (30 minutes), stored in non-volatile memory of SCD30
+
+  //While the setting is recorded, it is not immediately available to be read.
+  delay(200);
+
+  int interval = airSensor.getMeasurementInterval();
+  Serial.print("Measurement Interval: ");
+  Serial.println(interval);
+
+  //My desk is ~1600m above sealevel
+  airSensor.setAltitudeCompensation(1600); //Set altitude of the sensor in m, stored in non-volatile memory of SCD30
 
   //Read altitude compensation value
   unsigned int altitude = airSensor.getAltitudeCompensation();
   Serial.print("Current altitude: ");
   Serial.print(altitude);
   Serial.println("m");
 
-  //My desk is ~1600m above sealevel
-  airSensor.setAltitudeCompensation(1600); //Set altitude of the sensor in m, stored in non-volatile memory of SCD30
-
   //Pressure in Boulder, CO is 24.65inHg or 834.74mBar
   airSensor.setAmbientPressure(835); //Current ambient pressure in mBar: 700 to 1200, will overwrite altitude compensation
 
+  airSensor.setTemperatureOffset(5); //Optionally we can set temperature offset to 5°C, stored in non-volatile memory of SCD30
+
   //Read temperature offset
   float offset = airSensor.getTemperatureOffset();
   Serial.print("Current temp offset: ");
   Serial.print(offset, 2);
   Serial.println("C");
-
-  //airSensor.setTemperatureOffset(5); //Optionally we can set temperature offset to 5°C, stored in non-volatile memory of SCD30
 }
 
 void loop()

keywords.txt

@@ -17,22 +17,30 @@ begin	KEYWORD2
 enableDebugging	KEYWORD2
 beginMeasuring	KEYWORD2
 StopMeasurement	KEYWORD2
+
+setAmbientPressure	KEYWORD2
+
 getSettingValue	KEYWORD2
-getForcedRecalibration	KEYWORD2
-getMeasurementInterval	KEYWORD2
-getTemperatureOffset	KEYWORD2
-getAltitudeCompensation	KEYWORD2
 getFirmwareVersion	KEYWORD2
 getCO2	KEYWORD2
 getHumidity	KEYWORD2
 getTemperature	KEYWORD2
+
+getMeasurementInterval	KEYWORD2
 setMeasurementInterval	KEYWORD2
-setAmbientPressure	KEYWORD2
+
+getAltitudeCompensation	KEYWORD2
 setAltitudeCompensation	KEYWORD2
+
+getAutoSelfCalibration	KEYWORD2
 setAutoSelfCalibration	KEYWORD2
+
+getForcedRecalibration	KEYWORD2
 setForcedRecalibrationFactor	KEYWORD2
+
+getTemperatureOffset	KEYWORD2
 setTemperatureOffset	KEYWORD2
-getAutoSelfCalibration	KEYWORD2
+
 dataAvailable	KEYWORD2
 readMeasurement	KEYWORD2
 reset	KEYWORD2

src/SparkFun_SCD30_Arduino_Library.cpp

@@ -74,7 +74,7 @@ bool SCD30::begin(TwoWire &wirePort, bool autoCalibrate, bool measBegin)
   //Check for device to respond correctly
   if (beginMeasuring() == true) //Start continuous measurements
   {
-    setMeasurementInterval(2);    //2 seconds between measurements
+    setMeasurementInterval(2);             //2 seconds between measurements
     setAutoSelfCalibration(autoCalibrate); //Enable auto-self-calibration
 
     return (true);
@@ -87,8 +87,8 @@ bool SCD30::begin(TwoWire &wirePort, bool autoCalibrate, bool measBegin)
 //You can also call it with other streams like Serial1, SerialUSB, etc.
 void SCD30::enableDebugging(Stream &debugPort)
 {
-	_debugPort = &debugPort;
-	_printDebug = true;
+  _debugPort = &debugPort;
+  _printDebug = true;
 }
 
 //Returns the latest available CO2 level
@@ -192,19 +192,20 @@ bool SCD30::setAmbientPressure(uint16_t pressure_mbar)
 // SCD30 soft reset
 void SCD30::reset()
 {
-	sendCommand(COMMAND_RESET);
-
+  sendCommand(COMMAND_RESET);
 }
 
 // Get the current ASC setting
 bool SCD30::getAutoSelfCalibration()
 {
   uint16_t response = readRegister(COMMAND_AUTOMATIC_SELF_CALIBRATION);
-  if (response == 1) {
+  if (response == 1)
+  {
     return true;
   }
-  else {
-	return false;
+  else
+  {
+    return false;
   }
 }
 
@@ -227,7 +228,7 @@ bool SCD30::beginMeasuring(void)
 // Stop continuous measurement
 bool SCD30::StopMeasurement(void)
 {
-  return(sendCommand(COMMAND_STOP_MEAS));
+  return (sendCommand(COMMAND_STOP_MEAS));
 }
 
 //Sets interval between measurements
@@ -237,6 +238,15 @@ bool SCD30::setMeasurementInterval(uint16_t interval)
   return sendCommand(COMMAND_SET_MEASUREMENT_INTERVAL, interval);
 }
 
+//Gets interval between measurements
+//2 seconds to 1800 seconds (30 minutes)
+uint16_t SCD30::getMeasurementInterval(void)
+{
+  uint16_t interval = 0;
+  getSettingValue(COMMAND_SET_MEASUREMENT_INTERVAL, &interval);
+  return (interval);
+}
+
 //Returns true when data is available
 bool SCD30::dataAvailable()
 {
@@ -256,9 +266,12 @@ bool SCD30::readMeasurement()
   if (dataAvailable() == false)
     return (false);
 
-  ByteToFl tempCO2; tempCO2.value = 0;
-  ByteToFl tempHumidity; tempHumidity.value = 0;
-  ByteToFl tempTemperature; tempTemperature.value = 0;
+  ByteToFl tempCO2;
+  tempCO2.value = 0;
+  ByteToFl tempHumidity;
+  tempHumidity.value = 0;
+  ByteToFl tempTemperature;
+  tempTemperature.value = 0;
 
   _i2cPort->beginTransmission(SCD30_ADDRESS);
   _i2cPort->write(COMMAND_READ_MEASUREMENT >> 8);   //MSB
@@ -283,21 +296,21 @@ bool SCD30::readMeasurement()
       case 1:
       case 3:
       case 4:
-        tempCO2.array[x < 3 ? 3-x : 4-x] = incoming;
+        tempCO2.array[x < 3 ? 3 - x : 4 - x] = incoming;
         bytesToCrc[x % 3] = incoming;
         break;
       case 6:
       case 7:
       case 9:
       case 10:
-        tempTemperature.array[x < 9 ? 9-x : 10-x] = incoming;
+        tempTemperature.array[x < 9 ? 9 - x : 10 - x] = incoming;
         bytesToCrc[x % 3] = incoming;
         break;
       case 12:
       case 13:
       case 15:
       case 16:
-        tempHumidity.array[x < 15 ? 15-x : 16-x] = incoming;
+        tempHumidity.array[x < 15 ? 15 - x : 16 - x] = incoming;
         bytesToCrc[x % 3] = incoming;
         break;
       default:

src/SparkFun_SCD30_Arduino_Library.h

@@ -81,27 +81,31 @@ class SCD30
 	bool beginMeasuring(void);
 	bool StopMeasurement(void); // paulvha
 
-	// based on paulvha
+	bool setAmbientPressure(uint16_t pressure_mbar);
+
 	bool getSettingValue(uint16_t registerAddress, uint16_t *val);
-	bool getForcedRecalibration(uint16_t *val) { return (getSettingValue(COMMAND_SET_FORCED_RECALIBRATION_FACTOR, val)); }
-	bool getMeasurementInterval(uint16_t *val) { return (getSettingValue(COMMAND_SET_MEASUREMENT_INTERVAL, val)); }
-	bool getTemperatureOffset(uint16_t *val) { return (getSettingValue(COMMAND_SET_TEMPERATURE_OFFSET, val)); }
-	bool getAltitudeCompensation(uint16_t *val) { return (getSettingValue(COMMAND_SET_ALTITUDE_COMPENSATION, val)); }
 	bool getFirmwareVersion(uint16_t *val) { return (getSettingValue(COMMAND_READ_FW_VER, val)); }
-
 	uint16_t getCO2(void);
 	float getHumidity(void);
 	float getTemperature(void);
-	float getTemperatureOffset(void);
-	uint16_t getAltitudeCompensation(void);
 
+	uint16_t getMeasurementInterval(void);
+	bool getMeasurementInterval(uint16_t *val) { return (getSettingValue(COMMAND_SET_MEASUREMENT_INTERVAL, val)); }
 	bool setMeasurementInterval(uint16_t interval);
-	bool setAmbientPressure(uint16_t pressure_mbar);
+
+	uint16_t getAltitudeCompensation(void);
+	bool getAltitudeCompensation(uint16_t *val) { return (getSettingValue(COMMAND_SET_ALTITUDE_COMPENSATION, val)); }
 	bool setAltitudeCompensation(uint16_t altitude);
+
+	bool getAutoSelfCalibration(void);
 	bool setAutoSelfCalibration(bool enable);
+
+	bool getForcedRecalibration(uint16_t *val) { return (getSettingValue(COMMAND_SET_FORCED_RECALIBRATION_FACTOR, val)); }
 	bool setForcedRecalibrationFactor(uint16_t concentration);
+
+	float getTemperatureOffset(void);
+	bool getTemperatureOffset(uint16_t *val) { return (getSettingValue(COMMAND_SET_TEMPERATURE_OFFSET, val)); }
 	bool setTemperatureOffset(float tempOffset);
-	bool getAutoSelfCalibration(void);
 
 	bool dataAvailable();
 	bool readMeasurement();