Revised versioning. Updated BSEC library to v1.4.7.4. Added idleTask parameter to BSEC::begin. Added support to include multiple configurations.

Author: BST-Github-Admin

README.md

@@ -2,7 +2,7 @@
 
 ## About BSEC
 
-Bosch Sensortec Environmental Cluster (BSEC) Software v1.4.7.3 released on April 10th, 2019
+Bosch Sensortec Environmental Cluster (BSEC) Software v1.4.7.4 released on July 3rd, 2019
 
 The BSEC fusion library has been conceptualized to provide a higher-level signal processing and fusion for the BME680. The library receives compensated sensor values from the sensor API. It processes the BME680 signals to provide the requested sensor outputs.
 

examples/basic_config_state/basic_config_state.ino

@@ -1,6 +1,21 @@
 #include <EEPROM.h>
 #include "bsec.h"
-#include "bsec_serialized_configurations_iaq.h"
+/* Configure the BSEC library with information about the sensor
+ *  18v/33v = Voltage at Vdd. 1.8V or 3.3V
+ *  3s/300s = BSEC operating mode, BSEC_SAMPLE_RATE_LP or BSEC_SAMPLE_RATE_ULP
+ *  4d/28d = Operating age of the sensor in days
+ *  generic_18v_3s_4d
+ *  generic_18v_3s_28d
+ *  generic_18v_300s_4d
+ *  generic_18v_300s_28d
+ *  generic_33v_3s_4d
+ *  generic_33v_3s_28d
+ *  generic_33v_300s_4d
+ *  generic_33v_300s_28d
+ */
+const uint8_t bsec_config_iaq[] = {
+  #include "config/generic_33v_3s_4d/bsec_iaq.txt"
+};
 
 #define STATE_SAVE_PERIOD	UINT32_C(360 * 60 * 1000) // 360 minutes - 4 times a day
 

examples/basic_config_state/bsec_serialized_configurations_iaq.c

@@ -1,6 +1,21 @@
 #include <EEPROM.h>
 #include "bsec.h"
-#include "bsec_serialized_configurations_iaq.h"
+/* Configure the BSEC library with information about the sensor
+ *  18v/33v = Voltage at Vdd. 1.8V or 3.3V
+ *  3s/300s = BSEC operating mode, BSEC_SAMPLE_RATE_LP or BSEC_SAMPLE_RATE_ULP
+ *  4d/28d = Operating age of the sensor in days
+ *  generic_18v_3s_4d
+ *  generic_18v_3s_28d
+ *  generic_18v_300s_4d
+ *  generic_18v_300s_28d
+ *  generic_33v_3s_4d
+ *  generic_33v_3s_28d
+ *  generic_33v_300s_4d
+ *  generic_33v_300s_28d
+ */
+const uint8_t bsec_config_iaq[] = {
+  #include "config/generic_33v_3s_4d/bsec_iaq.txt"
+};
 
 #define STATE_SAVE_PERIOD  UINT32_C(360 * 60 * 1000) // 360 minutes - 4 times a day
 
@@ -185,7 +200,7 @@ void ulp_plus_button_press()
   */
   Serial.println("Triggering ULP plus.");
   bsec_virtual_sensor_t sensorList[1] = {
-    BSEC_OUTPUT_IAQ_ESTIMATE,
+    BSEC_OUTPUT_IAQ,
   };
 
   iaqSensor.updateSubscription(sensorList, 1, BSEC_SAMPLE_RATE_ULP_MEASUREMENT_ON_DEMAND);

examples/basic_config_state/bsec_serialized_configurations_iaq.h

@@ -1,12 +1,12 @@
 name=BSEC Software Library
-version=1.4.703
+version=1.2.1474
 author=Bosch Sensortec
 maintainer=Bosch Sensortec <contact@bosch-sensortec.com>
 sentence=Bosch Sensortec Environmental Cluster (BSEC) Software library
 url=https://www.bosch-sensortec.com/en/bst/products/all_products/bsec
 paragraph=  for use with the BME680 has been conceptualized to provide higher-level signal processing and fusion for the BME680. The library receives compensated sensor values from the sensor API. It processes the BME680 signals to provide the requested sensor outputs. 
 category=Sensors
-architectures=samd,sam,esp8266,nrf52,esp32
+architectures=samd,sam,esp8266,nrf52,esp32,avr
 includes=bsec.h
 precompiled=true
 ldflags=-lalgobsec

examples/basic_config_state_ulp_plus/basic_config_state_ulp_plus.ino

@@ -40,8 +40,8 @@
  * patent rights of the copyright holder.
  *
  * @file	bsec.cpp
- * @date	20 May 2019
- * @version	1.1
+ * @date	25 July 2019
+ * @version	1.2.1474
  *
  */
 
@@ -88,13 +88,13 @@ void Bsec::begin(uint8_t devId, enum bme680_intf intf, bme680_com_fptr_t read, b
 /**
  * @brief Function to initialize the BSEC library and the BME680 sensor
  */
-void Bsec::begin(uint8_t i2cAddr, TwoWire &i2c)
+void Bsec::begin(uint8_t i2cAddr, TwoWire &i2c, bme680_delay_fptr_t idleTask)
 {
 	_bme680.dev_id = i2cAddr;
 	_bme680.intf = BME680_I2C_INTF;
 	_bme680.read = Bsec::i2cRead;
 	_bme680.write = Bsec::i2cWrite;
-	_bme680.delay_ms = Bsec::delay_ms;
+	_bme680.delay_ms = idleTask;
 	_bme680.amb_temp = 25;
 	_bme680.power_mode = BME680_FORCED_MODE;
 
@@ -106,13 +106,13 @@ void Bsec::begin(uint8_t i2cAddr, TwoWire &i2c)
 /**
  * @brief Function to initialize the BSEC library and the BME680 sensor
  */
-void Bsec::begin(uint8_t chipSelect, SPIClass &spi)
+void Bsec::begin(uint8_t chipSelect, SPIClass &spi, bme680_delay_fptr_t idleTask)
 {
 	_bme680.dev_id = chipSelect;
 	_bme680.intf = BME680_SPI_INTF;
 	_bme680.read = Bsec::spiTransfer;
 	_bme680.write = Bsec::spiTransfer;
-	_bme680.delay_ms = Bsec::delay_ms;
+	_bme680.delay_ms = idleTask;
 	_bme680.amb_temp = 25;
 	_bme680.power_mode = BME680_FORCED_MODE;
 
@@ -189,9 +189,9 @@ bool Bsec::run(void)
 		uint16_t meas_dur = 0;
 
 		bme680_get_profile_dur(&meas_dur, &_bme680);
-		delay_ms(meas_dur);
+		_bme680.delay_ms(meas_dur);
 
-		newData = readProcessData(callTimeNs, bme680Settings);	
+		newData = readProcessData(callTimeNs + (meas_dur * INT64_C(1000000)), bme680Settings);	
 	}
 
 	return newData;