From: daid <daid303@gmail.com>
Date: Mon, 3 Mar 2014 08:49:45 +0000 (+0100)
Subject: Use manual configured serial port if a port is configured.
X-Git-Tag: 14.03~18
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=2e333d461ba75f3fd44cac42b098f41a2703fbb6;p=cura.git

Use manual configured serial port if a port is configured.
---

diff --git a/Cura/util/printerConnection/serialConnection.py b/Cura/util/printerConnection/serialConnection.py
index a7591269..88e3047a 100644
--- a/Cura/util/printerConnection/serialConnection.py
+++ b/Cura/util/printerConnection/serialConnection.py
@@ -12,6 +12,7 @@ import sys
 import subprocess
 import json
 
+from Cura.util import profile
 from Cura.util import machineCom
 from Cura.util.printerConnection import printerConnectionBase
 
@@ -25,8 +26,11 @@ class serialConnectionGroup(printerConnectionBase.printerConnectionGroup):
 		self._connectionMap = {}
 
 	def getAvailableConnections(self):
-		serialList = machineCom.serialList(True)
-		for port in machineCom.serialList(True):
+		if profile.getMachineSetting('serial_port') == 'AUTO':
+			serialList = machineCom.serialList(True)
+		else:
+			serialList = [profile.getMachineSetting('serial_port')]
+		for port in serialList:
 			if port not in self._connectionMap:
 				self._connectionMap[port] = serialConnection(port)
 		for key in self._connectionMap.keys():