pingu_98/MrDraw
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fixed array in array bug

Browse source
This commit is contained in:
make-ing 2015-11-13 16:17:44 +01:00
parent c547c714e8
commit 0e041ed4a9
1 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/octoprint/util/comm_acc2.py
View file

@ -1219,12 +1219,14 @@ def get_interval(t):
return settings().getFloat(["serial", "timeout", t])
def serialList():
baselist = [glob.glob("/dev/ttyUSB*"),
glob.glob("/dev/ttyACM*"),
glob.glob("/dev/tty.usb*"),
glob.glob("/dev/cu.*"),
glob.glob("/dev/cuaU*"),
glob.glob("/dev/rfcomm*")]
baselist = []
baselist = baselist \
+ glob.glob("/dev/ttyUSB*") \
+ glob.glob("/dev/ttyACM*") \
+ glob.glob("/dev/tty.usb*") \
+ glob.glob("/dev/cu.*") \
+ glob.glob("/dev/cuaU*") \
+ glob.glob("/dev/rfcomm*")
additionalPorts = settings().get(["serial", "additionalPorts"])
for additional in additionalPorts: