diff options
| author | Anton Babushkin <anton.babushkin@me.com> | 2014-03-16 11:08:54 +0400 |
|---|---|---|
| committer | Anton Babushkin <anton.babushkin@me.com> | 2014-03-16 11:08:54 +0400 |
| commit | 82389e97028660a9ae908998772b9a93696e2e5b (patch) | |
| tree | 47546776a7693c92d223e7666a6e81dbf1c47768 /ROMFS/px4fmu_common/init.d/rcS | |
| parent | 5f847ff8a3df1ba303129a7a4938305a6901755c (diff) | |
| parent | 955bd402d2fb398fb64c55a885306b7054b55ce0 (diff) | |
| download | px4-firmware-82389e97028660a9ae908998772b9a93696e2e5b.tar.gz px4-firmware-82389e97028660a9ae908998772b9a93696e2e5b.tar.bz2 px4-firmware-82389e97028660a9ae908998772b9a93696e2e5b.zip | |
Merge branch 'beta_mavlink2' into mavlink2_hil
Diffstat (limited to 'ROMFS/px4fmu_common/init.d/rcS')
| -rw-r--r-- | ROMFS/px4fmu_common/init.d/rcS | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/ROMFS/px4fmu_common/init.d/rcS b/ROMFS/px4fmu_common/init.d/rcS index 8cb8f4dc7..635ec2ff8 100644 --- a/ROMFS/px4fmu_common/init.d/rcS +++ b/ROMFS/px4fmu_common/init.d/rcS @@ -120,6 +120,7 @@ then set MAVLINK_FLAGS default set EXIT_ON_END no set MAV_TYPE none + set LOAD_DEFAULT_APPS yes # # Set DO_AUTOCONFIG flag to use it in AUTOSTART scripts @@ -473,7 +474,10 @@ then sh /etc/init.d/rc.interface # Start standard fixedwing apps - sh /etc/init.d/rc.fw_apps + if [ LOAD_DEFAULT_APPS == yes ] + then + sh /etc/init.d/rc.fw_apps + fi fi # @@ -529,7 +533,10 @@ then sh /etc/init.d/rc.interface # Start standard multicopter apps - sh /etc/init.d/rc.mc_apps + if [ LOAD_DEFAULT_APPS == yes ] + then + sh /etc/init.d/rc.mc_apps + fi fi # |