diff --git a/library.json b/library.json index fad06e03..16040a14 100644 --- 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 index a60d0b24..e25d9fe7 100644 --- 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 maintainer=Antonio Vanegas url=https://github.com/kike-canaries/canairio_sensorlib diff --git a/platformio.ini b/platformio.ini index 333adb6e..b253b881 100644 --- a/platformio.ini +++ b/platformio.ini @@ -64,20 +64,22 @@ build_src_filter = -<*> + [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 = -<*> + -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 index f9db4bbb..4cfdb4fe 100644 --- 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 index 63554cbe..e3665620 100644 --- a/src/Sensors.hpp +++ b/src/Sensors.hpp @@ -21,8 +21,8 @@ #include #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 index 57df96a4..22aca273 100644 --- a/unified-lib-deps.ini +++ b/unified-lib-deps.ini @@ -1,6 +1,6 @@ [commonlibs] lib_deps = - adafruit/Adafruit Unified Sensor@1.1.7 + adafruit/Adafruit Unified Sensor@1.1.9 adafruit/Adafruit BME280 Library@2.2.2 adafruit/Adafruit BMP280 Library@2.6.6 adafruit/Adafruit BME680 Library@2.0.2 @@ -12,7 +12,7 @@ lib_deps = wifwaf/MH-Z19@1.5.4 jcomas/S8_UART@1.0.1 sensirion/Sensirion Core@0.6.0 - 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