From: daid <daid303@gmail.com>
Date: Wed, 18 Sep 2013 15:07:18 +0000 (+0200)
Subject: Fix storing of last auto detected serial port.
X-Git-Tag: 13.10~72
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=da957b7590d5e93dc4c2ce4ca39c0baa81e23246;p=cura.git

Fix storing of last auto detected serial port.
---

diff --git a/Cura/avr_isp/stk500v2.py b/Cura/avr_isp/stk500v2.py
index 82fb12f4..d52311b6 100644
--- a/Cura/avr_isp/stk500v2.py
+++ b/Cura/avr_isp/stk500v2.py
@@ -14,7 +14,7 @@ class Stk500v2(ispBase.IspBase):
 		self.progressCallback = None
 	
 	def connect(self, port = 'COM22', speed = 115200):
-		if self.serial != None:
+		if self.serial is not None:
 			self.close()
 		try:
 			self.serial = Serial(str(port), speed, timeout=1, writeTimeout=10000)
@@ -29,7 +29,7 @@ class Stk500v2(ispBase.IspBase):
 		time.sleep(0.1)
 		self.serial.setDTR(0)
 		time.sleep(0.2)
-		
+
 		self.sendMessage([1])
 		if self.sendMessage([0x10, 0xc8, 0x64, 0x19, 0x20, 0x00, 0x53, 0x03, 0xac, 0x53, 0x00, 0x00]) != [0x10, 0x00]:
 			self.close()
@@ -37,7 +37,7 @@ class Stk500v2(ispBase.IspBase):
 		self.serial.timeout = 5
 
 	def close(self):
-		if self.serial != None:
+		if self.serial is not None:
 			self.serial.close()
 			self.serial = None
 
diff --git a/Cura/util/machineCom.py b/Cura/util/machineCom.py
index a39654a2..9df8d721 100644
--- a/Cura/util/machineCom.py
+++ b/Cura/util/machineCom.py
@@ -291,7 +291,7 @@ class MachineCom(object):
 					self._log("Connecting to: %s" % (p))
 					programmer.connect(p)
 					self._serial = programmer.leaveISP()
-					profile.putPreference('serial_port_auto', p)
+					profile.putMachineSetting('serial_port_auto', p)
 					break
 				except ispBase.IspError as (e):
 					self._log("Error while connecting to %s: %s" % (p, str(e)))
@@ -395,7 +395,7 @@ class MachineCom(object):
 					else:
 						self._sendCommand("M999")
 						self._serial.timeout = 2
-						profile.putPreference('serial_baud_auto', self._serial.baudrate)
+						profile.putMachineSetting('serial_baud_auto', self._serial.baudrate)
 						self._changeState(self.STATE_OPERATIONAL)
 				else:
 					self._testingBaudrate = False