3diy
/
klipper
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gcode: Remove parsing helpers from main gcode class 

Remove the parsing helpers from the main gcode class now that all
callers have been converted to use the parsing helpers in the
GCodeCommand class.

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
This commit is contained in:
Kevin O'Connor 2020-04-25 00:35:03 -04:00
parent a68bb935df
commit bf4bd5cfc1
1 changed files with 0 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
klippy/gcode.py
View File

@ -15,8 +15,6 @@ class GCodeCommand:
# Method wrappers # Method wrappers
self.respond_info = gcode.respond_info self.respond_info = gcode.respond_info
self.respond_raw = gcode.respond_raw self.respond_raw = gcode.respond_raw
self.__contains__ = self._params.__contains__
self.__getitem__ = self._params.__getitem__
def get_command(self): def get_command(self):
return self._command return self._command
def get_commandline(self): def get_commandline(self):
@ -277,8 +275,6 @@ class GCodeParser:
# Build gcode "params" dictionary # Build gcode "params" dictionary
params = { parts[i]: parts[i+1].strip() params = { parts[i]: parts[i+1].strip()
for i in range(1, numparts, 2) } for i in range(1, numparts, 2) }
params['#original'] = origline
params['#command'] = cmd
gcmd = GCodeCommand(self, cmd, origline, params) gcmd = GCodeCommand(self, cmd, origline, params)
# Invoke handler for command # Invoke handler for command
self.need_ack = need_ack self.need_ack = need_ack
@ -396,16 +392,6 @@ class GCodeParser:
def _respond_state(self, state): def _respond_state(self, state):
self.respond_info("Klipper state: %s" % (state,), log=False) self.respond_info("Klipper state: %s" % (state,), log=False)
# Parameter parsing helpers # Parameter parsing helpers
def get_str(self, name, gcmd, default=GCodeCommand.sentinel, parser=str,
minval=None, maxval=None, above=None, below=None):
return gcmd.get(name, default, parser, minval, maxval, above, below)
def get_int(self, name, gcmd, default=GCodeCommand.sentinel,
minval=None, maxval=None):
return gcmd.get_int(name, default, minval=minval, maxval=maxval)
def get_float(self, name, gcmd, default=GCodeCommand.sentinel,
minval=None, maxval=None, above=None, below=None):
return gcmd.get_float(name, default, minval=minval, maxval=maxval,
above=above, below=below)
extended_r = re.compile( extended_r = re.compile(
r'^\s*(?:N[0-9]+\s*)?' r'^\s*(?:N[0-9]+\s*)?'
r'(?P<cmd>[a-zA-Z_][a-zA-Z0-9_]+)(?:\s+|$)' r'(?P<cmd>[a-zA-Z_][a-zA-Z0-9_]+)(?:\s+|$)'
@ -420,8 +406,6 @@ class GCodeParser:
try: try:
eparams = [earg.split('=', 1) for earg in shlex.split(eargs)] eparams = [earg.split('=', 1) for earg in shlex.split(eargs)]
eparams = { k.upper(): v for k, v in eparams } eparams = { k.upper(): v for k, v in eparams }
eparams['#original'] = gcmd._params['#original']
eparams['#command'] = gcmd._params['#command']
gcmd._params.clear() gcmd._params.clear()
gcmd._params.update(eparams) gcmd._params.update(eparams)
return gcmd return gcmd