3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-05 13:03:59 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Merge branch 'master' into WIP_improve_initialization

Browse source
This commit is contained in:
Lipu Fei 2018-05-28 13:37:26 +02:00 • committed by GitHub
commit f395f1eebc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 42 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

3
plugins/USBPrinting/USBPrinterOutputDevice.py
View file

@ -379,13 +379,14 @@ class USBPrinterOutputDevice(PrinterOutputDevice):
def resumePrint(self):
self._paused = False
self._sendNextGcodeLine() #Send one line of g-code next so that we'll trigger an "ok" response loop even if we're not polling temperatures.
def cancelPrint(self):
self._gcode_position = 0
self._gcode.clear()
self._printers[0].updateActivePrintJob(None)
self._is_printing = False
self._is_paused = False
self._paused = False
# Turn off temperatures, fan and steppers
self._sendCommand("M140 S0")