aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorLorenz Meier <lm@inf.ethz.ch>2013-08-20 10:55:21 +0200
committerLorenz Meier <lm@inf.ethz.ch>2013-08-20 10:55:21 +0200
commitfd911cd006b749b02ed26f1929af9ebf18b89bf5 (patch)
treedfdab1d867b505065461f97b13662fde874745c1 /src
parent0be4508cb32c70090326a3f5e1cab0acdda6e945 (diff)
parentb7cc1c880f94138655696d7bd4a526fc218a4242 (diff)
downloadpx4-firmware-fd911cd006b749b02ed26f1929af9ebf18b89bf5.tar.gz
px4-firmware-fd911cd006b749b02ed26f1929af9ebf18b89bf5.tar.bz2
px4-firmware-fd911cd006b749b02ed26f1929af9ebf18b89bf5.zip
Merge branch 'master' of github.com:PX4/Firmware into fmuv2_bringup_new_state_machine_drton
Diffstat (limited to 'src')
-rw-r--r--src/drivers/mpu6000/mpu6000.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/drivers/mpu6000/mpu6000.cpp b/src/drivers/mpu6000/mpu6000.cpp
index 9d498bbd6..bfc74c73e 100644
--- a/src/drivers/mpu6000/mpu6000.cpp
+++ b/src/drivers/mpu6000/mpu6000.cpp
@@ -689,6 +689,8 @@ MPU6000::accel_self_test()
return 1;
if (fabsf(_accel_scale.z_scale - 1.0f) > 0.4f || fabsf(_accel_scale.z_scale - 1.0f) < 0.000001f)
return 1;
+
+ return 0;
}
int