diff --git a/Adafruit_BME280.cpp b/Adafruit_BME280.cpp index 6622960..725ec1a 100644 --- a/Adafruit_BME280.cpp +++ b/Adafruit_BME280.cpp @@ -19,7 +19,6 @@ #include #include "Adafruit_BME280.h" -static bme280_calib_data bme280_calib; /*************************************************************************** PRIVATE FUNCTIONS @@ -200,26 +199,26 @@ int16_t Adafruit_BME280::readS16_LE(byte reg) /**************************************************************************/ void Adafruit_BME280::readCoefficients(void) { - bme280_calib.dig_T1 = read16_LE(BME280_REGISTER_DIG_T1); - bme280_calib.dig_T2 = readS16_LE(BME280_REGISTER_DIG_T2); - bme280_calib.dig_T3 = readS16_LE(BME280_REGISTER_DIG_T3); + _bme280_calib.dig_T1 = read16_LE(BME280_REGISTER_DIG_T1); + _bme280_calib.dig_T2 = readS16_LE(BME280_REGISTER_DIG_T2); + _bme280_calib.dig_T3 = readS16_LE(BME280_REGISTER_DIG_T3); - bme280_calib.dig_P1 = read16_LE(BME280_REGISTER_DIG_P1); - bme280_calib.dig_P2 = readS16_LE(BME280_REGISTER_DIG_P2); - bme280_calib.dig_P3 = readS16_LE(BME280_REGISTER_DIG_P3); - bme280_calib.dig_P4 = readS16_LE(BME280_REGISTER_DIG_P4); - bme280_calib.dig_P5 = readS16_LE(BME280_REGISTER_DIG_P5); - bme280_calib.dig_P6 = readS16_LE(BME280_REGISTER_DIG_P6); - bme280_calib.dig_P7 = readS16_LE(BME280_REGISTER_DIG_P7); - bme280_calib.dig_P8 = readS16_LE(BME280_REGISTER_DIG_P8); - bme280_calib.dig_P9 = readS16_LE(BME280_REGISTER_DIG_P9); + _bme280_calib.dig_P1 = read16_LE(BME280_REGISTER_DIG_P1); + _bme280_calib.dig_P2 = readS16_LE(BME280_REGISTER_DIG_P2); + _bme280_calib.dig_P3 = readS16_LE(BME280_REGISTER_DIG_P3); + _bme280_calib.dig_P4 = readS16_LE(BME280_REGISTER_DIG_P4); + _bme280_calib.dig_P5 = readS16_LE(BME280_REGISTER_DIG_P5); + _bme280_calib.dig_P6 = readS16_LE(BME280_REGISTER_DIG_P6); + _bme280_calib.dig_P7 = readS16_LE(BME280_REGISTER_DIG_P7); + _bme280_calib.dig_P8 = readS16_LE(BME280_REGISTER_DIG_P8); + _bme280_calib.dig_P9 = readS16_LE(BME280_REGISTER_DIG_P9); - bme280_calib.dig_H1 = read8(BME280_REGISTER_DIG_H1); - bme280_calib.dig_H2 = readS16_LE(BME280_REGISTER_DIG_H2); - bme280_calib.dig_H3 = read8(BME280_REGISTER_DIG_H3); - bme280_calib.dig_H4 = (read8(BME280_REGISTER_DIG_H4) << 4) | (read8(BME280_REGISTER_DIG_H4+1) & 0xF); - bme280_calib.dig_H5 = (read8(BME280_REGISTER_DIG_H5+1) << 4) | (read8(BME280_REGISTER_DIG_H5) >> 4); - bme280_calib.dig_H6 = (int8_t)read8(BME280_REGISTER_DIG_H6); + _bme280_calib.dig_H1 = read8(BME280_REGISTER_DIG_H1); + _bme280_calib.dig_H2 = readS16_LE(BME280_REGISTER_DIG_H2); + _bme280_calib.dig_H3 = read8(BME280_REGISTER_DIG_H3); + _bme280_calib.dig_H4 = (read8(BME280_REGISTER_DIG_H4) << 4) | (read8(BME280_REGISTER_DIG_H4+1) & 0xF); + _bme280_calib.dig_H5 = (read8(BME280_REGISTER_DIG_H5+1) << 4) | (read8(BME280_REGISTER_DIG_H5) >> 4); + _bme280_calib.dig_H6 = (int8_t)read8(BME280_REGISTER_DIG_H6); } /**************************************************************************/ @@ -236,12 +235,12 @@ float Adafruit_BME280::readTemperature(void) adc_T |= read8(BME280_REGISTER_TEMPDATA+2); adc_T >>= 4; - var1 = ((((adc_T>>3) - ((int32_t)bme280_calib.dig_T1 <<1))) * - ((int32_t)bme280_calib.dig_T2)) >> 11; + var1 = ((((adc_T>>3) - ((int32_t)_bme280_calib.dig_T1 <<1))) * + ((int32_t)_bme280_calib.dig_T2)) >> 11; - var2 = (((((adc_T>>4) - ((int32_t)bme280_calib.dig_T1)) * - ((adc_T>>4) - ((int32_t)bme280_calib.dig_T1))) >> 12) * - ((int32_t)bme280_calib.dig_T3)) >> 14; + var2 = (((((adc_T>>4) - ((int32_t)_bme280_calib.dig_T1)) * + ((adc_T>>4) - ((int32_t)_bme280_calib.dig_T1))) >> 12) * + ((int32_t)_bme280_calib.dig_T3)) >> 14; t_fine = var1 + var2; @@ -263,22 +262,22 @@ float Adafruit_BME280::readPressure(void) { adc_P >>= 4; var1 = ((int64_t)t_fine) - 128000; - var2 = var1 * var1 * (int64_t)bme280_calib.dig_P6; - var2 = var2 + ((var1*(int64_t)bme280_calib.dig_P5)<<17); - var2 = var2 + (((int64_t)bme280_calib.dig_P4)<<35); - var1 = ((var1 * var1 * (int64_t)bme280_calib.dig_P3)>>8) + - ((var1 * (int64_t)bme280_calib.dig_P2)<<12); - var1 = (((((int64_t)1)<<47)+var1))*((int64_t)bme280_calib.dig_P1)>>33; + var2 = var1 * var1 * (int64_t)_bme280_calib.dig_P6; + var2 = var2 + ((var1*(int64_t)_bme280_calib.dig_P5)<<17); + var2 = var2 + (((int64_t)_bme280_calib.dig_P4)<<35); + var1 = ((var1 * var1 * (int64_t)_bme280_calib.dig_P3)>>8) + + ((var1 * (int64_t)_bme280_calib.dig_P2)<<12); + var1 = (((((int64_t)1)<<47)+var1))*((int64_t)_bme280_calib.dig_P1)>>33; if (var1 == 0) { return 0; // avoid exception caused by division by zero } p = 1048576 - adc_P; p = (((p<<31) - var2)*3125) / var1; - var1 = (((int64_t)bme280_calib.dig_P9) * (p>>13) * (p>>13)) >> 25; - var2 = (((int64_t)bme280_calib.dig_P8) * p) >> 19; + var1 = (((int64_t)_bme280_calib.dig_P9) * (p>>13) * (p>>13)) >> 25; + var2 = (((int64_t)_bme280_calib.dig_P8) * p) >> 19; - p = ((p + var1 + var2) >> 8) + (((int64_t)bme280_calib.dig_P7)<<4); + p = ((p + var1 + var2) >> 8) + (((int64_t)_bme280_calib.dig_P7)<<4); return (float)p/256; } @@ -296,14 +295,14 @@ float Adafruit_BME280::readHumidity(void) { v_x1_u32r = (t_fine - ((int32_t)76800)); - v_x1_u32r = (((((adc_H << 14) - (((int32_t)bme280_calib.dig_H4) << 20) - - (((int32_t)bme280_calib.dig_H5) * v_x1_u32r)) + ((int32_t)16384)) >> 15) * - (((((((v_x1_u32r * ((int32_t)bme280_calib.dig_H6)) >> 10) * - (((v_x1_u32r * ((int32_t)bme280_calib.dig_H3)) >> 11) + ((int32_t)32768))) >> 10) + - ((int32_t)2097152)) * ((int32_t)bme280_calib.dig_H2) + 8192) >> 14)); + v_x1_u32r = (((((adc_H << 14) - (((int32_t)_bme280_calib.dig_H4) << 20) - + (((int32_t)_bme280_calib.dig_H5) * v_x1_u32r)) + ((int32_t)16384)) >> 15) * + (((((((v_x1_u32r * ((int32_t)_bme280_calib.dig_H6)) >> 10) * + (((v_x1_u32r * ((int32_t)_bme280_calib.dig_H3)) >> 11) + ((int32_t)32768))) >> 10) + + ((int32_t)2097152)) * ((int32_t)_bme280_calib.dig_H2) + 8192) >> 14)); v_x1_u32r = (v_x1_u32r - (((((v_x1_u32r >> 15) * (v_x1_u32r >> 15)) >> 7) * - ((int32_t)bme280_calib.dig_H1)) >> 4)); + ((int32_t)_bme280_calib.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; diff --git a/Adafruit_BME280.h b/Adafruit_BME280.h index b8cd51a..af2661e 100644 --- a/Adafruit_BME280.h +++ b/Adafruit_BME280.h @@ -160,6 +160,8 @@ class Adafruit_BME280 int8_t _cs, _mosi, _miso, _sck; + bme280_calib_data _bme280_calib; + }; #endif diff --git a/library.properties b/library.properties index 0cd3613..81c013b 100644 --- a/library.properties +++ b/library.properties @@ -1,5 +1,5 @@ name=Adafruit BME280 Library -version=1.0.0 +version=1.0.3 author=Adafruit maintainer=Adafruit sentence=Arduino library for BME280 sensors.