aboutsummaryrefslogtreecommitdiff
path: root/ROMFS
diff options
context:
space:
mode:
authorLorenz Meier <lm@inf.ethz.ch>2014-03-14 18:11:46 +0100
committerLorenz Meier <lm@inf.ethz.ch>2014-03-14 18:11:46 +0100
commite590d96c0a7aa4a06a36423bae3db42ada226bc5 (patch)
treec0293baa42b26848a67e5398bd2f3fd1972be35f /ROMFS
parent5d1eef17fae18b298b9bd8fa958348b180752744 (diff)
parentbfe8d735604511da44c63e74efa1cba5eb694064 (diff)
downloadpx4-firmware-e590d96c0a7aa4a06a36423bae3db42ada226bc5.tar.gz
px4-firmware-e590d96c0a7aa4a06a36423bae3db42ada226bc5.tar.bz2
px4-firmware-e590d96c0a7aa4a06a36423bae3db42ada226bc5.zip
Merge pull request #734 from thomasgubler/rcs_defaultappsflag
rcS: introduce flag that allows disabling startup of the default apps
Diffstat (limited to 'ROMFS')
-rw-r--r--ROMFS/px4fmu_common/init.d/rcS11
1 files changed, 9 insertions, 2 deletions
diff --git a/ROMFS/px4fmu_common/init.d/rcS b/ROMFS/px4fmu_common/init.d/rcS
index 57299d772..55e2a886e 100644
--- a/ROMFS/px4fmu_common/init.d/rcS
+++ b/ROMFS/px4fmu_common/init.d/rcS
@@ -118,6 +118,7 @@ then
set MKBLCTRL_MODE none
set FMU_MODE pwm
set MAV_TYPE none
+ set LOAD_DEFAULT_APPS yes
#
# Set DO_AUTOCONFIG flag to use it in AUTOSTART scripts
@@ -465,7 +466,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
#
@@ -521,7 +525,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
#