From: daid Date: Fri, 14 Mar 2014 07:53:00 +0000 (+0100) Subject: Fix serial communication on MacOS. X-Git-Tag: 14.03~6 X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=4ca6b45195a3f0eb0f422b751bea18c98a8cc954;p=cura.git Fix serial communication on MacOS. --- diff --git a/Cura/cura.py b/Cura/cura.py index 32b82158..ed82e8e4 100644 --- a/Cura/cura.py +++ b/Cura/cura.py @@ -34,7 +34,8 @@ def main(): if options.serialCommunication: from Cura import serialCommunication - serialCommunication.startMonitor(options.serialCommunication) + port, baud = options.serialCommunication.split(':') + serialCommunication.startMonitor(port, baud) return print "load preferences from " + profile.getPreferencePath() diff --git a/Cura/util/printerConnection/serialConnection.py b/Cura/util/printerConnection/serialConnection.py index 721b7725..2495f77a 100644 --- a/Cura/util/printerConnection/serialConnection.py +++ b/Cura/util/printerConnection/serialConnection.py @@ -178,9 +178,10 @@ class serialConnection(printerConnectionBase.printerConnectionBase): def _serialCommunicationThread(self): if platform.system() == "Darwin" and hasattr(sys, 'frozen'): cmdList = [os.path.join(os.path.dirname(sys.executable), 'Cura'), '--serialCommunication'] + cmdList += [self._portName + ':' + profile.getMachineSetting('serial_baud')] else: cmdList = [sys.executable, '-m', 'Cura.serialCommunication'] - cmdList += [self._portName, profile.getMachineSetting('serial_baud')] + cmdList += [self._portName, profile.getMachineSetting('serial_baud')] if platform.system() == "Darwin": if platform.machine() == 'i386': cmdList = ['arch', '-i386'] + cmdList