Skip to content

Commit 51a2c31

Browse files
committed
v0.6.7 fixed BME680 issue and updated dependencies
1 parent 7228e3d commit 51a2c31

File tree

6 files changed

+19
-19
lines changed

6 files changed

+19
-19
lines changed

library.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "CanAirIO Air Quality Sensors Library",
3-
"version": "0.6.6",
3+
"version": "0.6.7",
44
"homepage":"https://canair.io",
55
"keywords":
66
[
@@ -75,7 +75,7 @@
7575
"license": "GPL-3.0-only",
7676
"dependencies":
7777
[
78-
{"name":"Adafruit Unified Sensor", "owner":"adafruit", "version":"1.1.7"},
78+
{"name":"Adafruit Unified Sensor", "owner":"adafruit", "version":"1.1.9"},
7979
{"name":"Adafruit BME280 Library", "owner":"adafruit","version":"2.2.2"},
8080
{"name":"Adafruit BMP280 Library", "owner":"adafruit","version":"2.6.6"},
8181
{"name":"Adafruit BME680 Library","owner":"adafruit","version":"2.0.2"},
@@ -87,7 +87,7 @@
8787
{"name":"MH-Z19", "owner":"wifwaf", "version":"1.5.4"},
8888
{"name":"S8_UART", "owner":"jcomas", "version":"1.0.1"},
8989
{"name":"Sensirion Core","owner":"sensirion","version":"0.6.0"},
90-
{"name":"Sensirion I2C SCD4x","owner":"sensirion","version":"0.3.1"},
90+
{"name":"Sensirion I2C SCD4x","owner":"sensirion","version":"0.4.0"},
9191

9292
{"name":"DHT_nonblocking", "version":"https://github.com/hpsaturn/DHT_nonblocking.git#ec6e5b9"},
9393
{"name":"AHTxx", "version":"https://github.com/enjoyneering/AHTxx.git#eb21571"},

library.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name=CanAirIO Air Quality Sensors Library
2-
version=0.6.6
2+
version=0.6.7
33
author=@hpsaturn, CanAirIO project <info@canair.io>
44
maintainer=Antonio Vanegas <hpsaturn@gmail.com>
55
url=https://github.com/kike-canaries/canairio_sensorlib

platformio.ini

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -64,20 +64,22 @@ build_src_filter = -<*> +<advanced_multivariable/>
6464

6565
[env:esp32s3]
6666
extends = esp32_common
67-
platform = espressif32 @ 5.0.0
67+
platform = espressif32
6868
board = esp32-s3-devkitc-1
69+
board_build.mcu = esp32s3
70+
board_build.f_cpu = 240000000L
6971
build_src_filter = -<*> +<advanced_multivariable/>
70-
platform_packages = framework-arduinoespressif32@https://github.com/espressif/arduino-esp32.git#2.0.3
72+
;platform_packages = framework-arduinoespressif32@https://github.com/espressif/arduino-esp32.git#2.0.3
7173
build_flags =
7274
${env.build_flags}
7375
-DBOARD_HAS_PSRAM
74-
-DARDUINO_USB_MODE=1
75-
-DARDUINO_USB_CDC_ON_BOOT=1
76+
;-DARDUINO_USB_MODE=1
77+
;-DARDUINO_USB_CDC_ON_BOOT=1
7678

7779
board_build.partitions = default_8MB.csv
78-
board_build.arduino.memory_type = qspi_opi
79-
board_build.flash_size = 8MB
80-
board_build.psram_type = opi
80+
;board_build.arduino.memory_type = qspi_opi
81+
;board_build.flash_size = 8MB
82+
;board_build.psram_type = opi
8183

8284
[env:atmelsam]
8385
extends = atmelsam_common

src/Sensors.cpp

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -119,9 +119,9 @@ void Sensors::init(u_int pms_type, int pms_rx, int pms_tx) {
119119
sps30I2CInit();
120120
GCJA5Init();
121121
CO2scd4xInit();
122-
bme680Init();
123122
bmp280Init();
124123
bme280Init();
124+
bme680Init();
125125
am2320Init();
126126
sht31Init();
127127
aht10Init();
@@ -881,9 +881,7 @@ void Sensors::bmp280Read() {
881881
}
882882

883883
void Sensors::bme680Read() {
884-
unsigned long endTime = bme680.beginReading();
885-
if (endTime == 0) return;
886-
if (!bme680.endReading()) return;
884+
if (!bme680.performReading()) return;
887885
float temp1 = bme680.temperature;
888886
temp = temp1 - toffset;
889887
humi = bme680.humidity;

src/Sensors.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
#include <dht_nonblocking.h>
2222
#endif
2323

24-
#define CSL_VERSION "0.6.6"
25-
#define CSL_REVISION 373
24+
#define CSL_VERSION "0.6.7"
25+
#define CSL_REVISION 374
2626

2727
/***************************************************************
2828
* 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

unified-lib-deps.ini

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[commonlibs]
22
lib_deps =
3-
adafruit/Adafruit Unified Sensor@1.1.7
3+
adafruit/Adafruit Unified Sensor@1.1.9
44
adafruit/Adafruit BME280 Library@2.2.2
55
adafruit/Adafruit BMP280 Library@2.6.6
66
adafruit/Adafruit BME680 Library@2.0.2
@@ -12,7 +12,7 @@ lib_deps =
1212
wifwaf/MH-Z19@1.5.4
1313
jcomas/S8_UART@1.0.1
1414
sensirion/Sensirion Core@0.6.0
15-
sensirion/Sensirion I2C SCD4x@0.3.1
15+
sensirion/Sensirion I2C SCD4x@0.4.0
1616
https://github.com/enjoyneering/AHTxx.git#eb21571
1717
https://github.com/hpsaturn/DHT_nonblocking.git#ec6e5b9
1818
https://github.com/paulvha/SN-GCJA5.git#f261968

0 commit comments

Comments
 (0)