mod: moved from bsec to bsec2, tested on RP2040 and ESP32S3

Author: gbr1

Diff for: examples/SerialDebug/SerialDebug.ino

@@ -5,6 +5,7 @@ ScienceKitCarrier science_kit;
 void setup() {
   Serial.begin(115200);
   science_kit.begin(NO_AUXILIARY_THREADS);
+  science_kit.beginBME688();
 }
 
 void loop() {
@@ -57,6 +58,29 @@ void loop() {
   Serial.print("\t| ");
   Serial.print(science_kit.getResistance());
   Serial.print("\t|| ");
+
+
+
+
+  science_kit.updateBME688();
+  Serial.print(science_kit.getTemperature());
+  Serial.print("\t");
+  Serial.print(science_kit.getPressure());
+  Serial.print("\t");
+  Serial.print(science_kit.getHumidity());
+  Serial.print("\t");
+  Serial.print(science_kit.getAirQuality());
+  Serial.print("\t|| ");
+
+
+
+
+
+
+
   Serial.print("\n");
+
+  //science_kit.updateAPDS();
+  //Serial.println(science_kit.getProximity());
   delay(10);
 }

Diff for: library.properties

@@ -8,4 +8,4 @@ category=Communication
 url=https://github.com/arduino-libraries/Arduino_ScienceKitCarrier
 architectures=mbed,mbed_nano,esp32
 includes=Arduino_ScienceKitCarrier.h
-depends=Arduino_APDS9960,ArduinoBLE,WiFiNINA,INA2xx,Arduino_BMI270_BMM150,BSEC Software Library,Arduino_GroveI2C_Ultrasonic,OneWireNg
+depends=Arduino_APDS9960,ArduinoBLE,WiFiNINA,INA2xx,Arduino_BMI270_BMM150,bsec2,Arduino_GroveI2C_Ultrasonic,OneWireNg

Diff for: src/Arduino_ScienceKitCarrier.cpp

@@ -48,7 +48,7 @@ ScienceKitCarrier::ScienceKitCarrier(){
   resistance_pin = RESISTANCE_PIN;
   opencircuit_resistance = RESISTANCE_CALIBRATION_HIGH;
 
-  bme688 = new Bsec();
+  bme688 = new Bsec2();
   temperature=0.0;
   pressure=0.0;
   humidity=0.0;
@@ -419,39 +419,40 @@ int ScienceKitCarrier::beginBME688(){
   SPI.begin();
   bme688->begin(bme688_cs,SPI);
 
-  if (bme688->bsecStatus != 0){
+  if (bme688->status != 0){
     return ERR_BEGIN_BME;
   }
-  if (bme688->bme68xStatus != 0){
+  if (bme688->sensor.status != 0){
     return ERR_BEGIN_BME;
   }
 
-  bsec_virtual_sensor_t sensorList[13] = {
-    BSEC_OUTPUT_IAQ,
-    BSEC_OUTPUT_STATIC_IAQ,
-    BSEC_OUTPUT_CO2_EQUIVALENT,
-    BSEC_OUTPUT_BREATH_VOC_EQUIVALENT,
-    BSEC_OUTPUT_RAW_TEMPERATURE,
-    BSEC_OUTPUT_RAW_PRESSURE,
-    BSEC_OUTPUT_RAW_HUMIDITY,
-    BSEC_OUTPUT_RAW_GAS,
-    BSEC_OUTPUT_STABILIZATION_STATUS,
-    BSEC_OUTPUT_RUN_IN_STATUS,
-    BSEC_OUTPUT_SENSOR_HEAT_COMPENSATED_TEMPERATURE,
-    BSEC_OUTPUT_SENSOR_HEAT_COMPENSATED_HUMIDITY,
-    BSEC_OUTPUT_GAS_PERCENTAGE
-  };
-
-  bme688->updateSubscription(sensorList, 13, BSEC_SAMPLE_RATE_CONT);
+  bsecSensor sensorList[14] = {
+            BSEC_OUTPUT_IAQ,
+            BSEC_OUTPUT_RAW_TEMPERATURE,
+            BSEC_OUTPUT_RAW_PRESSURE,
+            BSEC_OUTPUT_RAW_HUMIDITY,
+            BSEC_OUTPUT_RAW_GAS,
+            BSEC_OUTPUT_STABILIZATION_STATUS,
+            BSEC_OUTPUT_RUN_IN_STATUS,
+            BSEC_OUTPUT_SENSOR_HEAT_COMPENSATED_TEMPERATURE,
+            BSEC_OUTPUT_SENSOR_HEAT_COMPENSATED_HUMIDITY,
+            BSEC_OUTPUT_STATIC_IAQ,
+            BSEC_OUTPUT_CO2_EQUIVALENT,
+            BSEC_OUTPUT_BREATH_VOC_EQUIVALENT,
+            BSEC_OUTPUT_GAS_PERCENTAGE,
+            BSEC_OUTPUT_COMPENSATED_GAS
+    };
+
+  bme688->updateSubscription(sensorList, 14, BSEC_SAMPLE_RATE_CONT);
   return 0;
 }
 
 void ScienceKitCarrier::updateBME688(){
   if (bme688->run()){
-    temperature=bme688->temperature;
-    pressure=(bme688->pressure)/100.0;
-    humidity=bme688->humidity;
-    airquality=bme688->iaq;
+    temperature=bme688->getData(BSEC_OUTPUT_SENSOR_HEAT_COMPENSATED_TEMPERATURE).signal;
+    pressure=bme688->getData(BSEC_OUTPUT_RAW_PRESSURE).signal;
+    humidity=bme688->getData(BSEC_OUTPUT_SENSOR_HEAT_COMPENSATED_HUMIDITY).signal;
+    airquality=bme688->getData(BSEC_OUTPUT_IAQ).signal;
   }
 }
 

Diff for: src/Arduino_ScienceKitCarrier.h

@@ -32,7 +32,9 @@
 #include <Wire.h>
 #include "Arduino_APDS9960.h"
 #include "INA.h"
-#include "bsec.h"
+
+#include "bsec2.h"
+
 #include "Arduino_BMI270_BMM150.h"
 #include "Arduino_GroveI2C_Ultrasonic.h"
 
@@ -69,7 +71,7 @@ class ScienceKitCarrier{
     uint8_t resistance_pin;
     float resistance, opencircuit_resistance;
 
-    Bsec * bme688;
+    Bsec2 * bme688;
     float temperature, pressure, humidity, airquality;
     uint8_t bme688_cs;