From: daid Date: Wed, 24 Jul 2013 11:37:44 +0000 (+0200) Subject: Fix #508, only show /dev/tty devices in manual selection, not in auto detect. X-Git-Tag: 13.10~119 X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=9697df727f819be05f274d37b2a52738aca6568a;p=cura.git Fix #508, only show /dev/tty devices in manual selection, not in auto detect. --- diff --git a/Cura/util/machineCom.py b/Cura/util/machineCom.py index 4bae4dc0..0eaa39dd 100644 --- a/Cura/util/machineCom.py +++ b/Cura/util/machineCom.py @@ -39,10 +39,10 @@ def serialList(forAutoDetect=False): except: pass if forAutoDetect: - baselist = baselist + glob.glob('/dev/ttyUSB*') + glob.glob('/dev/ttyACM*') + glob.glob("/dev/tty.usb*") + glob.glob("/dev/cu.usb*") + baselist = baselist + glob.glob('/dev/ttyUSB*') + glob.glob('/dev/ttyACM*') + glob.glob("/dev/cu.usb*") baselist = filter(lambda s: not 'Bluetooth' in s, baselist) else: - baselist = baselist + glob.glob('/dev/ttyUSB*') + glob.glob('/dev/ttyACM*') + glob.glob("/dev/tty.usb*") + glob.glob("/dev/cu.*") + glob.glob("/dev/rfcomm*") + baselist = baselist + glob.glob('/dev/ttyUSB*') + glob.glob('/dev/ttyACM*') + glob.glob("/dev/cu.*") + glob.glob("/dev/tty.usb*") + glob.glob("/dev/rfcomm*") prev = profile.getPreference('serial_port_auto') if prev in baselist: baselist.remove(prev)