aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLorenz Meier <lm@inf.ethz.ch>2013-08-19 17:35:07 +0200
committerLorenz Meier <lm@inf.ethz.ch>2013-08-19 17:35:07 +0200
commitf4b5a17a7b6385869933cd195afd674fa532e735 (patch)
treeff1f58b85bedb34f4a78ab0381024586825c8867
parent871b4c19bc65bf923887e0bd32e1889db1c71aca (diff)
downloadpx4-firmware-f4b5a17a7b6385869933cd195afd674fa532e735.tar.gz
px4-firmware-f4b5a17a7b6385869933cd195afd674fa532e735.tar.bz2
px4-firmware-f4b5a17a7b6385869933cd195afd674fa532e735.zip
Improved sensor startup and error checking
-rw-r--r--ROMFS/px4fmu_common/init.d/rc.sensors4
-rw-r--r--src/modules/sensors/sensors.cpp2
-rw-r--r--src/systemcmds/preflight_check/preflight_check.c2
3 files changed, 6 insertions, 2 deletions
diff --git a/ROMFS/px4fmu_common/init.d/rc.sensors b/ROMFS/px4fmu_common/init.d/rc.sensors
index 17591be5b..4cfd59d54 100644
--- a/ROMFS/px4fmu_common/init.d/rc.sensors
+++ b/ROMFS/px4fmu_common/init.d/rc.sensors
@@ -24,6 +24,10 @@ then
hmc5883 start
set BOARD fmuv1
else
+ if hmc5883 start
+ then
+ echo "Using external mag"
+ fi
echo "using L3GD20 and LSM303D"
l3gd20 start
lsm303d start
diff --git a/src/modules/sensors/sensors.cpp b/src/modules/sensors/sensors.cpp
index a6204c9fa..6e57a79a8 100644
--- a/src/modules/sensors/sensors.cpp
+++ b/src/modules/sensors/sensors.cpp
@@ -953,7 +953,7 @@ Sensors::baro_init()
if (fd < 0) {
warn("%s", BARO_DEVICE_PATH);
- warnx("No barometer found, ignoring");
+ errx(1, "FATAL: No barometer found");
}
/* set the driver to poll at 150Hz */
diff --git a/src/systemcmds/preflight_check/preflight_check.c b/src/systemcmds/preflight_check/preflight_check.c
index d1dd85d47..e7d9ce85f 100644
--- a/src/systemcmds/preflight_check/preflight_check.c
+++ b/src/systemcmds/preflight_check/preflight_check.c
@@ -263,7 +263,7 @@ system_eval:
led_toggle(leds, LED_BLUE);
/* display and sound error */
- for (int i = 0; i < 150; i++)
+ for (int i = 0; i < 50; i++)
{
led_toggle(leds, LED_BLUE);
led_toggle(leds, LED_AMBER);