Ensured startup of USB link, updated port ids to read from

This commit is contained in:
Lorenz Meier
2012-08-10 16:18:45 +02:00
parent 67e0f8b179
commit 4eef4e1864
2 changed files with 5 additions and 7 deletions
+1 -1
View File
@@ -103,7 +103,7 @@ setup_px4io:
# serial port defaults by operating system. # serial port defaults by operating system.
SYSTYPE = $(shell uname) SYSTYPE = $(shell uname)
ifeq ($(SYSTYPE),Darwin) 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 endif
ifeq ($(SYSTYPE),Linux) ifeq ($(SYSTYPE),Linux)
SERIAL_PORTS ?= "/dev/ttyACM5,/dev/ttyACM4,/dev/ttyACM3,/dev/ttyACM2,/dev/ttyACM1,/dev/ttyACM0" SERIAL_PORTS ?= "/dev/ttyACM5,/dev/ttyACM4,/dev/ttyACM3,/dev/ttyACM2,/dev/ttyACM1,/dev/ttyACM0"
+3 -5
View File
@@ -18,7 +18,6 @@
# can change this to prevent automatic startup of the flight script. # can change this to prevent automatic startup of the flight script.
# #
set MODE autostart set MODE autostart
set USB_ALLOWED yes
set USB no set USB no
# #
@@ -47,12 +46,11 @@ fi
# #
# Check for USB host # Check for USB host
# #
if [ $USB_ALLOWED == yes ] if sercon
then then
if sercon
then
echo "[init] USB interface connected" echo "[init] USB interface connected"
fi else
echo "[init] No USB connected"
fi fi
# #