diff options
author | Arjen Hiemstra <ahiemstra@heimr.nl> | 2015-06-24 13:06:39 +0300 |
---|---|---|
committer | Arjen Hiemstra <ahiemstra@heimr.nl> | 2015-06-24 13:06:39 +0300 |
commit | a429e362ad979a5c8fb9f21d780c05f59132649d (patch) | |
tree | 44d6e84ede60d2acb3e18e380579e940dd9936d3 /plugins/USBPrinting/PrinterConnection.py | |
parent | c387cd9420bab49e0ed7ac4f58b45470022537d2 (diff) | |
parent | 074ebb92430e5a35e23f12ae4d882c249b393f4e (diff) |
Merge branch '15.06'
* 15.06:
Update changelog
Correct the bottom offset we add when setting the volume for scale to max
Display progress information during processing of layer data
If findObject returns none but object_id != 0 use the selected object
Offset the displayed rotation angle so it does not overlap the mouse cursor
Abort attempts to connect if an error is thrown when connecting to the serial port
Fix recent files on Windows
Defer opening the webbrowser until the next run of the event loop
Disable slicing and platform physics when an operation is being performed
Rework LayerData mesh generation for improved performance
Performance: Only calculate the platform center once, not for every poly
Add application icons for all three platforms
Diffstat (limited to 'plugins/USBPrinting/PrinterConnection.py')
-rw-r--r-- | plugins/USBPrinting/PrinterConnection.py | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/plugins/USBPrinting/PrinterConnection.py b/plugins/USBPrinting/PrinterConnection.py index 4a9a73bb7b..2ac8dbab0f 100644 --- a/plugins/USBPrinting/PrinterConnection.py +++ b/plugins/USBPrinting/PrinterConnection.py @@ -173,6 +173,10 @@ class PrinterConnection(SignalEmitter): Logger.log("i", "Could not establish connection on %s: %s. Device is not arduino based." %(self._serial_port,str(e))) except Exception as e: Logger.log("i", "Could not establish connection on %s, unknown reasons. Device is not arduino based." % self._serial_port) + + if not self._serial or not programmer.serial: + self._is_connecting = False + return # If the programmer connected, we know its an atmega based version. Not all that usefull, but it does give some debugging information. for baud_rate in self._getBaudrateList(): # Cycle all baud rates (auto detect) |