mhu/bme680-driver-fork
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

- Compensation equation in "calc_pressure" API updated

Browse Source
This commit is contained in:
Bosch Sensortec 2018-06-29 11:35:29 +02:00 committed by Kevin Goveas
parent e6b9bbade9
commit 63bb5336db
4 changed files with 2418 additions and 2418 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
README.md
View File

@ -10,9 +10,9 @@ The sensor driver package includes bme680.h, bme680.c and bme680_defs.h files
File | Version | Date File | Version | Date
--------------|---------|------------- --------------|---------|-------------
bme680.c | 3.5.8 | 22 Feb 2018 bme680.c | 3.5.9 | 19 Jun 2018
bme680.h | 3.5.8 | 22 Feb 2018 bme680.h | 3.5.9 | 19 Jun 2018
bme680_defs.h | 3.5.8 | 22 Feb 2018 bme680_defs.h | 3.5.9 | 19 Jun 2018
## Integration details ## Integration details

16
bme680.c
View File

@ -40,8 +40,8 @@
* patent rights of the copyright holder. * patent rights of the copyright holder.
* *
* File bme680.c * File bme680.c
* @date 22 Feb 2018 * @date 19 Jun 2018
* @version 3.5.8 * @version 3.5.9
* *
*/ */
@ -895,10 +895,10 @@ static int16_t calc_temperature(uint32_t temp_adc, struct bme680_dev *dev)
*/ */
static uint32_t calc_pressure(uint32_t pres_adc, const struct bme680_dev *dev) static uint32_t calc_pressure(uint32_t pres_adc, const struct bme680_dev *dev)
{ {
int32_t var1 = 0; int32_t var1;
int32_t var2 = 0; int32_t var2;
int32_t var3 = 0; int32_t var3;
int32_t pressure_comp = 0; int32_t pressure_comp;
var1 = (((int32_t)dev->calib.t_fine) >> 1) - 64000; var1 = (((int32_t)dev->calib.t_fine) >> 1) - 64000;
var2 = ((((var1 >> 2) * (var1 >> 2)) >> 11) * var2 = ((((var1 >> 2) * (var1 >> 2)) >> 11) *
@ -913,9 +913,9 @@ static uint32_t calc_pressure(uint32_t pres_adc, const struct bme680_dev *dev)
pressure_comp = 1048576 - pres_adc; pressure_comp = 1048576 - pres_adc;
pressure_comp = (int32_t)((pressure_comp - (var2 >> 12)) * ((uint32_t)3125)); pressure_comp = (int32_t)((pressure_comp - (var2 >> 12)) * ((uint32_t)3125));
if (pressure_comp >= BME680_MAX_OVERFLOW_VAL) if (pressure_comp >= BME680_MAX_OVERFLOW_VAL)
pressure_comp = ((pressure_comp / (uint32_t)var1) << 1); pressure_comp = ((pressure_comp / var1) << 1);
else else
pressure_comp = ((pressure_comp << 1) / (uint32_t)var1); pressure_comp = ((pressure_comp << 1) / var1);
var1 = ((int32_t)dev->calib.par_p9 * (int32_t)(((pressure_comp >> 3) * var1 = ((int32_t)dev->calib.par_p9 * (int32_t)(((pressure_comp >> 3) *
(pressure_comp >> 3)) >> 13)) >> 12; (pressure_comp >> 3)) >> 13)) >> 12;
var2 = ((int32_t)(pressure_comp >> 2) * var2 = ((int32_t)(pressure_comp >> 2) *

4
bme680.h
View File

@ -40,8 +40,8 @@
* patent rights of the copyright holder. * patent rights of the copyright holder.
* *
* @file bme680.h * @file bme680.h
* @date 22 Feb 2018 * @date 19 Jun 2018
* @version 3.5.8 * @version 3.5.9
* @brief * @brief
* *
*/ */

4
bme680_defs.h
View File

@ -40,8 +40,8 @@
* patent rights of the copyright holder. * patent rights of the copyright holder.
* *
* @file bme680_defs.h * @file bme680_defs.h
* @date 22 Feb 2018 * @date 19 Jun 2018
* @version 3.5.8 * @version 3.5.9
* @brief * @brief
* *
*/ */