diff options
| author | Trent Lukaczyk <aerialhedgehog@gmail.com> | 2015-02-05 20:19:04 -0800 |
|---|---|---|
| committer | Trent Lukaczyk <aerialhedgehog@gmail.com> | 2015-02-05 20:19:04 -0800 |
| commit | 531eaa231486c6af46394f6842d420447cb0ee0e (patch) | |
| tree | e7a90d8c50d700a2b7aff05c5a545162810d4967 /ROMFS/px4fmu_common/init.d | |
| parent | 6798aee13a5bb885966960cdba6ab57b14278ab0 (diff) | |
| parent | 7e6198b3dd517e1158431c8344c5912a6c28b363 (diff) | |
| download | px4-firmware-531eaa231486c6af46394f6842d420447cb0ee0e.tar.gz px4-firmware-531eaa231486c6af46394f6842d420447cb0ee0e.tar.bz2 px4-firmware-531eaa231486c6af46394f6842d420447cb0ee0e.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'ROMFS/px4fmu_common/init.d')
| -rw-r--r-- | ROMFS/px4fmu_common/init.d/rc.mc_apps | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/ROMFS/px4fmu_common/init.d/rc.mc_apps b/ROMFS/px4fmu_common/init.d/rc.mc_apps index 033b3b640..2ecc104df 100644 --- a/ROMFS/px4fmu_common/init.d/rc.mc_apps +++ b/ROMFS/px4fmu_common/init.d/rc.mc_apps @@ -8,8 +8,19 @@ attitude_estimator_ekf start #ekf_att_pos_estimator start position_estimator_inav start -mc_att_control start -mc_pos_control start +if mc_att_control start +then +else + # try the multiplatform version + mc_att_control_m start +fi + +if mc_pos_control start +then +else + # try the multiplatform version + mc_pos_control_m start +fi # # Start Land Detector |