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

Merge pull request #26 from ESP32DE/patch-1

Browse Source 
casting problem & Integer overflow issue fixed in "calc_pressure" API
This commit is contained in:
Bosch Sensortec 2018-02-21 07:54:13 +01:00 committed by GitHub
commit be1dc2d562
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bme680.c
View File

@ -924,7 +924,7 @@ static uint32_t calc_pressure(uint32_t pres_adc, const struct bme680_dev *dev)
var1 = ((32768 + var1) * (int32_t)dev->calib.par_p1) >> 15; var1 = ((32768 + var1) * (int32_t)dev->calib.par_p1) >> 15;
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));
var4 = (int32_t)(((uint32_t)1) << 31); var4 = (1 << 30);
if (pressure_comp >= var4) if (pressure_comp >= var4)
pressure_comp = ((pressure_comp / (uint32_t)var1) << 1); pressure_comp = ((pressure_comp / (uint32_t)var1) << 1);
else else