RIOT-OS/RIOT
RIOT-OS/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2024-12-29 04:50:03 +01:00
Code Releases Activity

driver/bme280: add dependencies on temperature for pressure and humidity

Browse Source
This commit is contained in:
Michel Gerlach 2019-11-25 11:41:39 +01:00
parent 568e551c9b
commit 973d9fd54b
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/bmx280/bmx280.c
View File

@ -355,10 +355,11 @@ int16_t bmx280_read_temperature(bmx280_t *dev)
return (dev->t_fine * 5 + 128) >> 8;
}
uint32_t bmx280_read_pressure(const bmx280_t *dev)
uint32_t bmx280_read_pressure(bmx280_t *dev)
{
assert(dev);
bmx280_read_temperature(dev);
const bmx280_calibration_t *cal = &dev->calibration; /* helper variable */
/* Read the uncompensated pressure */
@ -397,10 +398,11 @@ uint32_t bmx280_read_pressure(const bmx280_t *dev)
}
#if defined(MODULE_BME280_SPI) || defined(MODULE_BME280_I2C)
uint16_t bme280_read_humidity(const bmx280_t *dev)
uint16_t bme280_read_humidity(bmx280_t *dev)
{
assert(dev);
bmx280_read_temperature(dev);
const bmx280_calibration_t *cal = &dev->calibration; /* helper variable */
/* Read the uncompensated pressure */

4
drivers/bmx280/bmx280_saul.c
View File

@ -35,7 +35,7 @@ static int read_temperature(const void *dev, phydat_t *res)
static int read_pressure(const void *dev, phydat_t *res)
{
res->val[0] = bmx280_read_pressure((const bmx280_t *)dev) / 100;
res->val[0] = bmx280_read_pressure((bmx280_t *)dev) / 100;
res->unit = UNIT_PA;
res->scale = 2;
@ -45,7 +45,7 @@ static int read_pressure(const void *dev, phydat_t *res)
#if defined(MODULE_BME280_SPI) || defined(MODULE_BME280_I2C)
static int read_relative_humidity(const void *dev, phydat_t *res)
{
res->val[0] = bme280_read_humidity((const bmx280_t *)dev);
res->val[0] = bme280_read_humidity((bmx280_t *)dev);
res->unit = UNIT_PERCENT;
res->scale = -2;

4
drivers/include/bmx280.h
View File

@ -283,7 +283,7 @@ int16_t bmx280_read_temperature(bmx280_t* dev);
*
* @return air pressure in PA
*/
uint32_t bmx280_read_pressure(const bmx280_t *dev);
uint32_t bmx280_read_pressure(bmx280_t *dev);
#if defined(MODULE_BME280_SPI) || defined(MODULE_BME280_I2C) || defined(DOXYGEN)
/**
@ -302,7 +302,7 @@ uint32_t bmx280_read_pressure(const bmx280_t *dev);
*
* @return humidity in centi %RH (i.e. the percentage times 100)
*/
uint16_t bme280_read_humidity(const bmx280_t *dev);
uint16_t bme280_read_humidity(bmx280_t *dev);
#endif
#ifdef __cplusplus