Fixes for latest bosch libraries

Author: GOB52

platformio.ini

@@ -12,11 +12,11 @@ test_framework = googletest
 test_build_src = true
 lib_deps=m5stack/M5Unified
   m5stack/M5UnitUnified
-  https://github.com/boschsensortec/Bosch-BME68x-Library.git @ 1.2.40408
+  boschsensortec/BME68x Sensor library@>=1.3.40408
 
 ; --------------------------------
 [bsec2]
-lib_deps = https://github.com/boschsensortec/Bosch-BSEC2-Library.git @ 1.8.2610
+lib_deps = boschsensortec/bsec2@>=1.10.2610
 
 [m5base]
 monitor_speed = 115200

src/unit/unit_BME688.hpp

@@ -10,13 +10,6 @@
 #ifndef M5_UNIT_ENV_UNIT_BME688_HPP
 #define M5_UNIT_ENV_UNIT_BME688_HPP
 
-#if (defined(ESP_PLATFORM) && (!defined(CONFIG_IDF_TARGET_ESP32C6) &&                                      \
-                               (!defined(ARDUINO_M5Stack_NanoC6) && !defined(ARDUINO_M5STACK_NANOC6)))) || \
-    defined(DOXYGEN_PROCESS)
-#pragma message "Using BSEC2"
-#define UNIT_BME688_USING_BSEC2
-#endif
-
 #include <M5UnitComponent.hpp>
 #include <m5_utility/stl/extension.hpp>
 
@@ -26,14 +19,21 @@
 #include <bme68x/bme68x.h>
 #endif
 
-#if defined(UNIT_BME688_USING_BSEC2)
+#if defined(CONFIG_IDF_TARGET_ESP32C6)
+#pragma message "Not using bsec2"
+
+#else
+#pragma message "Using bsec2"
+#define UNIT_BME688_USING_BSEC2
+
 #if defined(ARDUINO)
 #include <bsec2.h>
 #else
 #include <inc/bsec_datatypes.h>
 #endif
 
 #endif
+
 #include <memory>
 #include <limits>
 #include <initializer_list>