From 93db51ecb96401edf73f09b94f56164397a276a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gina=20H=C3=A4u=C3=9Fge?= Date: Sun, 8 Sep 2013 16:00:47 +0200 Subject: [PATCH] Allow definition of additional glob patterns for serial ports Configuration happens via config.yaml, just add additional patterns by listing them under serial > additionalPorts, e.g. serial: additionalPorts: - /dev/myCustomPort - /dev/myOtherCustomPort --- octoprint/settings.py | 3 ++- octoprint/util/comm.py | 5 +++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/octoprint/settings.py b/octoprint/settings.py index cad4c8c9..7e0fab73 100644 --- a/octoprint/settings.py +++ b/octoprint/settings.py @@ -32,7 +32,8 @@ default_settings = { "detection": 0.5, "connection": 2, "communication": 5 - } + }, + "additionalPorts": [] }, "server": { "host": "0.0.0.0", diff --git a/octoprint/util/comm.py b/octoprint/util/comm.py index b7d788cc..5de61728 100644 --- a/octoprint/util/comm.py +++ b/octoprint/util/comm.py @@ -45,6 +45,11 @@ def serialList(): + glob.glob("/dev/tty.usb*") \ + glob.glob("/dev/cu.*") \ + glob.glob("/dev/rfcomm*") + + additionalPorts = settings().get(["serial", "additionalPorts"]) + for additional in additionalPorts: + baselist += glob.glob(additional) + prev = settings().get(["serial", "port"]) if prev in baselist: baselist.remove(prev)