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

Merge pull request #4487 from fieldOfView/fix_marlin_press_to_resume

Browse Source 
Fix "press to resume" message after heating bed when usb is connected
This commit is contained in:
Lipu Fei 2018-10-23 10:27:40 +02:00 committed by GitHub
commit 1675ad4ba5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 28 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
plugins/USBPrinting/USBPrinterOutputDevice.py
View File

@ -64,6 +64,7 @@ class USBPrinterOutputDevice(PrinterOutputDevice):
self._accepts_commands = True self._accepts_commands = True
self._paused = False self._paused = False
self._printer_busy = False # when printer is preheating and waiting (M190/M109), or when waiting for action on the printer
self.setConnectionText(catalog.i18nc("@info:status", "Connected via USB")) self.setConnectionText(catalog.i18nc("@info:status", "Connected via USB"))
@ -73,6 +74,7 @@ class USBPrinterOutputDevice(PrinterOutputDevice):
self._command_received = Event() self._command_received = Event()
self._command_received.set() self._command_received.set()
self._firmware_name_requested = False
self._firmware_updater = AvrFirmwareUpdater(self) self._firmware_updater = AvrFirmwareUpdater(self)
CuraApplication.getInstance().getOnExitCallbackManager().addCallback(self._checkActivePrintingUponAppExit) CuraApplication.getInstance().getOnExitCallbackManager().addCallback(self._checkActivePrintingUponAppExit)
@ -223,15 +225,18 @@ class USBPrinterOutputDevice(PrinterOutputDevice):
except: except:
continue continue
if not self._firmware_name_requested:
self._firmware_name_requested = True
self.sendCommand("M115")
if b"FIRMWARE_NAME:" in line:
self._setFirmwareName(line)
if self._last_temperature_request is None or time() > self._last_temperature_request + self._timeout: if self._last_temperature_request is None or time() > self._last_temperature_request + self._timeout:
# Timeout, or no request has been sent at all. # Timeout, or no request has been sent at all.
self._command_received.set() # We haven't really received the ok, but we need to send a new command if not self._printer_busy: # Don't flood the printer with temperature requests while it is busy
self.sendCommand("M105")
self.sendCommand("M105") self._last_temperature_request = time()
self._last_temperature_request = time()
if self._firmware_name is None:
self.sendCommand("M115")
if re.search(b"[B|T\d*]: ?\d+\.?\d*", line): # Temperature message. 'T:' for extruder and 'B:' for bed if re.search(b"[B|T\d*]: ?\d+\.?\d*", line): # Temperature message. 'T:' for extruder and 'B:' for bed
extruder_temperature_matches = re.findall(b"T(\d*): ?(\d+\.?\d*) ?\/?(\d+\.?\d*)?", line) extruder_temperature_matches = re.findall(b"T(\d*): ?(\d+\.?\d*) ?\/?(\d+\.?\d*)?", line)
@ -264,29 +269,39 @@ class USBPrinterOutputDevice(PrinterOutputDevice):
if match[1]: if match[1]:
self._printers[0].updateTargetBedTemperature(float(match[1])) self._printers[0].updateTargetBedTemperature(float(match[1]))
if b"FIRMWARE_NAME:" in line: if line == b"":
self._setFirmwareName(line) # An empty line means that the firmware is idle
# Multiple empty lines probably means that the firmware and Cura are waiting
# for eachother due to a missed "ok", so we keep track of empty lines
self._firmware_idle_count += 1
else:
self._firmware_idle_count = 0
if line.startswith(b"ok") or self._firmware_idle_count > 1:
self._printer_busy = False
if b"ok" in line:
self._command_received.set() self._command_received.set()
if not self._command_queue.empty(): if not self._command_queue.empty():
self._sendCommand(self._command_queue.get()) self._sendCommand(self._command_queue.get())
if self._is_printing: elif self._is_printing:
if self._paused: if self._paused:
pass # Nothing to do! pass # Nothing to do!
else: else:
self._sendNextGcodeLine() self._sendNextGcodeLine()
if line.startswith(b"echo:busy:"):
self._printer_busy = True
if self._is_printing: if self._is_printing:
if line.startswith(b'!!'): if line.startswith(b'!!'):
Logger.log('e', "Printer signals fatal error. Cancelling print. {}".format(line)) Logger.log('e', "Printer signals fatal error. Cancelling print. {}".format(line))
self.cancelPrint() self.cancelPrint()
elif b"resend" in line.lower() or b"rs" in line: elif line.lower().startswith(b"resend") or line.startswith(b"rs"):
# A resend can be requested either by Resend, resend or rs. # A resend can be requested either by Resend, resend or rs.
try: try:
self._gcode_position = int(line.replace(b"N:", b" ").replace(b"N", b" ").replace(b":", b" ").split()[-1]) self._gcode_position = int(line.replace(b"N:", b" ").replace(b"N", b" ").replace(b":", b" ").split()[-1])
except: except:
if b"rs" in line: if line.startswith(b"rs"):
# In some cases of the RS command it needs to be handled differently. # In some cases of the RS command it needs to be handled differently.
self._gcode_position = int(line.split()[1]) self._gcode_position = int(line.split()[1])