diff options
| author | Thomas Gubler <thomasgubler@gmail.com> | 2015-01-28 08:15:01 +0100 |
|---|---|---|
| committer | Thomas Gubler <thomasgubler@gmail.com> | 2015-01-28 08:15:01 +0100 |
| commit | 0974a9515b780768d5329dd20996767956b3066a (patch) | |
| tree | 1439017e74398bd649f919b88d548b519be5ade4 /ROMFS/px4fmu_common/init.d/rcS | |
| parent | cfe2609ab63bf88f3b251eaf35d10c664efdbd9e (diff) | |
| parent | 52f3fe1d9af53e5f1dd40714aa177fcc4c5e0047 (diff) | |
| download | px4-firmware-0974a9515b780768d5329dd20996767956b3066a.tar.gz px4-firmware-0974a9515b780768d5329dd20996767956b3066a.tar.bz2 px4-firmware-0974a9515b780768d5329dd20996767956b3066a.zip | |
Merge remote-tracking branch 'upstream/master' into ros_messagelayer_merge_nuttx_bringupros_messagelayer_merge_nuttx_bringup
Conflicts:
nuttx-configs/px4fmu-v1/nsh/defconfig
Diffstat (limited to 'ROMFS/px4fmu_common/init.d/rcS')
| -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 043e0bc17..d14d6e48d 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 & |