mirror of
https://github.com/arendst/Tasmota.git
synced 2025-04-23 22:37:16 +00:00
Fix BMP calibration mis-usage
Fix BMP calibration mis-usage
This commit is contained in:
Theo Arends
parent
2a4c79c7cc
commit
0e52e5f854
@ -42,6 +42,7 @@
|
||||
const char kBmpTypes[] PROGMEM = "BMP180|BMP280|BME280|BME680";
|
||||
uint8_t bmp_addresses[] = { BMP_ADDR1, BMP_ADDR2 };
|
||||
uint8_t bmp_count = 0;
|
||||
uint8_t bmp_once = 1;
|
||||
|
||||
struct BMPSTRUCT {
|
||||
uint8_t bmp_address; // I2C bus address
|
||||
@ -51,8 +52,8 @@ struct BMPSTRUCT {
|
||||
|
||||
uint8_t bmp_valid = 0;
|
||||
#ifdef USE_BME680
|
||||
uint8_t bme680_state = 0;
|
||||
float bmp_gas_resistance = 0.0;
|
||||
uint8_t bme680_state = 0;
|
||||
float bmp_gas_resistance = 0.0;
|
||||
#endif // USE_BME680
|
||||
float bmp_temperature = 0.0;
|
||||
float bmp_pressure = 0.0;
|
||||
@ -82,58 +83,68 @@ struct BMPSTRUCT {
|
||||
|
||||
#define BMP180_OSS 3
|
||||
|
||||
int16_t cal_ac1;
|
||||
int16_t cal_ac2;
|
||||
int16_t cal_ac3;
|
||||
int16_t cal_b1;
|
||||
int16_t cal_b2;
|
||||
int16_t cal_mc;
|
||||
int16_t cal_md;
|
||||
uint16_t cal_ac4;
|
||||
uint16_t cal_ac5;
|
||||
uint16_t cal_ac6;
|
||||
struct BMP180CALIBDATA {
|
||||
int16_t cal_ac1;
|
||||
int16_t cal_ac2;
|
||||
int16_t cal_ac3;
|
||||
int16_t cal_b1;
|
||||
int16_t cal_b2;
|
||||
int16_t cal_mc;
|
||||
int16_t cal_md;
|
||||
uint16_t cal_ac4;
|
||||
uint16_t cal_ac5;
|
||||
uint16_t cal_ac6;
|
||||
} bmp180_cal_data[BMP_MAX_SENSORS];
|
||||
|
||||
boolean Bmp1802xCalibration(uint8_t bmp_idx)
|
||||
boolean Bmp180Calibration(uint8_t bmp_idx)
|
||||
{
|
||||
cal_ac1 = I2cRead16(bmp_sensors[bmp_idx].bmp_address, BMP180_AC1);
|
||||
cal_ac2 = I2cRead16(bmp_sensors[bmp_idx].bmp_address, BMP180_AC2);
|
||||
cal_ac3 = I2cRead16(bmp_sensors[bmp_idx].bmp_address, BMP180_AC3);
|
||||
cal_ac4 = I2cRead16(bmp_sensors[bmp_idx].bmp_address, BMP180_AC4);
|
||||
cal_ac5 = I2cRead16(bmp_sensors[bmp_idx].bmp_address, BMP180_AC5);
|
||||
cal_ac6 = I2cRead16(bmp_sensors[bmp_idx].bmp_address, BMP180_AC6);
|
||||
cal_b1 = I2cRead16(bmp_sensors[bmp_idx].bmp_address, BMP180_VB1);
|
||||
cal_b2 = I2cRead16(bmp_sensors[bmp_idx].bmp_address, BMP180_VB2);
|
||||
cal_mc = I2cRead16(bmp_sensors[bmp_idx].bmp_address, BMP180_MC);
|
||||
cal_md = I2cRead16(bmp_sensors[bmp_idx].bmp_address, BMP180_MD);
|
||||
bmp180_cal_data[bmp_idx].cal_ac1 = I2cRead16(bmp_sensors[bmp_idx].bmp_address, BMP180_AC1);
|
||||
bmp180_cal_data[bmp_idx].cal_ac2 = I2cRead16(bmp_sensors[bmp_idx].bmp_address, BMP180_AC2);
|
||||
bmp180_cal_data[bmp_idx].cal_ac3 = I2cRead16(bmp_sensors[bmp_idx].bmp_address, BMP180_AC3);
|
||||
bmp180_cal_data[bmp_idx].cal_ac4 = I2cRead16(bmp_sensors[bmp_idx].bmp_address, BMP180_AC4);
|
||||
bmp180_cal_data[bmp_idx].cal_ac5 = I2cRead16(bmp_sensors[bmp_idx].bmp_address, BMP180_AC5);
|
||||
bmp180_cal_data[bmp_idx].cal_ac6 = I2cRead16(bmp_sensors[bmp_idx].bmp_address, BMP180_AC6);
|
||||
bmp180_cal_data[bmp_idx].cal_b1 = I2cRead16(bmp_sensors[bmp_idx].bmp_address, BMP180_VB1);
|
||||
bmp180_cal_data[bmp_idx].cal_b2 = I2cRead16(bmp_sensors[bmp_idx].bmp_address, BMP180_VB2);
|
||||
bmp180_cal_data[bmp_idx].cal_mc = I2cRead16(bmp_sensors[bmp_idx].bmp_address, BMP180_MC);
|
||||
bmp180_cal_data[bmp_idx].cal_md = I2cRead16(bmp_sensors[bmp_idx].bmp_address, BMP180_MD);
|
||||
|
||||
// Check for Errors in calibration data. Value never is 0x0000 or 0xFFFF
|
||||
if (!cal_ac1 | !cal_ac2 | !cal_ac3 | !cal_ac4 | !cal_ac5 | !cal_ac6 | !cal_b1 | !cal_b2 | !cal_mc | !cal_md) {
|
||||
if (!bmp180_cal_data[bmp_idx].cal_ac1 |
|
||||
!bmp180_cal_data[bmp_idx].cal_ac2 |
|
||||
!bmp180_cal_data[bmp_idx].cal_ac3 |
|
||||
!bmp180_cal_data[bmp_idx].cal_ac4 |
|
||||
!bmp180_cal_data[bmp_idx].cal_ac5 |
|
||||
!bmp180_cal_data[bmp_idx].cal_ac6 |
|
||||
!bmp180_cal_data[bmp_idx].cal_b1 |
|
||||
!bmp180_cal_data[bmp_idx].cal_b2 |
|
||||
!bmp180_cal_data[bmp_idx].cal_mc |
|
||||
!bmp180_cal_data[bmp_idx].cal_md) {
|
||||
return false;
|
||||
}
|
||||
|
||||
if ((cal_ac1 == (int16_t)0xFFFF) |
|
||||
(cal_ac2 == (int16_t)0xFFFF) |
|
||||
(cal_ac3 == (int16_t)0xFFFF) |
|
||||
(cal_ac4 == 0xFFFF) |
|
||||
(cal_ac5 == 0xFFFF) |
|
||||
(cal_ac6 == 0xFFFF) |
|
||||
(cal_b1 == (int16_t)0xFFFF) |
|
||||
(cal_b2 == (int16_t)0xFFFF) |
|
||||
(cal_mc == (int16_t)0xFFFF) |
|
||||
(cal_md == (int16_t)0xFFFF)) {
|
||||
if ((bmp180_cal_data[bmp_idx].cal_ac1 == (int16_t)0xFFFF) |
|
||||
(bmp180_cal_data[bmp_idx].cal_ac2 == (int16_t)0xFFFF) |
|
||||
(bmp180_cal_data[bmp_idx].cal_ac3 == (int16_t)0xFFFF) |
|
||||
(bmp180_cal_data[bmp_idx].cal_ac4 == 0xFFFF) |
|
||||
(bmp180_cal_data[bmp_idx].cal_ac5 == 0xFFFF) |
|
||||
(bmp180_cal_data[bmp_idx].cal_ac6 == 0xFFFF) |
|
||||
(bmp180_cal_data[bmp_idx].cal_b1 == (int16_t)0xFFFF) |
|
||||
(bmp180_cal_data[bmp_idx].cal_b2 == (int16_t)0xFFFF) |
|
||||
(bmp180_cal_data[bmp_idx].cal_mc == (int16_t)0xFFFF) |
|
||||
(bmp180_cal_data[bmp_idx].cal_md == (int16_t)0xFFFF)) {
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
void Bmp1802xRead(uint8_t bmp_idx)
|
||||
void Bmp180Read(uint8_t bmp_idx)
|
||||
{
|
||||
|
||||
I2cWrite8(bmp_sensors[bmp_idx].bmp_address, BMP180_REG_CONTROL, BMP180_TEMPERATURE);
|
||||
delay(5); // 5ms conversion time
|
||||
int ut = I2cRead16(bmp_sensors[bmp_idx].bmp_address, BMP180_REG_RESULT);
|
||||
int32_t xt1 = (ut - (int32_t)cal_ac6) * ((int32_t)cal_ac5) >> 15;
|
||||
int32_t xt2 = ((int32_t)cal_mc << 11) / (xt1 + (int32_t)cal_md);
|
||||
int32_t xt1 = (ut - (int32_t)bmp180_cal_data[bmp_idx].cal_ac6) * ((int32_t)bmp180_cal_data[bmp_idx].cal_ac5) >> 15;
|
||||
int32_t xt2 = ((int32_t)bmp180_cal_data[bmp_idx].cal_mc << 11) / (xt1 + (int32_t)bmp180_cal_data[bmp_idx].cal_md);
|
||||
int32_t bmp180_b5 = xt1 + xt2;
|
||||
bmp_sensors[bmp_idx].bmp_temperature = ((bmp180_b5 + 8) >> 4) / 10.0;
|
||||
|
||||
@ -143,15 +154,15 @@ void Bmp1802xRead(uint8_t bmp_idx)
|
||||
up >>= (8 - BMP180_OSS);
|
||||
|
||||
int32_t b6 = bmp180_b5 - 4000;
|
||||
int32_t x1 = ((int32_t)cal_b2 * ((b6 * b6) >> 12)) >> 11;
|
||||
int32_t x2 = ((int32_t)cal_ac2 * b6) >> 11;
|
||||
int32_t x1 = ((int32_t)bmp180_cal_data[bmp_idx].cal_b2 * ((b6 * b6) >> 12)) >> 11;
|
||||
int32_t x2 = ((int32_t)bmp180_cal_data[bmp_idx].cal_ac2 * b6) >> 11;
|
||||
int32_t x3 = x1 + x2;
|
||||
int32_t b3 = ((((int32_t)cal_ac1 * 4 + x3) << BMP180_OSS) + 2) >> 2;
|
||||
int32_t b3 = ((((int32_t)bmp180_cal_data[bmp_idx].cal_ac1 * 4 + x3) << BMP180_OSS) + 2) >> 2;
|
||||
|
||||
x1 = ((int32_t)cal_ac3 * b6) >> 13;
|
||||
x2 = ((int32_t)cal_b1 * ((b6 * b6) >> 12)) >> 16;
|
||||
x1 = ((int32_t)bmp180_cal_data[bmp_idx].cal_ac3 * b6) >> 13;
|
||||
x2 = ((int32_t)bmp180_cal_data[bmp_idx].cal_b1 * ((b6 * b6) >> 12)) >> 16;
|
||||
x3 = ((x1 + x2) + 2) >> 2;
|
||||
uint32_t b4 = ((uint32_t)cal_ac4 * (uint32_t)(x3 + 32768)) >> 15;
|
||||
uint32_t b4 = ((uint32_t)bmp180_cal_data[bmp_idx].cal_ac4 * (uint32_t)(x3 + 32768)) >> 15;
|
||||
uint32_t b7 = ((uint32_t)up - b3) * (uint32_t)(50000UL >> BMP180_OSS);
|
||||
|
||||
int32_t p;
|
||||
@ -214,38 +225,37 @@ struct BME280CALIBDATA
|
||||
int16_t dig_P7;
|
||||
int16_t dig_P8;
|
||||
int16_t dig_P9;
|
||||
uint8_t dig_H1;
|
||||
int16_t dig_H2;
|
||||
uint8_t dig_H3;
|
||||
int16_t dig_H4;
|
||||
int16_t dig_H5;
|
||||
uint8_t dig_H1;
|
||||
uint8_t dig_H3;
|
||||
int8_t dig_H6;
|
||||
} Bme280CalibrationData;
|
||||
} Bme280CalibrationData[BMP_MAX_SENSORS];
|
||||
|
||||
boolean Bmx2802xCalibrate(uint8_t bmp_idx)
|
||||
boolean Bmx280Calibrate(uint8_t bmp_idx)
|
||||
{
|
||||
// if (I2cRead8(bmp_address, BMP_REGISTER_CHIPID) != BME280_CHIPID) return false;
|
||||
|
||||
Bme280CalibrationData.dig_T1 = I2cRead16LE(bmp_sensors[bmp_idx].bmp_address, BME280_REGISTER_DIG_T1);
|
||||
Bme280CalibrationData.dig_T2 = I2cReadS16_LE(bmp_sensors[bmp_idx].bmp_address, BME280_REGISTER_DIG_T2);
|
||||
Bme280CalibrationData.dig_T3 = I2cReadS16_LE(bmp_sensors[bmp_idx].bmp_address, BME280_REGISTER_DIG_T3);
|
||||
Bme280CalibrationData.dig_P1 = I2cRead16LE(bmp_sensors[bmp_idx].bmp_address, BME280_REGISTER_DIG_P1);
|
||||
Bme280CalibrationData.dig_P2 = I2cReadS16_LE(bmp_sensors[bmp_idx].bmp_address, BME280_REGISTER_DIG_P2);
|
||||
Bme280CalibrationData.dig_P3 = I2cReadS16_LE(bmp_sensors[bmp_idx].bmp_address, BME280_REGISTER_DIG_P3);
|
||||
Bme280CalibrationData.dig_P4 = I2cReadS16_LE(bmp_sensors[bmp_idx].bmp_address, BME280_REGISTER_DIG_P4);
|
||||
Bme280CalibrationData.dig_P5 = I2cReadS16_LE(bmp_sensors[bmp_idx].bmp_address, BME280_REGISTER_DIG_P5);
|
||||
Bme280CalibrationData.dig_P6 = I2cReadS16_LE(bmp_sensors[bmp_idx].bmp_address, BME280_REGISTER_DIG_P6);
|
||||
Bme280CalibrationData.dig_P7 = I2cReadS16_LE(bmp_sensors[bmp_idx].bmp_address, BME280_REGISTER_DIG_P7);
|
||||
Bme280CalibrationData.dig_P8 = I2cReadS16_LE(bmp_sensors[bmp_idx].bmp_address, BME280_REGISTER_DIG_P8);
|
||||
Bme280CalibrationData.dig_P9 = I2cReadS16_LE(bmp_sensors[bmp_idx].bmp_address, BME280_REGISTER_DIG_P9);
|
||||
Bme280CalibrationData[bmp_idx].dig_T1 = I2cRead16LE(bmp_sensors[bmp_idx].bmp_address, BME280_REGISTER_DIG_T1);
|
||||
Bme280CalibrationData[bmp_idx].dig_T2 = I2cReadS16_LE(bmp_sensors[bmp_idx].bmp_address, BME280_REGISTER_DIG_T2);
|
||||
Bme280CalibrationData[bmp_idx].dig_T3 = I2cReadS16_LE(bmp_sensors[bmp_idx].bmp_address, BME280_REGISTER_DIG_T3);
|
||||
Bme280CalibrationData[bmp_idx].dig_P1 = I2cRead16LE(bmp_sensors[bmp_idx].bmp_address, BME280_REGISTER_DIG_P1);
|
||||
Bme280CalibrationData[bmp_idx].dig_P2 = I2cReadS16_LE(bmp_sensors[bmp_idx].bmp_address, BME280_REGISTER_DIG_P2);
|
||||
Bme280CalibrationData[bmp_idx].dig_P3 = I2cReadS16_LE(bmp_sensors[bmp_idx].bmp_address, BME280_REGISTER_DIG_P3);
|
||||
Bme280CalibrationData[bmp_idx].dig_P4 = I2cReadS16_LE(bmp_sensors[bmp_idx].bmp_address, BME280_REGISTER_DIG_P4);
|
||||
Bme280CalibrationData[bmp_idx].dig_P5 = I2cReadS16_LE(bmp_sensors[bmp_idx].bmp_address, BME280_REGISTER_DIG_P5);
|
||||
Bme280CalibrationData[bmp_idx].dig_P6 = I2cReadS16_LE(bmp_sensors[bmp_idx].bmp_address, BME280_REGISTER_DIG_P6);
|
||||
Bme280CalibrationData[bmp_idx].dig_P7 = I2cReadS16_LE(bmp_sensors[bmp_idx].bmp_address, BME280_REGISTER_DIG_P7);
|
||||
Bme280CalibrationData[bmp_idx].dig_P8 = I2cReadS16_LE(bmp_sensors[bmp_idx].bmp_address, BME280_REGISTER_DIG_P8);
|
||||
Bme280CalibrationData[bmp_idx].dig_P9 = I2cReadS16_LE(bmp_sensors[bmp_idx].bmp_address, BME280_REGISTER_DIG_P9);
|
||||
if (BME280_CHIPID == bmp_sensors[bmp_idx].bmp_type) { // #1051
|
||||
Bme280CalibrationData.dig_H1 = I2cRead8(bmp_sensors[bmp_idx].bmp_address, BME280_REGISTER_DIG_H1);
|
||||
Bme280CalibrationData.dig_H2 = I2cReadS16_LE(bmp_sensors[bmp_idx].bmp_address, BME280_REGISTER_DIG_H2);
|
||||
Bme280CalibrationData.dig_H3 = I2cRead8(bmp_sensors[bmp_idx].bmp_address, BME280_REGISTER_DIG_H3);
|
||||
Bme280CalibrationData.dig_H4 = (I2cRead8(bmp_sensors[bmp_idx].bmp_address, BME280_REGISTER_DIG_H4) << 4) | (I2cRead8(bmp_sensors[bmp_idx].bmp_address, BME280_REGISTER_DIG_H4 + 1) & 0xF);
|
||||
Bme280CalibrationData.dig_H5 = (I2cRead8(bmp_sensors[bmp_idx].bmp_address, BME280_REGISTER_DIG_H5 + 1) << 4) | (I2cRead8(bmp_sensors[bmp_idx].bmp_address, BME280_REGISTER_DIG_H5) >> 4);
|
||||
Bme280CalibrationData.dig_H6 = (int8_t)I2cRead8(bmp_sensors[bmp_idx].bmp_address, BME280_REGISTER_DIG_H6);
|
||||
|
||||
Bme280CalibrationData[bmp_idx].dig_H1 = I2cRead8(bmp_sensors[bmp_idx].bmp_address, BME280_REGISTER_DIG_H1);
|
||||
Bme280CalibrationData[bmp_idx].dig_H2 = I2cReadS16_LE(bmp_sensors[bmp_idx].bmp_address, BME280_REGISTER_DIG_H2);
|
||||
Bme280CalibrationData[bmp_idx].dig_H3 = I2cRead8(bmp_sensors[bmp_idx].bmp_address, BME280_REGISTER_DIG_H3);
|
||||
Bme280CalibrationData[bmp_idx].dig_H4 = (I2cRead8(bmp_sensors[bmp_idx].bmp_address, BME280_REGISTER_DIG_H4) << 4) | (I2cRead8(bmp_sensors[bmp_idx].bmp_address, BME280_REGISTER_DIG_H4 + 1) & 0xF);
|
||||
Bme280CalibrationData[bmp_idx].dig_H5 = (I2cRead8(bmp_sensors[bmp_idx].bmp_address, BME280_REGISTER_DIG_H5 + 1) << 4) | (I2cRead8(bmp_sensors[bmp_idx].bmp_address, BME280_REGISTER_DIG_H5) >> 4);
|
||||
Bme280CalibrationData[bmp_idx].dig_H6 = (int8_t)I2cRead8(bmp_sensors[bmp_idx].bmp_address, BME280_REGISTER_DIG_H6);
|
||||
I2cWrite8(bmp_sensors[bmp_idx].bmp_address, BME280_REGISTER_CONTROL, 0x00); // sleep mode since writes to config can be ignored in normal mode (Datasheet 5.4.5/6 page 27)
|
||||
// Set before CONTROL_meas (DS 5.4.3)
|
||||
I2cWrite8(bmp_sensors[bmp_idx].bmp_address, BME280_REGISTER_CONTROLHUMID, 0x01); // 1x oversampling
|
||||
@ -258,14 +268,14 @@ boolean Bmx2802xCalibrate(uint8_t bmp_idx)
|
||||
return true;
|
||||
}
|
||||
|
||||
void Bme2802xRead(uint8_t bmp_idx)
|
||||
void Bme280Read(uint8_t bmp_idx)
|
||||
{
|
||||
int32_t adc_T = I2cRead24(bmp_sensors[bmp_idx].bmp_address, BME280_REGISTER_TEMPDATA);
|
||||
adc_T >>= 4;
|
||||
|
||||
int32_t vart1 = ((((adc_T >> 3) - ((int32_t)Bme280CalibrationData.dig_T1 << 1))) * ((int32_t)Bme280CalibrationData.dig_T2)) >> 11;
|
||||
int32_t vart2 = (((((adc_T >> 4) - ((int32_t)Bme280CalibrationData.dig_T1)) * ((adc_T >> 4) - ((int32_t)Bme280CalibrationData.dig_T1))) >> 12) *
|
||||
((int32_t)Bme280CalibrationData.dig_T3)) >> 14;
|
||||
int32_t vart1 = ((((adc_T >> 3) - ((int32_t)Bme280CalibrationData[bmp_idx].dig_T1 << 1))) * ((int32_t)Bme280CalibrationData[bmp_idx].dig_T2)) >> 11;
|
||||
int32_t vart2 = (((((adc_T >> 4) - ((int32_t)Bme280CalibrationData[bmp_idx].dig_T1)) * ((adc_T >> 4) - ((int32_t)Bme280CalibrationData[bmp_idx].dig_T1))) >> 12) *
|
||||
((int32_t)Bme280CalibrationData[bmp_idx].dig_T3)) >> 14;
|
||||
int32_t t_fine = vart1 + vart2;
|
||||
float T = (t_fine * 5 + 128) >> 8;
|
||||
bmp_sensors[bmp_idx].bmp_temperature = T / 100.0;
|
||||
@ -274,19 +284,19 @@ void Bme2802xRead(uint8_t bmp_idx)
|
||||
adc_P >>= 4;
|
||||
|
||||
int64_t var1 = ((int64_t)t_fine) - 128000;
|
||||
int64_t var2 = var1 * var1 * (int64_t)Bme280CalibrationData.dig_P6;
|
||||
var2 = var2 + ((var1 * (int64_t)Bme280CalibrationData.dig_P5) << 17);
|
||||
var2 = var2 + (((int64_t)Bme280CalibrationData.dig_P4) << 35);
|
||||
var1 = ((var1 * var1 * (int64_t)Bme280CalibrationData.dig_P3) >> 8) + ((var1 * (int64_t)Bme280CalibrationData.dig_P2) << 12);
|
||||
var1 = (((((int64_t)1) << 47) + var1)) * ((int64_t)Bme280CalibrationData.dig_P1) >> 33;
|
||||
int64_t var2 = var1 * var1 * (int64_t)Bme280CalibrationData[bmp_idx].dig_P6;
|
||||
var2 = var2 + ((var1 * (int64_t)Bme280CalibrationData[bmp_idx].dig_P5) << 17);
|
||||
var2 = var2 + (((int64_t)Bme280CalibrationData[bmp_idx].dig_P4) << 35);
|
||||
var1 = ((var1 * var1 * (int64_t)Bme280CalibrationData[bmp_idx].dig_P3) >> 8) + ((var1 * (int64_t)Bme280CalibrationData[bmp_idx].dig_P2) << 12);
|
||||
var1 = (((((int64_t)1) << 47) + var1)) * ((int64_t)Bme280CalibrationData[bmp_idx].dig_P1) >> 33;
|
||||
if (0 == var1) {
|
||||
return; // avoid exception caused by division by zero
|
||||
}
|
||||
int64_t p = 1048576 - adc_P;
|
||||
p = (((p << 31) - var2) * 3125) / var1;
|
||||
var1 = (((int64_t)Bme280CalibrationData.dig_P9) * (p >> 13) * (p >> 13)) >> 25;
|
||||
var2 = (((int64_t)Bme280CalibrationData.dig_P8) * p) >> 19;
|
||||
p = ((p + var1 + var2) >> 8) + (((int64_t)Bme280CalibrationData.dig_P7) << 4);
|
||||
var1 = (((int64_t)Bme280CalibrationData[bmp_idx].dig_P9) * (p >> 13) * (p >> 13)) >> 25;
|
||||
var2 = (((int64_t)Bme280CalibrationData[bmp_idx].dig_P8) * p) >> 19;
|
||||
p = ((p + var1 + var2) >> 8) + (((int64_t)Bme280CalibrationData[bmp_idx].dig_P7) << 4);
|
||||
bmp_sensors[bmp_idx].bmp_pressure = (float)p / 25600.0;
|
||||
|
||||
if (BMP280_CHIPID == bmp_sensors[bmp_idx].bmp_type) { return; }
|
||||
@ -294,13 +304,13 @@ void Bme2802xRead(uint8_t bmp_idx)
|
||||
int32_t adc_H = I2cRead16(bmp_sensors[bmp_idx].bmp_address, BME280_REGISTER_HUMIDDATA);
|
||||
|
||||
int32_t v_x1_u32r = (t_fine - ((int32_t)76800));
|
||||
v_x1_u32r = (((((adc_H << 14) - (((int32_t)Bme280CalibrationData.dig_H4) << 20) -
|
||||
(((int32_t)Bme280CalibrationData.dig_H5) * v_x1_u32r)) + ((int32_t)16384)) >> 15) *
|
||||
(((((((v_x1_u32r * ((int32_t)Bme280CalibrationData.dig_H6)) >> 10) *
|
||||
(((v_x1_u32r * ((int32_t)Bme280CalibrationData.dig_H3)) >> 11) + ((int32_t)32768))) >> 10) +
|
||||
((int32_t)2097152)) * ((int32_t)Bme280CalibrationData.dig_H2) + 8192) >> 14));
|
||||
v_x1_u32r = (((((adc_H << 14) - (((int32_t)Bme280CalibrationData[bmp_idx].dig_H4) << 20) -
|
||||
(((int32_t)Bme280CalibrationData[bmp_idx].dig_H5) * v_x1_u32r)) + ((int32_t)16384)) >> 15) *
|
||||
(((((((v_x1_u32r * ((int32_t)Bme280CalibrationData[bmp_idx].dig_H6)) >> 10) *
|
||||
(((v_x1_u32r * ((int32_t)Bme280CalibrationData[bmp_idx].dig_H3)) >> 11) + ((int32_t)32768))) >> 10) +
|
||||
((int32_t)2097152)) * ((int32_t)Bme280CalibrationData[bmp_idx].dig_H2) + 8192) >> 14));
|
||||
v_x1_u32r = (v_x1_u32r - (((((v_x1_u32r >> 15) * (v_x1_u32r >> 15)) >> 7) *
|
||||
((int32_t)Bme280CalibrationData.dig_H1)) >> 4));
|
||||
((int32_t)Bme280CalibrationData[bmp_idx].dig_H1)) >> 4));
|
||||
v_x1_u32r = (v_x1_u32r < 0) ? 0 : v_x1_u32r;
|
||||
v_x1_u32r = (v_x1_u32r > 419430400) ? 419430400 : v_x1_u32r;
|
||||
float h = (v_x1_u32r >> 12);
|
||||
@ -314,50 +324,50 @@ void Bme2802xRead(uint8_t bmp_idx)
|
||||
|
||||
#include <bme680.h>
|
||||
|
||||
struct bme680_dev gas_sensor;
|
||||
struct bme680_dev gas_sensor[BMP_MAX_SENSORS];
|
||||
|
||||
static void BmeDelayMs(uint32_t ms)
|
||||
{
|
||||
delay(ms);
|
||||
}
|
||||
|
||||
boolean Bme6802xInit(uint8_t bmp_idx)
|
||||
boolean Bme680Init(uint8_t bmp_idx)
|
||||
{
|
||||
gas_sensor.dev_id = bmp_sensors[bmp_idx].bmp_address;
|
||||
gas_sensor.intf = BME680_I2C_INTF;
|
||||
gas_sensor.read = &I2cReadBuffer;
|
||||
gas_sensor.write = &I2cWriteBuffer;
|
||||
gas_sensor.delay_ms = BmeDelayMs;
|
||||
gas_sensor[bmp_idx].dev_id = bmp_sensors[bmp_idx].bmp_address;
|
||||
gas_sensor[bmp_idx].intf = BME680_I2C_INTF;
|
||||
gas_sensor[bmp_idx].read = &I2cReadBuffer;
|
||||
gas_sensor[bmp_idx].write = &I2cWriteBuffer;
|
||||
gas_sensor[bmp_idx].delay_ms = BmeDelayMs;
|
||||
/* amb_temp can be set to 25 prior to configuring the gas sensor
|
||||
* or by performing a few temperature readings without operating the gas sensor.
|
||||
*/
|
||||
gas_sensor.amb_temp = 25;
|
||||
gas_sensor[bmp_idx].amb_temp = 25;
|
||||
|
||||
int8_t rslt = BME680_OK;
|
||||
rslt = bme680_init(&gas_sensor);
|
||||
rslt = bme680_init(&gas_sensor[bmp_idx]);
|
||||
if (rslt != BME680_OK) { return false; }
|
||||
|
||||
/* Set the temperature, pressure and humidity settings */
|
||||
gas_sensor.tph_sett.os_hum = BME680_OS_2X;
|
||||
gas_sensor.tph_sett.os_pres = BME680_OS_4X;
|
||||
gas_sensor.tph_sett.os_temp = BME680_OS_8X;
|
||||
gas_sensor.tph_sett.filter = BME680_FILTER_SIZE_3;
|
||||
gas_sensor[bmp_idx].tph_sett.os_hum = BME680_OS_2X;
|
||||
gas_sensor[bmp_idx].tph_sett.os_pres = BME680_OS_4X;
|
||||
gas_sensor[bmp_idx].tph_sett.os_temp = BME680_OS_8X;
|
||||
gas_sensor[bmp_idx].tph_sett.filter = BME680_FILTER_SIZE_3;
|
||||
|
||||
/* Set the remaining gas sensor settings and link the heating profile */
|
||||
gas_sensor.gas_sett.run_gas = BME680_ENABLE_GAS_MEAS;
|
||||
gas_sensor[bmp_idx].gas_sett.run_gas = BME680_ENABLE_GAS_MEAS;
|
||||
/* Create a ramp heat waveform in 3 steps */
|
||||
gas_sensor.gas_sett.heatr_temp = 320; /* degree Celsius */
|
||||
gas_sensor.gas_sett.heatr_dur = 150; /* milliseconds */
|
||||
gas_sensor[bmp_idx].gas_sett.heatr_temp = 320; /* degree Celsius */
|
||||
gas_sensor[bmp_idx].gas_sett.heatr_dur = 150; /* milliseconds */
|
||||
|
||||
/* Select the power mode */
|
||||
/* Must be set before writing the sensor configuration */
|
||||
gas_sensor.power_mode = BME680_FORCED_MODE;
|
||||
gas_sensor[bmp_idx].power_mode = BME680_FORCED_MODE;
|
||||
|
||||
/* Set the required sensor settings needed */
|
||||
uint8_t set_required_settings = BME680_OST_SEL | BME680_OSP_SEL | BME680_OSH_SEL | BME680_FILTER_SEL | BME680_GAS_SENSOR_SEL;
|
||||
|
||||
/* Set the desired sensor configuration */
|
||||
rslt = bme680_set_sensor_settings(set_required_settings,&gas_sensor);
|
||||
rslt = bme680_set_sensor_settings(set_required_settings,&gas_sensor[bmp_idx]);
|
||||
if (rslt != BME680_OK) { return false; }
|
||||
|
||||
bmp_sensors[bmp_idx].bme680_state = 0;
|
||||
@ -365,20 +375,20 @@ boolean Bme6802xInit(uint8_t bmp_idx)
|
||||
return true;
|
||||
}
|
||||
|
||||
void Bme6802xRead(uint8_t bmp_idx)
|
||||
void Bme680Read(uint8_t bmp_idx)
|
||||
{
|
||||
int8_t rslt = BME680_OK;
|
||||
|
||||
if (BME680_CHIPID == bmp_sensors[bmp_idx].bmp_type) {
|
||||
if (0 == bmp_sensors[bmp_idx].bme680_state) {
|
||||
/* Trigger the next measurement if you would like to read data out continuously */
|
||||
rslt = bme680_set_sensor_mode(&gas_sensor);
|
||||
rslt = bme680_set_sensor_mode(&gas_sensor[bmp_idx]);
|
||||
if (rslt != BME680_OK) { return; }
|
||||
|
||||
/* Get the total measurement duration so as to sleep or wait till the
|
||||
* measurement is complete */
|
||||
// uint16_t meas_period;
|
||||
// bme680_get_profile_dur(&meas_period, &gas_sensor);
|
||||
// bme680_get_profile_dur(&meas_period, &gas_sensor[bmp_idx]);
|
||||
// delay(meas_period); /* Delay till the measurement is ready */ // 183 mSec - we'll wait a second
|
||||
|
||||
bmp_sensors[bmp_idx].bme680_state = 1;
|
||||
@ -386,7 +396,7 @@ void Bme6802xRead(uint8_t bmp_idx)
|
||||
bmp_sensors[bmp_idx].bme680_state = 0;
|
||||
|
||||
struct bme680_field_data data;
|
||||
rslt = bme680_get_sensor_data(&data, &gas_sensor);
|
||||
rslt = bme680_get_sensor_data(&data, &gas_sensor[bmp_idx]);
|
||||
if (rslt != BME680_OK) { return; }
|
||||
|
||||
bmp_sensors[bmp_idx].bmp_temperature = data.temperature / 100.0;
|
||||
@ -421,20 +431,20 @@ void BmpDetect()
|
||||
boolean success = false;
|
||||
switch (bmp_type) {
|
||||
case BMP180_CHIPID:
|
||||
success = Bmp1802xCalibration(bmp_count);
|
||||
success = Bmp180Calibration(bmp_count);
|
||||
break;
|
||||
case BME280_CHIPID:
|
||||
bmp_sensors[bmp_count].bmp_model++; // 2
|
||||
case BMP280_CHIPID:
|
||||
bmp_sensors[bmp_count].bmp_model++; // 1
|
||||
success = Bmx2802xCalibrate(bmp_count);
|
||||
success = Bmx280Calibrate(bmp_count);
|
||||
break;
|
||||
#ifdef USE_BME680
|
||||
case BME680_CHIPID:
|
||||
bmp_sensors[bmp_count].bmp_model = 3; // 3
|
||||
success = Bme6802xInit(bmp_count);
|
||||
break;
|
||||
#endif // USE_BME680
|
||||
#ifdef USE_BME680
|
||||
case BME680_CHIPID:
|
||||
bmp_sensors[bmp_count].bmp_model = 3; // 3
|
||||
success = Bme680Init(bmp_count);
|
||||
break;
|
||||
#endif // USE_BME680
|
||||
}
|
||||
if (success) {
|
||||
GetTextIndexed(bmp_sensors[bmp_count].bmp_name, sizeof(bmp_sensors[bmp_count].bmp_name), bmp_sensors[bmp_count].bmp_model, kBmpTypes);
|
||||
@ -451,17 +461,17 @@ void BmpRead()
|
||||
for (byte bmp_idx = 0; bmp_idx < bmp_count; bmp_idx++) {
|
||||
switch (bmp_sensors[bmp_idx].bmp_type) {
|
||||
case BMP180_CHIPID:
|
||||
Bmp1802xRead(bmp_idx);
|
||||
Bmp180Read(bmp_idx);
|
||||
break;
|
||||
case BMP280_CHIPID:
|
||||
case BME280_CHIPID:
|
||||
Bme2802xRead(bmp_idx);
|
||||
Bme280Read(bmp_idx);
|
||||
break;
|
||||
#ifdef USE_BME680
|
||||
case BME680_CHIPID:
|
||||
Bme6802xRead(bmp_idx);
|
||||
break;
|
||||
#endif // USE_BME680
|
||||
#ifdef USE_BME680
|
||||
case BME680_CHIPID:
|
||||
Bme680Read(bmp_idx);
|
||||
break;
|
||||
#endif // USE_BME680
|
||||
}
|
||||
if (bmp_sensors[bmp_idx].bmp_temperature != 0.0) {
|
||||
bmp_sensors[bmp_idx].bmp_temperature = ConvertTemp(bmp_sensors[bmp_idx].bmp_temperature);
|
||||
@ -544,7 +554,7 @@ void BmpShow(boolean json)
|
||||
if (bmp_sensors[bmp_idx].bmp_model >= 3) { DomoticzSensor(DZ_AIRQUALITY, (uint32_t)bmp_sensors[bmp_idx].bmp_gas_resistance); }
|
||||
#endif // USE_BME680
|
||||
}
|
||||
#endif // USE_DOMOTICZ
|
||||
#endif // USE_DOMOTICZ
|
||||
|
||||
#ifdef USE_KNX
|
||||
if (0 == tele_period) {
|
||||
@ -568,7 +578,7 @@ void BmpShow(boolean json)
|
||||
snprintf_P(mqtt_data, sizeof(mqtt_data), PSTR("%s{s}%s " D_GAS "{m}%s " D_UNIT_KILOOHM "{e}"), mqtt_data, name, gas_resistance);
|
||||
}
|
||||
#endif // USE_BME680
|
||||
#endif // USE_WEBSERVER
|
||||
#endif // USE_WEBSERVER
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -599,11 +609,11 @@ boolean Xsns09(byte function)
|
||||
case FUNC_WEB_APPEND:
|
||||
BmpShow(0);
|
||||
break;
|
||||
#endif // USE_WEBSERVER
|
||||
#endif // USE_WEBSERVER
|
||||
}
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
#endif // USE_BMP
|
||||
#endif // USE_I2C
|
||||
#endif // USE_BMP
|
||||
#endif // USE_I2C
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user