aboutsummaryrefslogtreecommitdiff
path: root/ROMFS/px4fmu_common/init.d/rc.mc_apps
diff options
context:
space:
mode:
authorThomas Gubler <thomasgubler@gmail.com>2015-01-21 14:41:03 +0100
committerThomas Gubler <thomasgubler@gmail.com>2015-01-21 14:41:03 +0100
commitdcdde8ea88bf57b0432d2b64ed3ce606795c8d00 (patch)
tree0bf6e997ffe7f7a9cda98c832dbce39601a9242f /ROMFS/px4fmu_common/init.d/rc.mc_apps
parent3a38b0fe359296aa19ec43ab82743aebeadb335c (diff)
parente8e4a3b5da058bd2ab8575c095dd74a5484333be (diff)
downloadpx4-firmware-dcdde8ea88bf57b0432d2b64ed3ce606795c8d00.tar.gz
px4-firmware-dcdde8ea88bf57b0432d2b64ed3ce606795c8d00.tar.bz2
px4-firmware-dcdde8ea88bf57b0432d2b64ed3ce606795c8d00.zip
Merge remote-tracking branch 'upstream/master' into ros_messagelayer_merge
Conflicts: src/modules/attitude_estimator_ekf/attitude_estimator_ekf_main.cpp src/modules/uORB/topics/vehicle_attitude.h
Diffstat (limited to 'ROMFS/px4fmu_common/init.d/rc.mc_apps')
-rw-r--r--ROMFS/px4fmu_common/init.d/rc.mc_apps5
1 files changed, 5 insertions, 0 deletions
diff --git a/ROMFS/px4fmu_common/init.d/rc.mc_apps b/ROMFS/px4fmu_common/init.d/rc.mc_apps
index 2248b0bcd..7b29fb3a7 100644
--- a/ROMFS/px4fmu_common/init.d/rc.mc_apps
+++ b/ROMFS/px4fmu_common/init.d/rc.mc_apps
@@ -15,3 +15,8 @@ else
mc_att_control_m start
fi
mc_pos_control start
+
+#
+# Start Land Detector
+#
+land_detector start multicopter