aboutsummaryrefslogtreecommitdiff
path: root/ROMFS
diff options
context:
space:
mode:
authorLorenz Meier <lm@inf.ethz.ch>2014-04-30 08:08:14 +0200
committerLorenz Meier <lm@inf.ethz.ch>2014-04-30 08:08:14 +0200
commit81525f6d8ad0c988cb666c0d8015e52ebdccaeb4 (patch)
tree89b53acac3ce7d4018cc366a7d3a6723341bac65 /ROMFS
parent848c1c2552996281685d2691c1b394f25a4391b3 (diff)
parente7ebcd6c572fe3550fd626530eb69b818e31be4a (diff)
downloadpx4-firmware-81525f6d8ad0c988cb666c0d8015e52ebdccaeb4.tar.gz
px4-firmware-81525f6d8ad0c988cb666c0d8015e52ebdccaeb4.tar.bz2
px4-firmware-81525f6d8ad0c988cb666c0d8015e52ebdccaeb4.zip
Merge branch 'master' of github.com:PX4/Firmware into ekf_params
Diffstat (limited to 'ROMFS')
-rw-r--r--ROMFS/px4fmu_common/init.d/rcS16
1 files changed, 14 insertions, 2 deletions
diff --git a/ROMFS/px4fmu_common/init.d/rcS b/ROMFS/px4fmu_common/init.d/rcS
index ea5cf8deb..492afcb4c 100644
--- a/ROMFS/px4fmu_common/init.d/rcS
+++ b/ROMFS/px4fmu_common/init.d/rcS
@@ -120,6 +120,8 @@ then
set EXIT_ON_END no
set MAV_TYPE none
set LOAD_DEFAULT_APPS yes
+ set GPS yes
+ set GPS_FAKE no
#
# Set DO_AUTOCONFIG flag to use it in AUTOSTART scripts
@@ -437,9 +439,19 @@ then
echo "[init] Start logging"
sh /etc/init.d/rc.logging
fi
-
- gps start
+ if [ $GPS == yes ]
+ then
+ echo "[init] Start GPS"
+ if [ $GPS_FAKE == yes ]
+ then
+ echo "[init] Faking GPS"
+ gps start -f
+ else
+ gps start
+ fi
+ fi
+
#
# Start up ARDrone Motor interface
#