fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-04-14 10:07:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Corrected the interval of the MS5611"

Browse Source 
This reverts commit 094ff1261aa4a651e898c50d4451d283cb899a72.
This commit is contained in:
px4dev 2013-07-20 18:51:25 -07:00
parent bbecaa7de3
commit cfbdf7c903
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/drivers/ms5611/ms5611.cpp
View File

@ -336,9 +336,8 @@ MS5611::ioctl(struct file *filp, int cmd, unsigned long arg)
/* do we need to start internal polling? */
bool want_start = (_call_baro_interval == 0);
/* set interval to minimum legal value */
_baro_call.period = _call_baro_interval = MS5611_CONVERSION_INTERVAL;
/* set interval for next measurement to minimum legal value */
_baro_call.period = _call_baro_interval = USEC2TICK(MS5611_CONVERSION_INTERVAL);
/* if we need to start the poll state machine, do it */
if (want_start)
@ -352,12 +351,15 @@ MS5611::ioctl(struct file *filp, int cmd, unsigned long arg)
/* do we need to start internal polling? */
bool want_start = (_call_baro_interval == 0);
/* convert hz to tick interval via microseconds */
unsigned ticks = USEC2TICK(1000000 / arg);
/* check against maximum rate */
if (1000000/arg < MS5611_CONVERSION_INTERVAL)
if (ticks < USEC2TICK(MS5611_CONVERSION_INTERVAL))
return -EINVAL;
/* update interval */
_baro_call.period = _call_baro_interval = 1000000/arg;
/* update interval for next measurement */
_baro_call.period = _call_baro_interval = ticks;
/* if we need to start the poll state machine, do it */
if (want_start)