make upload on Linux much more reliable

Upload on Linux now only tries usb-3D_Robotics boards. This should
also make it handle more ports on MacOS

Tools/px_uploader.py

@@ -400,7 +400,19 @@ print("Loaded firmware for %x,%x, waiting for the bootloader..." % (fw.property(
 
 # Spin waiting for a device to show up
 while True:
-        for port in args.port.split(","):
+        portlist = []
+        patterns = args.port.split(",")
+        # on unix-like platforms use glob to support wildcard ports. This allows
+        # the use of /dev/serial/by-id/usb-3D_Robotics on Linux, which prevents the upload from
+        # causing modem hangups etc
+        if "linux" in _platform or "darwin" in _platform:
+                import glob
+                for pattern in patterns:
+                        portlist += glob.glob(pattern)
+        else:
+                portlist = patterns
+
+        for port in portlist:
 
                 #print("Trying %s" % port)
 

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"