Merge pull request #2467 from meshtastic/BSEC2

use BSEC2

platformio.ini

@@ -102,7 +102,8 @@ lib_deps =
   adafruit/Adafruit Unified Sensor@^1.1.9
   adafruit/Adafruit BMP280 Library@^2.6.6
   adafruit/Adafruit BME280 Library@^2.2.2
-  https://github.com/meshtastic/BSEC-Arduino-library.git#452f9a7ffa8b53e1debe2c454fe375dfad98b507
+  boschsensortec/BSEC2 Software Library@^1.3.2200
+  boschsensortec/BME68x Sensor Library@^1.1.40407
   adafruit/Adafruit MCP9808 Library@^2.0.0
   adafruit/Adafruit INA260 Library@^1.5.0
   adafruit/Adafruit INA219@^1.2.0

src/modules/Telemetry/Sensor/BME680Sensor.cpp

@@ -13,8 +13,8 @@ int32_t BME680Sensor::runOnce()
         return DEFAULT_SENSOR_MINIMUM_WAIT_TIME_BETWEEN_READS;
     }
     bme680.begin(nodeTelemetrySensorsMap[sensorType], Wire);
-    if (bme680.bsecStatus == BSEC_OK) {
-        bme680.setConfig(bsec_config_iaq);
+    if (bme680.status == BSEC_OK) {
+        bme680.setConfig(Default_H2S_NonH2S_config);
         loadState();
         bme680.updateSubscription(sensorList, 13, BSEC_SAMPLE_RATE_LP);
         status = 1;
@@ -30,10 +30,12 @@ void BME680Sensor::setup() {}
 bool BME680Sensor::getMetrics(meshtastic_Telemetry *measurement)
 {
     bme680.run();
-    measurement->variant.environment_metrics.temperature = bme680.temperature;
-    measurement->variant.environment_metrics.relative_humidity = bme680.humidity;
-    measurement->variant.environment_metrics.barometric_pressure = bme680.pressure / 100.0F;
-    measurement->variant.environment_metrics.gas_resistance = bme680.gasResistance / 1000.0;
+
+    measurement->variant.environment_metrics.temperature = bme680.getData(BSEC_OUTPUT_SENSOR_HEAT_COMPENSATED_TEMPERATURE).signal;
+    measurement->variant.environment_metrics.relative_humidity =
+        bme680.getData(BSEC_OUTPUT_SENSOR_HEAT_COMPENSATED_HUMIDITY).signal;
+    measurement->variant.environment_metrics.barometric_pressure = bme680.getData(BSEC_OUTPUT_RAW_PRESSURE).signal / 100.0F;
+    measurement->variant.environment_metrics.gas_resistance = bme680.getData(BSEC_OUTPUT_RAW_GAS).signal / 1000.0;
     // Check if we need to save state to filesystem (every STATE_SAVE_PERIOD ms)
     updateState();
     return true;
@@ -62,12 +64,13 @@ void BME680Sensor::updateState()
     bool update = false;
     if (stateUpdateCounter == 0) {
         /* First state update when IAQ accuracy is >= 3 */
-        if (bme680.iaqAccuracy >= 3) {
-            LOG_DEBUG("%s state update IAQ accuracy %u >= 3\n", sensorName, bme680.iaqAccuracy);
+        accuracy = bme680.getData(BSEC_OUTPUT_IAQ).accuracy;
+        if (accuracy >= 3) {
+            LOG_DEBUG("%s state update IAQ accuracy %u >= 3\n", sensorName, accuracy);
             update = true;
             stateUpdateCounter++;
         } else {
-            LOG_DEBUG("%s not updated, IAQ accuracy is %u >= 3\n", sensorName, bme680.iaqAccuracy);
+            LOG_DEBUG("%s not updated, IAQ accuracy is %u >= 3\n", sensorName, accuracy);
         }
     } else {
         /* Update every STATE_SAVE_PERIOD minutes */

src/modules/Telemetry/Sensor/BME680Sensor.h

@@ -1,22 +1,21 @@
 #include "../mesh/generated/meshtastic/telemetry.pb.h"
 #include "TelemetrySensor.h"
-#include <bsec.h>
+#include <bsec2.h>
 
 #define STATE_SAVE_PERIOD UINT32_C(360 * 60 * 1000) // That's 6 hours worth of millis()
 
-const uint8_t bsec_config_iaq[] = {
-#include <config/generic_33v_3s_4d/bsec_iaq.txt>
-};
+#include "config/Default_H2S_NonH2S/Default_H2S_NonH2S.h"
 
 class BME680Sensor : virtual public TelemetrySensor
 {
   private:
-    Bsec bme680;
+    Bsec2 bme680;
 
   protected:
     virtual void setup() override;
     const char *bsecConfigFileName = "/prefs/bsec.dat";
     uint8_t bsecState[BSEC_MAX_STATE_BLOB_SIZE] = {0};
+    uint8_t accuracy = 0;
     uint16_t stateUpdateCounter = 0;
     bsec_virtual_sensor_t sensorList[13] = {BSEC_OUTPUT_IAQ,
                                             BSEC_OUTPUT_STATIC_IAQ,

variants/Dongle_nRF52840-pca10059-v1/platformio.ini

@@ -3,6 +3,7 @@ extends = nrf52840_base
 board = nordic_pca10059
 board_level = extra
 build_flags = ${nrf52840_base.build_flags} -Ivariants/Dongle_nRF52840-pca10059-v1 -D NORDIC_PCA10059
+  -L "${platformio.libdeps_dir}/${this.__env__}/BSEC2 Software Library/src/cortex-m4/fpv4-sp-d16-hard"
 build_src_filter = ${nrf52_base.build_src_filter} +<../variants/Dongle_nRF52840-pca10059-v1>
 lib_deps = 
   ${nrf52840_base.lib_deps}

variants/MakePython_nRF52840_eink/platformio.ini

@@ -3,6 +3,7 @@ board_level = extra
 extends = nrf52840_base
 board = nordic_pca10059
 build_flags = ${nrf52840_base.build_flags} -Ivariants/MakePython_nRF52840_eink -D PRIVATE_HW
+  -L "${platformio.libdeps_dir}/${this.__env__}/BSEC2 Software Library/src/cortex-m4/fpv4-sp-d16-hard"
   -D PIN_EINK_EN
 build_src_filter = ${nrf52_base.build_src_filter} +<../variants/MakePython_nRF52840_eink>
 lib_deps = 

variants/MakePython_nRF52840_oled/platformio.ini

@@ -3,6 +3,7 @@ board_level = extra
 extends = nrf52840_base
 board = nordic_pca10059
 build_flags = ${nrf52840_base.build_flags} -Ivariants/MakePython_nRF52840_oled -D PRIVATE_HW
+  -L "${platformio.libdeps_dir}/${this.__env__}/BSEC2 Software Library/src/cortex-m4/fpv4-sp-d16-hard"
 build_src_filter = ${nrf52_base.build_src_filter} +<../variants/MakePython_nRF52840_oled>
 lib_deps = 
   ${nrf52840_base.lib_deps}

variants/ai-c3/platformio.ini

@@ -5,10 +5,4 @@ board_level = extra
 build_flags = ${esp32c3_base.build_flags}
   -D PRIVATE_HW
   -I variants/ai-c3
-; as long as BSEC2 Software Library is not supported remove Sensors from build 
-build_src_filter = ${esp32c3_base.build_src_filter}
-  -<modules/Telemetry/EnvironmentTelemetry.cpp>
-  -<modules/Telemetry/AirQualityTelemetry.cpp>
-  -<modules/Telemetry/Sensor>
-lib_ignore = ${esp32c3_base.lib_ignore}
-  BSEC Software Library
+

variants/ai-c3/variant.h

@@ -1,6 +1,3 @@
-#define HAS_TELEMETRY 0 // as long as BSEC2 is not supported
-#define HAS_SENSOR 0    // as long as BSEC2 is not supported
-
 #define SDA 0
 #define SCL 1
 #define I2C_SDA SDA

variants/feather_diy/platformio.ini

@@ -4,6 +4,7 @@ extends = nrf52840_base
 board = adafruit_feather_nrf52840
 board_level = extra
 build_flags = ${nrf52840_base.build_flags} -Ivariants/feather_diy -Dfeather_diy
+  -L "${platformio.libdeps_dir}/${this.__env__}/BSEC2 Software Library/src/cortex-m4/fpv4-sp-d16-hard"
 build_src_filter = ${nrf52_base.build_src_filter} +<../variants/feather_diy>
 lib_deps = 
   ${nrf52840_base.lib_deps}

variants/lora_relay_v1/platformio.ini

@@ -15,6 +15,7 @@ build_flags = ${nrf52840_base.build_flags} -Ivariants/lora_relay_v1
   -DTFT_DC=ST7735_RS
   -DTFT_RST=ST7735_RESET
   -DSPI_FREQUENCY=27000000
+  -L "${platformio.libdeps_dir}/${this.__env__}/BSEC2 Software Library/src/cortex-m4/fpv4-sp-d16-hard"
 build_src_filter = ${nrf52_base.build_src_filter} +<../variants/lora_relay_v1>
 lib_deps = 
   ${nrf52840_base.lib_deps}

variants/lora_relay_v2/platformio.ini

@@ -17,6 +17,7 @@ build_flags = ${nrf52840_base.build_flags} -Ivariants/lora_relay_v2
   -DSPI_FREQUENCY=27000000
   -DTFT_WR=ST7735_SDA
   -DTFT_SCLK=ST7735_SCK
+  -L "${platformio.libdeps_dir}/${this.__env__}/BSEC2 Software Library/src/cortex-m4/fpv4-sp-d16-hard"
 build_src_filter = ${nrf52_base.build_src_filter} +<../variants/lora_relay_v2>
 lib_deps = 
   ${nrf52840_base.lib_deps}

variants/pca10056-rc-clock/platformio.ini

@@ -5,4 +5,5 @@ extends = nrf52840_base
 board = nrf52840_dk_modified
 # add our variants files to the include and src paths
 build_flags = ${nrf52_base.build_flags} -Ivariants/pca10056-rc-clock
+  -L "${platformio.libdeps_dir}/${this.__env__}/BSEC2 Software Library/src/cortex-m4/fpv4-sp-d16-hard"
 build_src_filter = ${nrf52_base.build_src_filter} +<../variants/pca10056-rc-clock>

variants/rak4631/platformio.ini

@@ -3,6 +3,7 @@
 extends = nrf52840_base
 board = wiscore_rak4631
 build_flags = ${nrf52840_base.build_flags} -Ivariants/rak4631 -D RAK_4631
+  -L "${platformio.libdeps_dir}/${this.__env__}/BSEC2 Software Library/src/cortex-m4/fpv4-sp-d16-hard"
 build_src_filter = ${nrf52_base.build_src_filter} +<../variants/rak4631> +<mesh/eth/> +<mesh/api/> +<mqtt/>
 lib_deps = 
   ${nrf52840_base.lib_deps}

variants/rak4631_epaper/platformio.ini

@@ -3,6 +3,7 @@
 extends = nrf52840_base
 board = wiscore_rak4631
 build_flags = ${nrf52840_base.build_flags} -Ivariants/rak4631_epaper -D RAK_4631
+  -L "${platformio.libdeps_dir}/${this.__env__}/BSEC2 Software Library/src/cortex-m4/fpv4-sp-d16-hard"
 build_src_filter = ${nrf52_base.build_src_filter} +<../variants/rak4631_epaper>
 lib_deps = 
   ${nrf52840_base.lib_deps}

variants/rak4631_epaper_onrxtx/platformio.ini

@@ -4,6 +4,7 @@ board_level = extra
 extends = nrf52840_base
 board = wiscore_rak4631
 build_flags = ${nrf52840_base.build_flags} -Ivariants/rak4631_epaper -D RAK_4631
+  -L "${platformio.libdeps_dir}/${this.__env__}/BSEC2 Software Library/src/cortex-m4/fpv4-sp-d16-hard"
   -D PIN_EINK_EN=34
 build_src_filter = ${nrf52_base.build_src_filter} +<../variants/rak4631_epaper_onrxtx>
 lib_deps = 

variants/t-echo/platformio.ini

@@ -8,7 +8,8 @@ debug_tool = jlink
 # define build flags for the TFT_eSPI library - NOTE: WE NOT LONGER USE TFT_eSPI, it was for an earlier version of the TTGO eink screens
 # -DBUSY_PIN=3 -DRST_PIN=2 -DDC_PIN=28 -DCS_PIN=30
 # add -DCFG_SYSVIEW if you want to use the Segger systemview tool for OS profiling.
-build_flags = ${nrf52840_base.build_flags} -Ivariants/t-echo 
+build_flags = ${nrf52840_base.build_flags} -Ivariants/t-echo
+  -L "${platformio.libdeps_dir}/${this.__env__}/BSEC2 Software Library/src/cortex-m4/fpv4-sp-d16-hard"
 build_src_filter = ${nrf52_base.build_src_filter} +<../variants/t-echo>
 lib_deps = 
   ${nrf52840_base.lib_deps}