v0.6.7 fixed BME680 issue and updated dependencies

kike-canaries · Apr 12, 2023 · 51a2c31 · 51a2c31
1 parent 7228e3d
commit 51a2c31
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 19 deletions.
diff --git a/library.json b/library.json
@@ -1,6 +1,6 @@
 {
   "name": "CanAirIO Air Quality Sensors Library",
-  "version": "0.6.6",
+  "version": "0.6.7",
   "homepage":"https://canair.io",
   "keywords": 
   [ 
@@ -75,7 +75,7 @@
   "license": "GPL-3.0-only",
   "dependencies":
   [
-    {"name":"Adafruit Unified Sensor", "owner":"adafruit", "version":"1.1.7"},
+    {"name":"Adafruit Unified Sensor", "owner":"adafruit", "version":"1.1.9"},
     {"name":"Adafruit BME280 Library", "owner":"adafruit","version":"2.2.2"},
     {"name":"Adafruit BMP280 Library", "owner":"adafruit","version":"2.6.6"},
     {"name":"Adafruit BME680 Library","owner":"adafruit","version":"2.0.2"},
@@ -87,7 +87,7 @@
     {"name":"MH-Z19", "owner":"wifwaf", "version":"1.5.4"},
     {"name":"S8_UART", "owner":"jcomas", "version":"1.0.1"},
     {"name":"Sensirion Core","owner":"sensirion","version":"0.6.0"},
-    {"name":"Sensirion I2C SCD4x","owner":"sensirion","version":"0.3.1"},
+    {"name":"Sensirion I2C SCD4x","owner":"sensirion","version":"0.4.0"},
 
     {"name":"DHT_nonblocking", "version":"https://github.com/hpsaturn/DHT_nonblocking.git#ec6e5b9"},
     {"name":"AHTxx", "version":"https://github.com/enjoyneering/AHTxx.git#eb21571"},

diff --git a/library.properties b/library.properties
@@ -1,5 +1,5 @@
 name=CanAirIO Air Quality Sensors Library
-version=0.6.6
+version=0.6.7
 author=@hpsaturn, CanAirIO project <[email protected]>
 maintainer=Antonio Vanegas <[email protected]>
 url=https://github.com/kike-canaries/canairio_sensorlib

diff --git a/platformio.ini b/platformio.ini
@@ -64,20 +64,22 @@ build_src_filter = -<*> +<advanced_multivariable/>
 
 [env:esp32s3]
 extends = esp32_common
-platform = espressif32 @ 5.0.0
+platform = espressif32
 board = esp32-s3-devkitc-1
+board_build.mcu = esp32s3
+board_build.f_cpu = 240000000L
 build_src_filter = -<*> +<advanced_multivariable/>
-platform_packages = framework-arduinoespressif32@https://github.com/espressif/arduino-esp32.git#2.0.3
+;platform_packages = framework-arduinoespressif32@https://github.com/espressif/arduino-esp32.git#2.0.3
 build_flags = 
 	${env.build_flags}
 	-DBOARD_HAS_PSRAM
-	-DARDUINO_USB_MODE=1 
-	-DARDUINO_USB_CDC_ON_BOOT=1 
+	;-DARDUINO_USB_MODE=1 
+	;-DARDUINO_USB_CDC_ON_BOOT=1 
 
 board_build.partitions = default_8MB.csv
-board_build.arduino.memory_type = qspi_opi
-board_build.flash_size = 8MB
-board_build.psram_type = opi
+;board_build.arduino.memory_type = qspi_opi
+;board_build.flash_size = 8MB
+;board_build.psram_type = opi
 
 [env:atmelsam]
 extends = atmelsam_common

diff --git a/src/Sensors.cpp b/src/Sensors.cpp
@@ -119,9 +119,9 @@ void Sensors::init(u_int pms_type, int pms_rx, int pms_tx) {
     sps30I2CInit();
     GCJA5Init();
     CO2scd4xInit();
-    bme680Init();
     bmp280Init();
     bme280Init();
+    bme680Init();
     am2320Init();
     sht31Init();
     aht10Init();
@@ -881,9 +881,7 @@ void Sensors::bmp280Read() {
 }
 
 void Sensors::bme680Read() {
-    unsigned long endTime = bme680.beginReading();
-    if (endTime == 0) return;
-    if (!bme680.endReading()) return;
+    if (!bme680.performReading()) return;
     float temp1 = bme680.temperature;
     temp = temp1 - toffset;
     humi = bme680.humidity;

diff --git a/src/Sensors.hpp b/src/Sensors.hpp
@@ -21,8 +21,8 @@
 #include <dht_nonblocking.h> 
 #endif
 
-#define CSL_VERSION "0.6.6"
-#define CSL_REVISION 373
+#define CSL_VERSION "0.6.7"
+#define CSL_REVISION 374
 
 /***************************************************************
 * S E T U P   E S P 3 2   B O A R D S   A N D   F I E L D S

diff --git a/unified-lib-deps.ini b/unified-lib-deps.ini
@@ -1,6 +1,6 @@
 [commonlibs]
 lib_deps = 
-  adafruit/Adafruit Unified [email protected].7
+  adafruit/Adafruit Unified [email protected].9
   adafruit/Adafruit BME280 [email protected]
   adafruit/Adafruit BMP280 [email protected]
   adafruit/Adafruit BME680 [email protected]
@@ -12,7 +12,7 @@ lib_deps =
   wifwaf/[email protected]
   jcomas/[email protected]
   sensirion/Sensirion [email protected]
-  sensirion/Sensirion I2C SCD4x@0.3.1
+  sensirion/Sensirion I2C SCD4x@0.4.0
   https://github.com/enjoyneering/AHTxx.git#eb21571
   https://github.com/hpsaturn/DHT_nonblocking.git#ec6e5b9
   https://github.com/paulvha/SN-GCJA5.git#f261968