diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2013-07-18 13:28:26 +0200 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2013-07-18 13:28:26 +0200 |
| commit | ad8fc7e61ed9f56b8c41eb0f3e9ee9226c0479c4 (patch) | |
| tree | e49120ba6d087dcf39e899451e680f443a5de8f7 /ROMFS | |
| parent | 3bea32af8d41585976b78c6dad2701df4180659f (diff) | |
| parent | 8d1abf4aa441e1c6c886e8af6ecaab2c3ca6e255 (diff) | |
| download | px4-firmware-ad8fc7e61ed9f56b8c41eb0f3e9ee9226c0479c4.tar.gz px4-firmware-ad8fc7e61ed9f56b8c41eb0f3e9ee9226c0479c4.tar.bz2 px4-firmware-ad8fc7e61ed9f56b8c41eb0f3e9ee9226c0479c4.zip | |
Merge branch 'master' of github.com:PX4/Firmware into fmuv2_bringup
Diffstat (limited to 'ROMFS')
| -rw-r--r-- | ROMFS/px4fmu_common/init.d/rc.sensors | 13 | ||||
| -rw-r--r-- | ROMFS/px4fmu_common/init.d/rc.usb | 27 |
2 files changed, 33 insertions, 7 deletions
diff --git a/ROMFS/px4fmu_common/init.d/rc.sensors b/ROMFS/px4fmu_common/init.d/rc.sensors index be481aa8d..f1f95e80c 100644 --- a/ROMFS/px4fmu_common/init.d/rc.sensors +++ b/ROMFS/px4fmu_common/init.d/rc.sensors @@ -34,9 +34,10 @@ fi # ALWAYS start this task before the # preflight_check. # -sensors start - -# -# Check sensors - run AFTER 'sensors start' -# -preflight_check
\ No newline at end of file +if sensors start +then + # + # Check sensors - run AFTER 'sensors start' + # + preflight_check +fi diff --git a/ROMFS/px4fmu_common/init.d/rc.usb b/ROMFS/px4fmu_common/init.d/rc.usb index 31af3991a..986821994 100644 --- a/ROMFS/px4fmu_common/init.d/rc.usb +++ b/ROMFS/px4fmu_common/init.d/rc.usb @@ -5,8 +5,33 @@ echo "Starting MAVLink on this USB console" +# Stop tone alarm +tone_alarm stop + # Tell MAVLink that this link is "fast" -mavlink start -b 230400 -d /dev/console +if mavlink stop +then + echo "stopped other MAVLink instance" +fi +mavlink start -b 230400 -d /dev/ttyACM0 + +# Start the commander +commander start + +# Start sensors +sh /etc/init.d/rc.sensors + +# Start one of the estimators +if attitude_estimator_ekf start +then + echo "estimating attitude" +fi + +# Start GPS +if gps start +then + echo "GPS started" +fi echo "MAVLink started, exiting shell.." |