RIOT-OS/RIOT
RIOT-OS/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2025-01-18 12:52:44 +01:00
Code Releases Activity

Merge pull request #7550 from smlng/enh/drivers/lps331ap/fix_overshift

Browse Source 
drivers, lps331ap: fix overshift error on 8Bit MCUs
This commit is contained in:
Sebastian Meiling 2017-09-01 10:06:08 +02:00 committed by GitHub
commit 68db903d49
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/lps331ap/lps331ap.c
View File

@ -86,7 +86,7 @@ int lps331ap_read_temp(const lps331ap_t *dev)
val |= tmp;
i2c_read_reg(dev->i2c, dev->address, LPS331AP_REG_TEMP_OUT_H, &tmp);
i2c_release(dev->i2c);
val |= (tmp << 8);
val |= ((uint16_t)tmp << 8);
/* compute actual temperature value in °C */
res += ((float)val) / TEMP_DIVIDER;
@ -105,13 +105,13 @@ int lps331ap_read_pres(const lps331ap_t *dev)
i2c_read_reg(dev->i2c, dev->address, LPS331AP_REG_PRESS_OUT_XL, &tmp);
val |= tmp;
i2c_read_reg(dev->i2c, dev->address, LPS331AP_REG_PRESS_OUT_L, &tmp);
val |= (tmp << 8);
val |= ((uint32_t)tmp << 8);
i2c_read_reg(dev->i2c, dev->address, LPS331AP_REG_PRESS_OUT_H, &tmp);
i2c_release(dev->i2c);
val |= (tmp << 16);
val |= ((uint32_t)tmp << 16);
/* see if value is negative */
if (tmp & 0x80) {
val |= (0xff << 24);
val |= ((uint32_t)0xff << 24);
}
/* compute actual pressure value in mbar */