diff options
author | Lorenz Meier <lm@inf.ethz.ch> | 2012-11-15 15:14:57 +0100 |
---|---|---|
committer | Lorenz Meier <lm@inf.ethz.ch> | 2012-11-15 15:14:57 +0100 |
commit | dad1304503f301a0a8ab0441d1eeab8638290376 (patch) | |
tree | 857603ff3d84c921da2ee930c48927d5c9dfc12a | |
parent | 1e213ea53c1745aba91db29e29a191d72e8e1810 (diff) | |
download | px4-firmware-dad1304503f301a0a8ab0441d1eeab8638290376.tar.gz px4-firmware-dad1304503f301a0a8ab0441d1eeab8638290376.tar.bz2 px4-firmware-dad1304503f301a0a8ab0441d1eeab8638290376.zip |
Cleaning up start scripts, enabling preflight check as default
-rw-r--r-- | ROMFS/scripts/rc.sensors | 25 | ||||
-rw-r--r-- | ROMFS/scripts/rc.standalone | 64 |
2 files changed, 15 insertions, 74 deletions
diff --git a/ROMFS/scripts/rc.sensors b/ROMFS/scripts/rc.sensors index f913e82af..536fcfd2c 100644 --- a/ROMFS/scripts/rc.sensors +++ b/ROMFS/scripts/rc.sensors @@ -8,21 +8,26 @@ # ms5611 start -mpu6000 start -hmc5883 start + +if mpu6000 start +then + echo "using MPU6000 and HMC5883L" + hmc5883 start +else + echo "using L3GD20 and LSM303D" + l3gd20 start + lsm303 start +fi # # Start the sensor collection task. +# IMPORTANT: this also loads param offsets +# ALWAYS start this task before the +# preflight_check. # sensors start # -# Test sensor functionality -# -# XXX integrate with 'sensors start' ? +# Check sensors - run AFTER 'sensors start' # -#if sensors quicktest -#then -# echo "[init] sensor initialisation FAILED." -# reboot -#fi +preflight_check
\ No newline at end of file diff --git a/ROMFS/scripts/rc.standalone b/ROMFS/scripts/rc.standalone index 8ccdb577b..67e95215b 100644 --- a/ROMFS/scripts/rc.standalone +++ b/ROMFS/scripts/rc.standalone @@ -10,68 +10,4 @@ echo "[init] doing standalone PX4FMU startup..." # uorb start -# -# Init the EEPROM -# -echo "[init] eeprom" -eeprom start -if [ -f /eeprom/parameters ] -then - param load -fi - -# -# Start the sensors. -# -#sh /etc/init.d/rc.sensors - -# -# Start MAVLink -# -# mavlink -d /dev/ttyS0 -b 57600 & - -# -# Start the commander. -# -# XXX this should be 'commander start'. -# -#commander & - -# -# Start the attitude estimator -# -# XXX this should be '<command> start'. -# -#attitude_estimator_bm & -#position_estimator & - -# -# Start the fixed-wing controller. -# -# XXX should this be looking for configuration to decide -# whether the board is configured for fixed-wing use? -# -# XXX this should be 'fixedwing_control start'. -# -#fixedwing_control & - -# -# Configure FMU for standalone mode -# -# XXX arguments? -# -#px4fmu start - -# -# Start looking for a GPS. -# -# XXX this should not need to be backgrounded -# -#gps -d /dev/ttyS3 -m all & - -# -# Start logging to microSD if we can -# -sh /etc/init.d/rc.logging - echo "[init] startup done" |