Merge remote-tracking branch 'origin/3.3'

This commit is contained in:
Lipu Fei 2018-04-19 09:20:22 +02:00
commit db5c18295b
6 changed files with 74 additions and 20 deletions

View file

@ -104,6 +104,9 @@ class USBPrinterOutputDevice(PrinterOutputDevice):
if self._is_printing:
return # Aleady printing
# cancel any ongoing preheat timer before starting a print
self._printers[0].getController().stopPreheatTimers()
Application.getInstance().getController().setActiveStage("MonitorStage")
# find the G-code for the active build plate to print