DigitalInfinity/ESP32-PaxCounter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update Bosch BSEC lib to 1.8.1492

Browse Source
This commit is contained in:
cyberman54 2023-03-12 17:42:40 +01:00
parent f1b7e5d426
commit df04e9d438
6 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
platformio_orig.ini
View File

@ -73,7 +73,8 @@ lib_deps_sensors =
adafruit/Adafruit Unified Sensor @ ^1.1.7 adafruit/Adafruit Unified Sensor @ ^1.1.7
adafruit/Adafruit BME280 Library @ ^2.2.2 adafruit/Adafruit BME280 Library @ ^2.2.2
adafruit/Adafruit BMP085 Library @ ^1.2.2 adafruit/Adafruit BMP085 Library @ ^1.2.2
boschsensortec/BSEC Software Library @ 1.6.1480 ;boschsensortec/BSEC Software Library @ 1.8.1492
https://github.com/boschsensortec/BSEC-Arduino-library
lewapek/Nova Fitness Sds dust sensors library @ ^1.5.1 lewapek/Nova Fitness Sds dust sensors library @ ^1.5.1
lib_deps_basic = lib_deps_basic =
greyrook/libpax @ ^1.1.0 greyrook/libpax @ ^1.1.0

16
src/bmesensor.cpp
View File

@ -82,20 +82,20 @@ int bme_init(void) {
int checkIaqSensorStatus(void) { int checkIaqSensorStatus(void) {
int rslt = 1; // true = 1 = no error, false = 0 = error int rslt = 1; // true = 1 = no error, false = 0 = error
if (iaqSensor.status != BSEC_OK) { if (iaqSensor.bsecStatus != BSEC_OK) {
rslt = 0; rslt = 0;
if (iaqSensor.status < BSEC_OK) if (iaqSensor.bsecStatus < BSEC_OK)
ESP_LOGE(TAG, "BSEC error %d", iaqSensor.status); ESP_LOGE(TAG, "BSEC error %d", iaqSensor.bsecStatus);
else else
ESP_LOGW(TAG, "BSEC warning %d", iaqSensor.status); ESP_LOGW(TAG, "BSEC warning %d", iaqSensor.bsecStatus);
} }
if (iaqSensor.bme680Status != BME680_OK) { if (iaqSensor.bme68xStatus != BME68X_OK) {
rslt = 0; rslt = 0;
if (iaqSensor.bme680Status < BME680_OK) if (iaqSensor.bme68xStatus < BME68X_OK)
ESP_LOGE(TAG, "BME680 error %d", iaqSensor.bme680Status); ESP_LOGE(TAG, "BME680 error %d", iaqSensor.bme68xStatus);
else else
ESP_LOGW(TAG, "BME680 warning %d", iaqSensor.bme680Status); ESP_LOGW(TAG, "BME680 warning %d", iaqSensor.bme68xStatus);
} }
return rslt; return rslt;

2
src/hal/generic.h
View File

@ -37,7 +37,7 @@
// BME680 sensor on I2C bus // BME680 sensor on I2C bus
#define HAS_BME 1 // Enable BME sensors in general #define HAS_BME 1 // Enable BME sensors in general
#define HAS_BME680 GPIO_NUM_21, GPIO_NUM_22 // SDA, SCL #define HAS_BME680 GPIO_NUM_21, GPIO_NUM_22 // SDA, SCL
#define BME680_ADDR BME680_I2C_ADDR_PRIMARY // connect SDIO of BME680 to GND #define BME680_ADDR BME68X_I2C_ADDR_LOW // connect SDIO of BME680 to GND
// BME280 sensor on I2C bus // BME280 sensor on I2C bus
//#define HAS_BME 1 // Enable BME sensors in general //#define HAS_BME 1 // Enable BME sensors in general

2
src/hal/octopus32.h
View File

@ -18,7 +18,7 @@
// Octopus32 has a pre-populated BME680 on i2c addr 0x76 // Octopus32 has a pre-populated BME680 on i2c addr 0x76
#define HAS_BME 1 // Enable BME sensors in general #define HAS_BME 1 // Enable BME sensors in general
#define HAS_BME680 GPIO_NUM_23, GPIO_NUM_22 // SDA, SCL #define HAS_BME680 GPIO_NUM_23, GPIO_NUM_22 // SDA, SCL
#define BME680_ADDR BME680_I2C_ADDR_PRIMARY // connect SDIO of BME680 to GND #define BME680_ADDR BME68X_I2C_ADDR_LOW // connect SDIO of BME680 to GND
#define HAS_LED 13 // ESP32 GPIO12 (pin22) On Board LED #define HAS_LED 13 // ESP32 GPIO12 (pin22) On Board LED
//#define LED_ACTIVE_LOW 1 // Onboard LED is active when pin is LOW //#define LED_ACTIVE_LOW 1 // Onboard LED is active when pin is LOW

2
src/hal/ttgobeam.h
View File

@ -30,7 +30,7 @@
// BME680 sensor on I2C bus // BME680 sensor on I2C bus
//#define HAS_BME 1 // Enable BME sensors in general //#define HAS_BME 1 // Enable BME sensors in general
//#define HAS_BME680 SDA, SCL //#define HAS_BME680 SDA, SCL
//#define BME680_ADDR BME680_I2C_ADDR_PRIMARY // !! connect SDIO of BME680 to GND !! //#define BME680_ADDR BME68X_I2C_ADDR_LOW // !! connect SDIO of BME680 to GND !!
// display (if connected) // display (if connected)
//#define HAS_DISPLAY 1 //#define HAS_DISPLAY 1

2
src/hal/ttgobeam10.h
View File

@ -52,7 +52,7 @@ Reset -> reset device
// BME680 sensor on I2C bus // BME680 sensor on I2C bus
//#define HAS_BME 1 // Enable BME sensors in general //#define HAS_BME 1 // Enable BME sensors in general
//#define HAS_BME680 SDA, SCL //#define HAS_BME680 SDA, SCL
//#define BME680_ADDR BME680_I2C_ADDR_PRIMARY // !! connect SDIO of BME680 to GND !! //#define BME680_ADDR BME68X_I2C_ADDR_LOW // !! connect SDIO of BME680 to GND !!
//#define DISABLE_BROWNOUT 1 // comment out if you want to keep brownout feature //#define DISABLE_BROWNOUT 1 // comment out if you want to keep brownout feature