aboutsummaryrefslogtreecommitdiff
path: root/ROMFS/px4fmu_common
diff options
context:
space:
mode:
authorLorenz Meier <lm@inf.ethz.ch>2015-01-26 08:59:19 +0100
committerLorenz Meier <lm@inf.ethz.ch>2015-01-26 08:59:19 +0100
commit18d756dd599f93abcd5dc89f323a5df77384ceac (patch)
treedb5d561379010436124979c0d4abd99e7f0e8890 /ROMFS/px4fmu_common
parenta7f6c0ea3a37688333a288dc53384d2c948c3ca0 (diff)
downloadpx4-firmware-18d756dd599f93abcd5dc89f323a5df77384ceac.tar.gz
px4-firmware-18d756dd599f93abcd5dc89f323a5df77384ceac.tar.bz2
px4-firmware-18d756dd599f93abcd5dc89f323a5df77384ceac.zip
USB startup: Ensure that we are not talking to the peripheral too soon. Startup does not take longer due to smart rearrangement of launch calls
Diffstat (limited to 'ROMFS/px4fmu_common')
-rw-r--r--ROMFS/px4fmu_common/init.d/rcS26
1 files changed, 5 insertions, 21 deletions
diff --git a/ROMFS/px4fmu_common/init.d/rcS b/ROMFS/px4fmu_common/init.d/rcS
index 2c9387ff0..4d337171a 100644
--- a/ROMFS/px4fmu_common/init.d/rcS
+++ b/ROMFS/px4fmu_common/init.d/rcS
@@ -6,6 +6,11 @@
#
#
+# Start CDC/ACM serial driver
+#
+sercon
+
+#
# Default to auto-start mode.
#
set MODE autostart
@@ -43,29 +48,8 @@ else
fi
unset FRC
-# if this is an APM build then there will be a rc.APM script
-# from an EXTERNAL_SCRIPTS build option
-if [ -f /etc/init.d/rc.APM ]
-then
- if sercon
- then
- echo "[i] USB interface connected"
- fi
-
- echo "[i] Running rc.APM"
- # if APM startup is successful then nsh will exit
- sh /etc/init.d/rc.APM
-fi
-
if [ $MODE == autostart ]
then
- echo "[i] AUTOSTART mode"
-
- #
- # Start CDC/ACM serial driver
- #
- sercon
-
# Try to get an USB console
nshterm /dev/ttyACM0 &