QIDITECH/klipper
1
0
Fork 0
mirror of https://github.com/QIDITECH/klipper.git synced 2026-01-30 23:48:43 +03:00
Code Issues Packages Projects Releases Wiki Activity

V4.4.21 Update

Browse Source
This commit is contained in:
CChen616
2024-07-19 19:02:31 +08:00
parent 7421224111
commit 5a41ce0a0e
2 changed files with 45 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

85
klippy/gcode.py
View File

@@ -197,38 +197,39 @@ class GCodeDispatch:
else: else:
self.break_flag = False self.break_flag = False
self.printer.lookup_object("heaters").break_flag = False self.printer.lookup_object("heaters").break_flag = False
while priority_queue: # # Priority queue
priority_command = priority_queue.pop(0) # while priority_queue:
# self.respond_info("priority: {}".format(priority_command)) # priority_command = priority_queue.pop(0)
cpos = priority_command.find(';') # # self.respond_info("priority: {}".format(priority_command))
if cpos >= 0: # cpos = priority_command.find(';')
priority_command = priority_command[:cpos] # if cpos >= 0:
parts = self.args_r.split(priority_command.upper()) # priority_command = priority_command[:cpos]
numparts = len(parts) # parts = self.args_r.split(priority_command.upper())
cmd = "" # numparts = len(parts)
if numparts >= 3 and parts[1] != 'N': # cmd = ""
cmd = parts[1] + parts[2].strip() # if numparts >= 3 and parts[1] != 'N':
elif numparts >= 5 and parts[1] == 'N': # cmd = parts[1] + parts[2].strip()
cmd = parts[3] + parts[4].strip() # elif numparts >= 5 and parts[1] == 'N':
params = { parts[i]: parts[i+1].strip() # cmd = parts[3] + parts[4].strip()
for i in range(1, numparts, 2) } # params = { parts[i]: parts[i+1].strip()
gcmd = GCodeCommand(self, cmd, priority_command, params, need_ack) # for i in range(1, numparts, 2) }
handler = self.gcode_handlers.get(cmd, self.cmd_default) # gcmd = GCodeCommand(self, cmd, priority_command, params, need_ack)
try: # handler = self.gcode_handlers.get(cmd, self.cmd_default)
handler(gcmd) # try:
except self.error as e: # handler(gcmd)
self._respond_error(str(e)) # except self.error as e:
self.printer.send_event("gcode:command_error") # self._respond_error(str(e))
if not need_ack: # self.printer.send_event("gcode:command_error")
raise # if not need_ack:
except: # raise
msg = 'Internal error on command:"%s"' % (cmd,) # except:
logging.exception(msg) # msg = 'Internal error on command:"%s"' % (cmd,)
self.printer.invoke_shutdown(msg) # logging.exception(msg)
self._respond_error(msg) # self.printer.invoke_shutdown(msg)
if not need_ack: # self._respond_error(msg)
raise # if not need_ack:
gcmd.ack() # raise
# gcmd.ack()
cpos = line.find(';') cpos = line.find(';')
if cpos >= 0: if cpos >= 0:
line = line[:cpos] line = line[:cpos]
@@ -265,16 +266,18 @@ class GCodeDispatch:
def run_script_from_command(self, script): def run_script_from_command(self, script):
self._process_commands(script.split('\n'), need_ack=False) self._process_commands(script.split('\n'), need_ack=False)
def run_script(self, script): def run_script(self, script):
lines = script.split('\n') # lines = script.split('\n')
temp_lines = [] # temp_lines = []
for line in lines: # for line in lines:
if set_gcode_offset_r.match(line) is not None: # if set_gcode_offset_r.match(line) is not None:
priority_queue.append(line) # priority_queue.append(line)
else: # else:
temp_lines.append(line) # temp_lines.append(line)
lines = temp_lines # lines = temp_lines
# with self.mutex:
# self._process_commands(lines, need_ack=False)
with self.mutex: with self.mutex:
self._process_commands(lines, need_ack=False) self._process_commands(script.split('\n'), need_ack=False)
def get_mutex(self): def get_mutex(self):
return self.mutex return self.mutex
def create_gcode_command(self, command, commandline, params): def create_gcode_command(self, command, commandline, params):

2
klippy/toolhead.py
View File

@@ -224,7 +224,7 @@ class ToolHead:
self.buffer_time_low = config.getfloat( self.buffer_time_low = config.getfloat(
'buffer_time_low', 1.000, above=0.) 'buffer_time_low', 1.000, above=0.)
self.buffer_time_high = config.getfloat( self.buffer_time_high = config.getfloat(
'buffer_time_high', 10.000, above=self.buffer_time_low) 'buffer_time_high', 2.000, above=self.buffer_time_low)
self.buffer_time_start = config.getfloat( self.buffer_time_start = config.getfloat(
'buffer_time_start', 0.250, above=0.) 'buffer_time_start', 0.250, above=0.)
self.move_flush_time = config.getfloat( self.move_flush_time = config.getfloat(