diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2012-08-10 16:18:45 +0200 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2012-08-10 16:18:45 +0200 |
| commit | 4eef4e186437c6b923df7b9dcffdc3723c411560 (patch) | |
| tree | ea534b094b4c0d539b75f430d5ffea561c2b22bf | |
| parent | 67e0f8b1791dfffe780a5add528bbcd1358c0421 (diff) | |
| download | px4-firmware-4eef4e186437c6b923df7b9dcffdc3723c411560.tar.gz px4-firmware-4eef4e186437c6b923df7b9dcffdc3723c411560.tar.bz2 px4-firmware-4eef4e186437c6b923df7b9dcffdc3723c411560.zip | |
Ensured startup of USB link, updated port ids to read from
| -rw-r--r-- | Makefile | 2 | ||||
| -rwxr-xr-x | ROMFS/scripts/rcS | 10 |
2 files changed, 5 insertions, 7 deletions
@@ -103,7 +103,7 @@ setup_px4io: # serial port defaults by operating system. SYSTYPE = $(shell uname) ifeq ($(SYSTYPE),Darwin) -SERIAL_PORTS ?= "/dev/tty.usbmodemPX1,/dev/tty.usbmodemPX2,/dev/tty.usbmodemPX3,/dev/tty.usbmodemPX4" +SERIAL_PORTS ?= "/dev/tty.usbmodemPX1,/dev/tty.usbmodemPX2,/dev/tty.usbmodemPX3,/dev/tty.usbmodemPX4,/dev/tty.usbmodem1,/dev/tty.usbmodem2,/dev/tty.usbmodem3,/dev/tty.usbmodem4" endif ifeq ($(SYSTYPE),Linux) SERIAL_PORTS ?= "/dev/ttyACM5,/dev/ttyACM4,/dev/ttyACM3,/dev/ttyACM2,/dev/ttyACM1,/dev/ttyACM0" diff --git a/ROMFS/scripts/rcS b/ROMFS/scripts/rcS index 9b9a2fd61..33f63ca87 100755 --- a/ROMFS/scripts/rcS +++ b/ROMFS/scripts/rcS @@ -18,7 +18,6 @@ # can change this to prevent automatic startup of the flight script. # set MODE autostart -set USB_ALLOWED yes set USB no # @@ -47,12 +46,11 @@ fi # # Check for USB host # -if [ $USB_ALLOWED == yes ] +if sercon then - if sercon - then - echo "[init] USB interface connected" - fi + echo "[init] USB interface connected" +else + echo "[init] No USB connected" fi # |