aboutsummaryrefslogtreecommitdiff
path: root/src/drivers
diff options
context:
space:
mode:
authorLorenz Meier <lm@inf.ethz.ch>2014-06-30 00:46:29 +0200
committerLorenz Meier <lm@inf.ethz.ch>2014-06-30 00:46:29 +0200
commit28a31708f98eefa4ceb04617f2da3dd7892c99fa (patch)
treeb96ffb29110b72d164a7b6dd45ec481612a05e6a /src/drivers
parent6f75d1a20f6c66a8bfb87032048d1369d01fbb5e (diff)
parentafb5271bfb2f2645f0d48a802ed15b8f6509cd58 (diff)
downloadpx4-firmware-28a31708f98eefa4ceb04617f2da3dd7892c99fa.tar.gz
px4-firmware-28a31708f98eefa4ceb04617f2da3dd7892c99fa.tar.bz2
px4-firmware-28a31708f98eefa4ceb04617f2da3dd7892c99fa.zip
Merged estimator fixes and mavlink rate config bits
Diffstat (limited to 'src/drivers')
-rw-r--r--src/drivers/mpu6000/mpu6000.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/drivers/mpu6000/mpu6000.cpp b/src/drivers/mpu6000/mpu6000.cpp
index 321fdd173..0edec3d0e 100644
--- a/src/drivers/mpu6000/mpu6000.cpp
+++ b/src/drivers/mpu6000/mpu6000.cpp
@@ -544,7 +544,7 @@ void MPU6000::reset()
write_reg(MPUREG_USER_CTRL, BIT_I2C_IF_DIS);
irqrestore(state);
- up_udelay(1000);
+ usleep(1000);
// SAMPLE RATE
_set_sample_rate(_sample_rate);