chiark / gitweb /
Fixed #234
authordaid303 <daid303@gmail.com>
Thu, 13 Dec 2012 09:56:26 +0000 (10:56 +0100)
committerdaid303 <daid303@gmail.com>
Thu, 13 Dec 2012 09:56:26 +0000 (10:56 +0100)
Cura/avr_isp/stk500v2.py
Cura/util/machineCom.py

index 7365d2cd5cd2aa9f72f1f53fc31fdabaefabefb5..99d8e2ea71fc0508f3068f49ee8b0cedef785cc7 100644 (file)
@@ -16,7 +16,7 @@ class Stk500v2(ispBase.IspBase):
                if self.serial != None:
                        self.close()
                try:
-                       self.serial = Serial(port, speed, timeout=1, writeTimeout=10000)
+                       self.serial = Serial(str(port), speed, timeout=1, writeTimeout=10000)
                except SerialException as e:
                        raise ispBase.IspError("Failed to open serial port")
                except:
index 2a826144beb723b97bb0d3b72960f7d3ca2832ff..4e72610f25fa81d571a27213d210d3c069f7854f 100644 (file)
@@ -286,9 +286,9 @@ class MachineCom(object):
                        try:
                                self._log("Connecting to: %s" % (self._port))
                                if self._baudrate == 0:
-                                       self._serial = serial.Serial(self._port, 115200, timeout=0.1, writeTimeout=10000)
+                                       self._serial = serial.Serial(str(self._port), 115200, timeout=0.1, writeTimeout=10000)
                                else:
-                                       self._serial = serial.Serial(self._port, self._baudrate, timeout=2, writeTimeout=10000)
+                                       self._serial = serial.Serial(str(self._port), self._baudrate, timeout=2, writeTimeout=10000)
                        except:
                                self._log("Unexpected error while connecting to serial port: %s %s" % (self._port, getExceptionString()))
                if self._serial == None: