diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2013-09-12 13:54:59 +0200 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2013-09-12 13:54:59 +0200 |
| commit | df763ff7e24a8885313f6e8d472b834bd0a5e72d (patch) | |
| tree | 0277f3aa8c84943aa9600a869e6d8a9b96a805e5 /makefiles | |
| parent | da3620bd53ebe2276a491c89ca02247bbe97ca73 (diff) | |
| parent | 379623596715d0dce47192329ae9aceabb9ded11 (diff) | |
| download | px4-firmware-df763ff7e24a8885313f6e8d472b834bd0a5e72d.tar.gz px4-firmware-df763ff7e24a8885313f6e8d472b834bd0a5e72d.tar.bz2 px4-firmware-df763ff7e24a8885313f6e8d472b834bd0a5e72d.zip | |
Merged master
Diffstat (limited to 'makefiles')
| -rw-r--r-- | makefiles/upload.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/makefiles/upload.mk b/makefiles/upload.mk index 470ddfdf1..bc26d743d 100644 --- a/makefiles/upload.mk +++ b/makefiles/upload.mk @@ -12,10 +12,10 @@ SYSTYPE := $(shell uname -s) # XXX The uploader should be smarter than this. # ifeq ($(SYSTYPE),Darwin) -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" +SERIAL_PORTS ?= "/dev/tty.usbmodemPX*,/dev/tty.usbmodem*" endif ifeq ($(SYSTYPE),Linux) -SERIAL_PORTS ?= "/dev/ttyACM5,/dev/ttyACM4,/dev/ttyACM3,/dev/ttyACM2,/dev/ttyACM1,/dev/ttyACM0" +SERIAL_PORTS ?= "/dev/serial/by-id/usb-3D_Robotics*" endif ifeq ($(SERIAL_PORTS),) SERIAL_PORTS = "COM32,COM31,COM30,COM29,COM28,COM27,COM26,COM25,COM24,COM23,COM22,COM21,COM20,COM19,COM18,COM17,COM16,COM15,COM14,COM13,COM12,COM11,COM10,COM9,COM8,COM7,COM6,COM5,COM4,COM3,COM2,COM1,COM0" |