Merge branch 'master' into feature_preheat_extruder

This commit is contained in:
fieldOfView 2018-01-17 17:36:40 +01:00
commit 6e0717a967
58 changed files with 806 additions and 328 deletions

View file

@ -80,6 +80,8 @@ class USBPrinterOutputDevice(PrinterOutputDevice):
self._firmware_progress = 0
self._firmware_update_state = FirmwareUpdateState.idle
self.setConnectionText(catalog.i18nc("@info:status", "Connected via USB"))
# Queue for commands that need to be send. Used when command is sent when a print is active.
self._command_queue = Queue()