mirror of
https://github.com/Ultimaker/Cura.git
synced 2025-07-08 07:27:29 -06:00
usb connecting now correctly works for ultimaker + keeping connection allive when idling
This commit is contained in:
Jaime van Kessel
parent
bd651c6bcb
commit
e82fa17548
2 changed files with 181 additions and 44 deletions
|
|
@ -1,6 +1,9 @@
|
|||
from UM.Logger import Logger
|
||||
from .avr_isp import stk500v2, ispBase
|
||||
import serial
|
||||
import threading
|
||||
import time
|
||||
import queue
|
||||
|
||||
class PrinterConnection():
|
||||
def __init__(self, serial_port):
|
||||
|
|
@ -19,7 +22,57 @@ class PrinterConnection():
|
|||
|
||||
self._listen_thread = threading.Thread(target=self._listen)
|
||||
self._listen_thread.daemon = True
|
||||
#self._listen_thread.start()
|
||||
|
||||
self._heatup_wait_start_time = time.time()
|
||||
|
||||
## Queue for commands that need to be send. Used when command is sent when a print is active.
|
||||
self._command_queue = queue.Queue()
|
||||
|
||||
self._is_printing = False
|
||||
|
||||
## Set when print is started in order to check running time.
|
||||
self._print_start_time = None
|
||||
self._print_start_time_100 = None
|
||||
|
||||
## Keep track where in the provided g-code the print is
|
||||
self._gcode_position = 0
|
||||
|
||||
self._gcode = None
|
||||
self._extruder_count = 1
|
||||
self._extruder_temperatures = [0] * self._extruder_count
|
||||
self._target_extruder_temperatures = [0] * self._extruder_count
|
||||
self._target_bed_temperature = 0
|
||||
self._bed_temperature = 0
|
||||
|
||||
# In order to keep the connection alive we request the temperature every so often from a different extruder.
|
||||
# This index is the extruder we requested data from the last time.
|
||||
self._temperature_requested_extruder_index = 0
|
||||
|
||||
#TODO: Might need to add check that extruders can not be changed when it started printing or loading these settings from settings object
|
||||
def setNumExtuders(self, num):
|
||||
self._extruder_count = num
|
||||
self._extruder_temperatures = [0] * self._extruder_count
|
||||
self._target_extruder_temperatures = [0] * self._extruder_count
|
||||
|
||||
|
||||
#TODO: Needs more logic
|
||||
def isPrinting(self):
|
||||
if not self._is_connected or self._serial is None:
|
||||
return False
|
||||
|
||||
return self._is_printing
|
||||
|
||||
def printGCode(self, gcode_list):
|
||||
if self.isPrinting() or not self._is_connected:
|
||||
return
|
||||
self._gcode = gcode_list
|
||||
self._gcode_position = 0
|
||||
self._print_start_time_100 = None
|
||||
self._is_printing = True
|
||||
self._print_start_time = time.time()
|
||||
for i in range(0, 4): #Push first 4 entries before accepting other inputs
|
||||
self._sendNextGcodeLine()
|
||||
|
||||
def getSerialPort(self):
|
||||
return self._serial_port
|
||||
|
||||
|
|
@ -30,48 +83,47 @@ class PrinterConnection():
|
|||
def _connect(self):
|
||||
self._is_connecting = True
|
||||
programmer = stk500v2.Stk500v2()
|
||||
programmer.connect(self._serial_port) #Connect with the serial, if this succeeds, it's an arduino based usb device.
|
||||
|
||||
try:
|
||||
programmer.connect(self._serial_port) #Connect with the serial, if this succeeds, it's an arduino based usb device.
|
||||
self._serial = programmer.leaveISP()
|
||||
# Create new printer connection
|
||||
self.active_printer_connection = PrinterConnection(self._serial_port)
|
||||
Logger.log('i', "Established connection on port %s" % self._serial_port)
|
||||
except ispBase.IspError as e:
|
||||
Logger.log('i', "Could not establish connection on %s: %s. Device is not arduino based." %(self._serial_port,str(e)))
|
||||
except:
|
||||
Logger.log('i', "Could not establish connection on %s, unknown reasons. Device is not arduino based." % self._serial_port)
|
||||
|
||||
if self._serial is None:
|
||||
#Device is not arduino based, so we need to cycle the baud rates.
|
||||
for baud_rate in self._getBaudrateList():
|
||||
timeout_time = time.time() + 5
|
||||
if self._serial is None:
|
||||
self._serial = serial.Serial(str(self._port), baud_rate, timeout=5, writeTimeout=10000)
|
||||
else:
|
||||
if not self.setBaudRate(baud_rate):
|
||||
continue #Could not set the baud rate, go to the next
|
||||
sucesfull_responses = 0
|
||||
while timeout_time > time.time():
|
||||
line = self._readline()
|
||||
if "T:" in line:
|
||||
self._serial.timeout = 0.5
|
||||
self._sendCommand("M105") # Request temperature, as this should (if baudrate is correct) result in a command with 'T:' in it
|
||||
sucesfull_responses += 1
|
||||
if sucesfull_responses >= self._required_responses_auto_baud:
|
||||
self.setIsConnected(True)
|
||||
return
|
||||
self.setIsConnected(False)
|
||||
else:
|
||||
self.setIsConnected(True)
|
||||
return #Stop trying to connect, we are connected.
|
||||
|
||||
def _listen(self):
|
||||
pass
|
||||
for baud_rate in self._getBaudrateList():
|
||||
timeout_time = time.time() + 20
|
||||
if self._serial is None:
|
||||
self._serial = serial.Serial(str(self._serial_port), baud_rate, timeout=3, writeTimeout=10000)
|
||||
else:
|
||||
if not self.setBaudRate(baud_rate):
|
||||
continue #Could not set the baud rate, go to the next
|
||||
time.sleep(1.5) #Ensure that w are not talking to the bootloader
|
||||
sucesfull_responses = 0
|
||||
self._serial.write(b"\n")
|
||||
self._sendCommand("M105")
|
||||
while timeout_time > time.time():
|
||||
line = self._readline()
|
||||
if b"T:" in line:
|
||||
self._serial.timeout = 0.5
|
||||
self._serial.write(b"\n")
|
||||
self._sendCommand("M105") # Request temperature, as this should (if baudrate is correct) result in a command with 'T:' in it
|
||||
sucesfull_responses += 1
|
||||
if sucesfull_responses >= self._required_responses_auto_baud:
|
||||
self._serial.timeout = 2
|
||||
self.setIsConnected(True)
|
||||
return
|
||||
self.setIsConnected(False)
|
||||
|
||||
def setBaudRate(self, baud_rate):
|
||||
try:
|
||||
self._serial.baudrate = baud_rate
|
||||
except:
|
||||
return True
|
||||
except Exception as e:
|
||||
print(e)
|
||||
return False
|
||||
|
||||
def setIsConnected(self, state):
|
||||
|
|
@ -85,14 +137,61 @@ class PrinterConnection():
|
|||
self._listen_thread.start() #Start listening
|
||||
|
||||
def close(self):
|
||||
pass #TODO: handle
|
||||
if self._serial != None:
|
||||
self._serial.close()
|
||||
self.setIsConnected(False)
|
||||
self._serial = None
|
||||
|
||||
def isConnected(self):
|
||||
return self._is_connected
|
||||
|
||||
def _sendCommand(self, cmd):
|
||||
if self._serial is None:
|
||||
return
|
||||
if 'M109' in cmd or 'M190' in cmd:
|
||||
self._heatup_wait_start_time = time.time()
|
||||
if 'M104' in cmd or 'M109' in cmd:
|
||||
try:
|
||||
t = 0
|
||||
if 'T' in cmd:
|
||||
t = int(re.search('T([0-9]+)', cmd).group(1))
|
||||
self._target_extruder_temperatures[t] = float(re.search('S([0-9]+)', cmd).group(1))
|
||||
except:
|
||||
pass
|
||||
if 'M140' in cmd or 'M190' in cmd:
|
||||
try:
|
||||
self._target_bed_temperature = float(re.search('S([0-9]+)', cmd).group(1))
|
||||
except:
|
||||
pass
|
||||
Logger.log('i','Sending: %s' % (cmd))
|
||||
try:
|
||||
command = (cmd + '\n').encode()
|
||||
self._serial.write(command)
|
||||
except serial.SerialTimeoutException:
|
||||
Logger.log("w","Serial timeout while writing to serial port, trying again.")
|
||||
try:
|
||||
time.sleep(0.5)
|
||||
self._serial.write((cmd + '\n').encode())
|
||||
except Exception as e:
|
||||
Logger.log("e","Unexpected error while writing serial port %s " % e)
|
||||
self.close()
|
||||
except Exception as e:
|
||||
Logger.log('e',"Unexpected error while writing serial port %s" % e)
|
||||
self.close()
|
||||
|
||||
def __del__(self):
|
||||
self.close()
|
||||
|
||||
def sendCommand(self, cmd):
|
||||
if self.isPrinting():
|
||||
self._command_queue.put(cmd)
|
||||
elif self.isConnected():
|
||||
self._sendCommand(cmd)
|
||||
|
||||
def _listen(self):
|
||||
while True:
|
||||
while self._is_connected:
|
||||
line = self._readline()
|
||||
print("listening: " ,line.decode('utf-8',"replace"))
|
||||
if line is None:
|
||||
break #None is only returned when something went wrong. Stop listening
|
||||
|
||||
|
|
@ -102,29 +201,65 @@ class PrinterConnection():
|
|||
# But a bed temp error is reported as "Error: Temperature heated bed switched off. MAXTEMP triggered !!"
|
||||
# So we can have an extra newline in the most common case. Awesome work people.
|
||||
if re.match(b'Error:[0-9]\n', line):
|
||||
line = line.rstrip() + self._readline()
|
||||
line = line.rstrip() + self._readline()
|
||||
#Skip the communication errors, as those get corrected.
|
||||
if b'Extruder switched off' in line or b'Temperature heated bed switched off' in line or b'Something is wrong, please turn off the printer.' in line:
|
||||
if not self.hasError():
|
||||
self._error_state = line[6:]
|
||||
if b' T:' in line or line.startswith(b'T:'): #Temperature message
|
||||
elif b' T:' in line or line.startswith(b'T:'): #Temperature message
|
||||
try:
|
||||
print("TEMPERATURE", float(re.search("T: *([0-9\.]*)", line).group(1)))
|
||||
self._extruder_temperatures[self._temperatureRequestExtruder] = float(re.search("T: *([0-9\.]*)", line).group(1))
|
||||
except:
|
||||
pass
|
||||
if 'B:' in line: #Check if it's a bed temperature
|
||||
if b'B:' in line: #Check if it's a bed temperature
|
||||
try:
|
||||
print("BED TEMPERATURE" ,float(re.search("B: *([0-9\.]*)", line).group(1)))
|
||||
except:
|
||||
pass
|
||||
#TODO: temperature changed callback
|
||||
|
||||
if self._is_printing:
|
||||
if b'ok' in line:
|
||||
if not self._commandQueue.empty():
|
||||
self._sendCommand(self._commandQueue.get())
|
||||
else:
|
||||
self._sendNextGcodeLine()
|
||||
|
||||
else: #Request the temperature on comm timeout (every 2 seconds) when we are not printing.)
|
||||
if line == b'':
|
||||
if self._extruder_count > 0:
|
||||
self._temperature_requested_extruder_index = (self._temperature_requested_extruder_index + 1) % self._extruder_count
|
||||
self.sendCommand("M105 T%d" % self._temperature_requested_extruder_index)
|
||||
else:
|
||||
self.sendCommand("M105")
|
||||
|
||||
def _sendNextGcodeLine(self):
|
||||
if self._gcode_position >= len(self._gcode_list):
|
||||
#self._changeState(self.STATE_OPERATIONAL)
|
||||
return
|
||||
if self._gcode_position == 100:
|
||||
self._print_start_time_100 = time.time()
|
||||
line = self._gcode_list[self._gcode_position]
|
||||
|
||||
try:
|
||||
if line == 'M0' or line == 'M1':
|
||||
#self.setPause(True)
|
||||
line = 'M105' #Don't send the M0 or M1 to the machine, as M0 and M1 are handled as an LCD menu pause.
|
||||
if ('G0' in line or 'G1' in line) and 'Z' in line:
|
||||
z = float(re.search('Z([0-9\.]*)', line).group(1))
|
||||
if self._current_z != z:
|
||||
self._current_z = z
|
||||
except Exception as e:
|
||||
self._log("Unexpected error: %s" % e)
|
||||
checksum = reduce(lambda x,y:x^y, map(ord, "N%d%s" % (self._gcode_position, line)))
|
||||
self._sendCommand("N%d%s*%d" % (self._gcode_position, line, checksum))
|
||||
self._gcode_position += 1
|
||||
|
||||
|
||||
def hasError(self):
|
||||
return False
|
||||
|
||||
|
||||
def _readline(self):
|
||||
if self._serial is None:
|
||||
return None
|
||||
|
|
@ -133,17 +268,17 @@ class PrinterConnection():
|
|||
except:
|
||||
self._log("Unexpected error while reading serial port.")
|
||||
self._errorValue = getExceptionString()
|
||||
self.close(True)
|
||||
self.close()
|
||||
return None
|
||||
if ret == '':
|
||||
return ''
|
||||
#if ret == '':
|
||||
#return ''
|
||||
#self._log("Recv: %s" % (unicode(ret, 'ascii', 'replace').encode('ascii', 'replace').rstrip()))
|
||||
return ret
|
||||
|
||||
|
||||
## Create a list of baud rates at which we can communicate.
|
||||
# \return list of int
|
||||
def _getBaudrateList():
|
||||
def _getBaudrateList(self):
|
||||
ret = [250000, 230400, 115200, 57600, 38400, 19200, 9600]
|
||||
#if profile.getMachineSetting('serial_baud_auto') != '':
|
||||
#prev = int(profile.getMachineSetting('serial_baud_auto'))
|
||||
|
|
|
|||
|
|
@ -17,8 +17,10 @@ class USBPrinterManager(SignalEmitter,PluginObject):
|
|||
self._check_ports_thread = threading.Thread(target=self._updateConnectionList)
|
||||
self._check_ports_thread.daemon = True
|
||||
self._check_ports_thread.start()
|
||||
#time.sleep(2)
|
||||
#self.connectAllConnections()
|
||||
time.sleep(2)
|
||||
self.connectAllConnections()
|
||||
#time.sleep(1)
|
||||
#self._printer_connections[0]._sendCommand("M109")
|
||||
|
||||
## Check all serial ports and create a PrinterConnection object for them.
|
||||
# Note that this does not validate if the serial ports are actually usable!
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue