diff options
| author | Thomas Gubler <thomasgubler@gmail.com> | 2015-01-28 16:29:14 +0100 |
|---|---|---|
| committer | Thomas Gubler <thomasgubler@gmail.com> | 2015-01-28 16:29:14 +0100 |
| commit | 2728889f7886e3ab2fea16941d29e60ece0d4449 (patch) | |
| tree | ca9994d71205731ee4bb404175c2cf8f13fcc539 /ROMFS | |
| parent | f23e603d02ba416ae250770cdaad6a859d6bae69 (diff) | |
| parent | 1dcc5c49cc75778bcdde770f2d6c2700dd2bec2e (diff) | |
| download | px4-firmware-2728889f7886e3ab2fea16941d29e60ece0d4449.tar.gz px4-firmware-2728889f7886e3ab2fea16941d29e60ece0d4449.tar.bz2 px4-firmware-2728889f7886e3ab2fea16941d29e60ece0d4449.zip | |
Merge remote-tracking branch 'upstream/master' into ros_messagelayer_merge_attctlposctl
Diffstat (limited to 'ROMFS')
| -rw-r--r-- | ROMFS/px4fmu_common/init.d/rcS | 26 |
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 & |