diff --git a/drivers/abp2/abp2.c b/drivers/abp2/abp2.c index d0a2cc76fbef..764e3d71889a 100644 --- a/drivers/abp2/abp2.c +++ b/drivers/abp2/abp2.c @@ -67,12 +67,12 @@ int abp2_init(abp2_t *dev, const abp2_params_t *params) #else #pragma message("implement I2C code here") #endif - if(res) + if (res) { return ABP2_ERRBUS; + } /* test status byte: the busy flag should clear in about 5ms */ - while( (status & ABP2_STATUS_BUSY) && count) - { + while ((status & ABP2_STATUS_BUSY) && count) { #if defined(MODULE_ABP2_SPI) spi_acquire(params->spi, params->cs, SPI_MODE_0, params->clk); status = spi_transfer_byte(params->spi, params->cs, false, ABP2_CMD_NOP); @@ -84,8 +84,9 @@ int abp2_init(abp2_t *dev, const abp2_params_t *params) count--; } /* the busy flag should be clear */ - if(status & ABP2_STATUS_BUSY) + if (status & ABP2_STATUS_BUSY) { res = ABP2_ERRSENS; + } return res; } @@ -102,8 +103,9 @@ int abp2_measure(const abp2_t *dev) #else #pragma message("implement I2C code here") #endif - if(res) + if (res) { return ABP2_ERRBUS; + } #if defined(MODULE_ABP2_SPI) spi_acquire(dev->params->spi, dev->params->cs, SPI_MODE_0, dev->params->clk); spi_transfer_bytes(dev->params->spi, dev->params->cs, false, data_tx_meas_start, data_rx, len); @@ -112,8 +114,9 @@ int abp2_measure(const abp2_t *dev) #pragma message("implement I2C code here") #endif status = data_rx[0]; - if(status & ABP2_STATUS_MASK) + if (status & ABP2_STATUS_MASK) { return ABP2_ERRSENS; + } return res; } @@ -128,8 +131,9 @@ uint8_t abp2_getstatus(const abp2_t *dev) #else #pragma message("implement I2C code here") #endif - if(res) + if (res) { return ABP2_ERRBUS; + } #if defined(MODULE_ABP2_SPI) spi_acquire(dev->params->spi, dev->params->cs, SPI_MODE_0, dev->params->clk); status = spi_transfer_byte(dev->params->spi, dev->params->cs, false, ABP2_CMD_NOP); @@ -153,8 +157,9 @@ int abp2_read_raw(const abp2_t *dev, abp2_raw_t *raw_values) #else #pragma message("implement I2C code here") #endif - if(res) + if (res) { return ABP2_ERRBUS; + } #if defined(MODULE_ABP2_SPI) spi_acquire(dev->params->spi, dev->params->cs, SPI_MODE_0, dev->params->clk); spi_transfer_bytes(dev->params->spi, dev->params->cs, false, data_tx_nop_read, data_rx, len); @@ -163,17 +168,18 @@ int abp2_read_raw(const abp2_t *dev, abp2_raw_t *raw_values) #pragma message("implement I2C code here") #endif status = data_rx[0]; - if(status & ABP2_STATUS_MASK) + if (status & ABP2_STATUS_MASK) { return ABP2_ERRSENS; + } raw_values->cntPress = 0x00FFFFFF & (data_rx[1] << 16 | data_rx[2] << 8 | data_rx[3]); - raw_values->cntTemp= 0x00FFFFFF & (data_rx[4] << 16 | data_rx[5] << 8 | data_rx[6]); + raw_values->cntTemp = 0x00FFFFFF & (data_rx[4] << 16 | data_rx[5] << 8 | data_rx[6]); return res; } int abp2_measure_read(const abp2_t *dev, abp2_raw_t *raw_values) { - uint8_t status = 0xFF; /* sensor status byte */ + uint8_t status = 0xFF; /* sensor status byte */ int res = ABP2_OK; int len = sizeof(data_tx_meas_read) / sizeof(data_tx_meas_read[0]); uint8_t data_rx[ABP2_RX_BUF_LEN]; @@ -183,8 +189,9 @@ int abp2_measure_read(const abp2_t *dev, abp2_raw_t *raw_values) #else #pragma message("implement I2C code here") #endif - if(res) + if (res) { return ABP2_ERRBUS; + } #if defined(MODULE_ABP2_SPI) spi_acquire(dev->params->spi, dev->params->cs, SPI_MODE_0, dev->params->clk); spi_transfer_bytes(dev->params->spi, dev->params->cs, false, data_tx_meas_read, data_rx, len); @@ -193,10 +200,11 @@ int abp2_measure_read(const abp2_t *dev, abp2_raw_t *raw_values) #pragma message("implement I2C code here") #endif status = data_rx[0]; - if(status & ABP2_STATUS_MASK) + if (status & ABP2_STATUS_MASK) { return ABP2_ERRSENS; + } raw_values->cntPress = 0x00FFFFFF & (data_rx[1] << 16 | data_rx[2] << 8 | data_rx[3]); - raw_values->cntTemp= 0x00FFFFFF & (data_rx[4] << 16 | data_rx[5] << 8 | data_rx[6]); + raw_values->cntTemp = 0x00FFFFFF & (data_rx[4] << 16 | data_rx[5] << 8 | data_rx[6]); return res; } @@ -204,6 +212,7 @@ int abp2_measure_read(const abp2_t *dev, abp2_raw_t *raw_values) float abp2_pressure(const abp2_t *dev, const abp2_raw_t *raw_values) { float press = 0.0f; + press = (raw_values->cntPress - cntPMin); press /= (cntPMax - cntPMin); press *= (dev->params->rangeMax - dev->params->rangeMin);