mirror of
https://bitbucket.org/librepilot/librepilot.git
synced 2025-01-18 03:52:11 +01:00
Fixes the selection of the oversample settings from the pios_ms5611_cfg.oversapling configuration
This commit is contained in:
parent
c4b82fa1fd
commit
789746151a
@ -56,7 +56,6 @@ static uint32_t oversampling;
|
||||
static const struct pios_ms5611_cfg * dev_cfg;
|
||||
static int32_t i2c_id;
|
||||
|
||||
static enum pios_ms5611_osr osr = MS5611_OSR_256;
|
||||
|
||||
/**
|
||||
* Initialise the MS5611 sensor
|
||||
@ -90,10 +89,10 @@ int32_t PIOS_MS5611_StartADC(ConversionTypeTypeDef Type)
|
||||
{
|
||||
/* Start the conversion */
|
||||
if (Type == TemperatureConv) {
|
||||
while (PIOS_MS5611_WriteCommand(MS5611_TEMP_ADDR + osr) != 0)
|
||||
while (PIOS_MS5611_WriteCommand(MS5611_TEMP_ADDR + oversampling) != 0)
|
||||
continue;
|
||||
} else if (Type == PressureConv) {
|
||||
while (PIOS_MS5611_WriteCommand(MS5611_PRES_ADDR + osr) != 0)
|
||||
while (PIOS_MS5611_WriteCommand(MS5611_PRES_ADDR + oversampling) != 0)
|
||||
continue;
|
||||
}
|
||||
|
||||
@ -106,7 +105,7 @@ int32_t PIOS_MS5611_StartADC(ConversionTypeTypeDef Type)
|
||||
* @brief Return the delay for the current osr
|
||||
*/
|
||||
int32_t PIOS_MS5611_GetDelay() {
|
||||
switch(osr) {
|
||||
switch(oversampling) {
|
||||
case MS5611_OSR_256:
|
||||
return 2;
|
||||
case MS5611_OSR_512:
|
||||
|
@ -131,7 +131,7 @@ static const struct pios_hmc5883_cfg pios_hmc5883_cfg = {
|
||||
#if defined(PIOS_INCLUDE_MS5611)
|
||||
#include "pios_ms5611.h"
|
||||
static const struct pios_ms5611_cfg pios_ms5611_cfg = {
|
||||
.oversampling = 1,
|
||||
.oversampling = MS5611_OSR_512,
|
||||
};
|
||||
#endif /* PIOS_INCLUDE_MS5611 */
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user