Merge branch 'master' into master

nseidle · web-flow · commit 89a0530e7408 · 2020-12-31T11:42:46.000-07:00
diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
-SparkFun SCD30 CO2 Sensor Library
+SparkFun SCD30 CO₂ Sensor Library
 ===========================================================
 
-![SparkFun SCD30 CO2 Sensor](https://cdn.sparkfun.com//assets/parts/1/2/9/8/4/SparkFun_Sensirion_SCD30.jpg)
+![SparkFun SCD30 CO₂ Sensor](https://cdn.sparkfun.com//assets/parts/1/2/9/8/4/SparkFun_Sensirion_SCD30.jpg)
 
 [*SparkX CO₂ Humidity and Temperature Sensor - SCD30 (SPX-14751)*](https://www.sparkfun.com/products/14751)
 
@@ -20,6 +20,7 @@ Thanks to!
 * [jobr97](https://github.com/jobr97) for adding the getTemperatureOffset() method
 * [bobobo1618](https://github.com/bobobo1618) for writing a CRC check and improving the return values of the library
 * [labeneator](https://github.com/labeneator) for adding method to disable calibrate at begin
+* [AndreasExner](https://github.com/AndreasExner) for adding [reset and getAutoSelfCalibration methods](https://github.com/sparkfun/SparkFun_SCD30_Arduino_Library/pull/17)
 
 Repository Contents
 -------------------
diff --git a/examples/Example4_DisableCalibrate/Example4_DisableCalibrate.ino b/examples/Example4_DisableCalibrate/Example4_DisableCalibrate.ino
@@ -36,6 +36,12 @@ void setup()
             ;
     }
 
+    Serial.print("Auto calibration set to ");
+    if (airSensor.getAutoSelfCalibration() == true)
+        Serial.println("true");
+    else
+        Serial.println("false");
+
     //The SCD30 has data ready every two seconds
 }
 
@@ -58,4 +64,4 @@ void loop()
         Serial.println("Waiting for new data");
 
     delay(500);
-}
+}
diff --git a/keywords.txt b/keywords.txt
@@ -6,43 +6,44 @@
 # Datatypes (KEYWORD1)
 #######################################
 
-SCD30				KEYWORD1
+SCD30	KEYWORD1
 
 #######################################
 # Methods and Functions (KEYWORD2)
 #######################################
 
-SCD30				KEYWORD2
-begin				KEYWORD2
-beginMeasuring			KEYWORD2
-getCO2				KEYWORD2
-getHumidity			KEYWORD2
-getTemperature			KEYWORD2
-getTemperatureOffset		KEYWORD2
-getAltitudeCompensation		KEYWORD2
-setMeasurementInterval		KEYWORD2
-setAmbientPressure		KEYWORD2
-setAltitudeCompensation		KEYWORD2
-setAutoSelfCalibration		KEYWORD2
-setTemperatureOffset		KEYWORD2
-setForcedRecalibrationFactor 	KEYWORD2
-dataAvailable			KEYWORD2
-readMeasurement			KEYWORD2
-sendCommand			KEYWORD2
-sendCommand			KEYWORD2
-readRegister			KEYWORD2
-computeCRC8			KEYWORD2
+SCD30	KEYWORD2
+begin	KEYWORD2
+beginMeasuring	KEYWORD2
+getCO2	KEYWORD2
+getHumidity	KEYWORD2
+getTemperature	KEYWORD2
+getTemperatureOffset	KEYWORD2
+setMeasurementInterval	KEYWORD2
+setAmbientPressure	KEYWORD2
+setAltitudeCompensation	KEYWORD2
+setAutoSelfCalibration	KEYWORD2
+setTemperatureOffset	KEYWORD2
+setForcedRecalibrationFactor	KEYWORD2
+dataAvailable	KEYWORD2
+readMeasurement	KEYWORD2
+sendCommand	KEYWORD2
+sendCommand	KEYWORD2
+readRegister	KEYWORD2
+computeCRC8	KEYWORD2
+getAutoSelfCalibration	KEYWORD2
+reset	KEYWORD2
 
 #######################################
 # Constants (LITERAL1)
 #######################################
 
-SCD30_ADDRESS				LITERAL1
-COMMAND_CONTINUOUS_MEASUREMENT		LITERAL1
+SCD30_ADDRESS	LITERAL1
+COMMAND_CONTINUOUS_MEASUREMENT	LITERAL1
 COMMAND_SET_MEASUREMENT_INTERVAL	LITERAL1
-COMMAND_GET_DATA_READY			LITERAL1
-COMMAND_READ_MEASUREMENT		LITERAL1
+COMMAND_GET_DATA_READY	LITERAL1
+COMMAND_READ_MEASUREMENT	LITERAL1
 COMMAND_AUTOMATIC_SELF_CALIBRATION	LITERAL1
 COMMAND_SET_FORCED_RECALIBRATION_FACTOR	LITERAL1
-COMMAND_SET_TEMPERATURE_OFFSET		LITERAL1
+COMMAND_SET_TEMPERATURE_OFFSET	LITERAL1
 COMMAND_SET_ALTITUDE_COMPENSATION	LITERAL1
diff --git a/library.properties b/library.properties
@@ -1,5 +1,5 @@
 name=SparkFun SCD30 Arduino Library
-version=1.0.8
+version=1.0.9
 author=SparkFun Electronics
 maintainer=SparkFun Electronics <sparkfun.com>
 sentence=Library for the Sensirion SCD30 CO2 Sensor
diff --git a/src/SparkFun_SCD30_Arduino_Library.cpp b/src/SparkFun_SCD30_Arduino_Library.cpp
@@ -159,6 +159,25 @@ bool SCD30::setAmbientPressure(uint16_t pressure_mbar)
   return sendCommand(COMMAND_CONTINUOUS_MEASUREMENT, pressure_mbar);
 }
 
+// SCD30 soft reset
+void SCD30::reset()
+{
+	sendCommand(COMMAND_RESET);
+	
+}
+
+// Get the current ASC setting
+bool SCD30::getAutoSelfCalibration()
+{
+  uint16_t response = readRegister(COMMAND_AUTOMATIC_SELF_CALIBRATION);
+  if (response == 1) {
+    return true;
+  }
+  else {
+	return false;
+  }	
+}
+
 //Begins continuous measurements
 //Continuous measurement status is saved in non-volatile memory. When the sensor
 //is powered down while continuous measurement mode is active SCD30 will measure
diff --git a/src/SparkFun_SCD30_Arduino_Library.h b/src/SparkFun_SCD30_Arduino_Library.h
@@ -44,6 +44,7 @@
 #define COMMAND_SET_FORCED_RECALIBRATION_FACTOR 0x5204
 #define COMMAND_SET_TEMPERATURE_OFFSET 0x5403
 #define COMMAND_SET_ALTITUDE_COMPENSATION 0x5102
+#define COMMAND_RESET 0xD304
 
 class SCD30
 {
@@ -68,9 +69,12 @@ class SCD30
 	bool setAutoSelfCalibration(bool enable);
 	bool setForcedRecalibrationFactor(uint16_t concentration);
 	bool setTemperatureOffset(float tempOffset);
+	bool getAutoSelfCalibration(void);
 
 	bool dataAvailable();
 	bool readMeasurement();
+	
+	void reset();
 
 	bool sendCommand(uint16_t command, uint16_t arguments);
 	bool sendCommand(uint16_t command);

Original file line number	Diff line number	Diff line change
`@@ -36,6 +36,12 @@ void setup()`
`36`	`36`	`;`
`37`	`37`	`}`
`38`	`38`
	`39`	`+ Serial.print("Auto calibration set to ");`
	`40`	`+ if (airSensor.getAutoSelfCalibration() == true)`
	`41`	`+ Serial.println("true");`
	`42`	`+ else`
	`43`	`+ Serial.println("false");`
	`44`	`+`
`39`	`45`	`//The SCD30 has data ready every two seconds`
`40`	`46`	`}`
`41`	`47`
`@@ -58,4 +64,4 @@ void loop()`
`58`	`64`	`Serial.println("Waiting for new data");`
`59`	`65`
`60`	`66`	`delay(500);`
`61`		`-}`
	`67`	`+}`