GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-04-22 05:39:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

Don't try to send empty g-code lines

Browse Source
This commit is contained in:
Jaime van Kessel 2017-03-23 19:42:52 +01:00
parent 6ff130c361
commit 645e3e8dfe
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
plugins/USBPrinting/USBPrinterOutputDevice.py
View File

@ -19,8 +19,8 @@ from PyQt5.QtCore import QUrl, pyqtSlot, pyqtSignal, pyqtProperty
from UM.i18n import i18nCatalog from UM.i18n import i18nCatalog
catalog = i18nCatalog("cura") catalog = i18nCatalog("cura")
class USBPrinterOutputDevice(PrinterOutputDevice):
class USBPrinterOutputDevice(PrinterOutputDevice):
def __init__(self, serial_port): def __init__(self, serial_port):
super().__init__(serial_port) super().__init__(serial_port)
self.setName(catalog.i18nc("@item:inmenu", "USB printing")) self.setName(catalog.i18nc("@item:inmenu", "USB printing"))
@ -559,6 +559,12 @@ class USBPrinterOutputDevice(PrinterOutputDevice):
if ";" in line: if ";" in line:
line = line[:line.find(";")] line = line[:line.find(";")]
line = line.strip() line = line.strip()
# Don't send empty lines
if line == "":
self._gcode_position += 1
return
try: try:
if line == "M0" or line == "M1": if line == "M0" or line == "M1":
line = "M105" # Don't send the M0 or M1 to the machine, as M0 and M1 are handled as an LCD menu pause. line = "M105" # Don't send the M0 or M1 to the machine, as M0 and M1 are handled as an LCD menu pause.

1
plugins/USBPrinting/USBPrinterOutputDeviceManager.py
View File

@ -238,7 +238,6 @@ class USBPrinterOutputDeviceManager(QObject, OutputDevicePlugin, Extension):
except KeyError: except KeyError:
Logger.log("w", "Connection state of %s changed, but it was not found in the list") Logger.log("w", "Connection state of %s changed, but it was not found in the list")
@pyqtProperty(QObject , notify = connectionStateChanged) @pyqtProperty(QObject , notify = connectionStateChanged)
def connectedPrinterList(self): def connectedPrinterList(self):
self._usb_output_devices_model = ListModel() self._usb_output_devices_model = ListModel()