Merge remote-tracking branch 'origin/master'

Booli · Aug 30, 2014 · 9f46370 · 9f46370
2 parents e1bcbae + c5dbc71
commit 9f46370
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/src/octoprint/util/comm.py b/src/octoprint/util/comm.py
@@ -45,6 +45,7 @@ def serialList():
 			   + glob.glob("/dev/ttyAMA*") \
 			   + glob.glob("/dev/tty.usb*") \
 			   + glob.glob("/dev/cu.*") \
+			   + glob.glob("/dev/cuaU*") \
 			   + glob.glob("/dev/rfcomm*")
 
 	additionalPorts = settings().get(["serial", "additionalPorts"])