Fix serial communication on MacOS.

diff --git a/Cura/cura.py b/Cura/cura.py
index 32b82158dc588bc825d98f2ea7ccf0311a90f1a3..ed82e8e46aab1360d89dc02dc30198f0fbb824f4 100644 (file)
--- 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 721b772558e8ccfd5c609f5c74d2be266050cfd5..2495f77a3c087040a2fc767c6c9b492ced7ce230 100644 (file)
--- 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