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

gcode: Don't export respond_error() 

Don't export the respond_error() method as callers should raise a
gcode.error() instead.

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
This commit is contained in:
Kevin O'Connor 2020-04-24 14:59:25 -04:00
parent 568a0da50e
commit 61524542d2
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
klippy/gcode.py
View File

@ -123,7 +123,7 @@ class GCodeParser:
self.respond_info(msg) self.respond_info(msg)
return "" return ""
def _action_respond_error(self, msg): def _action_respond_error(self, msg):
self.respond_error(msg) self._respond_error(msg)
return "" return ""
def _get_gcode_position(self): def _get_gcode_position(self):
p = [lp - bp for lp, bp in zip(self.last_position, self.base_position)] p = [lp - bp for lp, bp in zip(self.last_position, self.base_position)]
@ -234,7 +234,7 @@ class GCodeParser:
try: try:
handler(params) handler(params)
except self.error as e: except self.error as e:
self.respond_error(str(e)) self._respond_error(str(e))
self.reset_last_position() self.reset_last_position()
self.printer.send_event("gcode:command_error") self.printer.send_event("gcode:command_error")
if not need_ack: if not need_ack:
@ -243,7 +243,7 @@ class GCodeParser:
msg = 'Internal error on command:"%s"' % (cmd,) msg = 'Internal error on command:"%s"' % (cmd,)
logging.exception(msg) logging.exception(msg)
self.printer.invoke_shutdown(msg) self.printer.invoke_shutdown(msg)
self.respond_error(msg) self._respond_error(msg)
if not need_ack: if not need_ack:
raise raise
self.ack() self.ack()
@ -328,7 +328,7 @@ class GCodeParser:
logging.info(msg) logging.info(msg)
lines = [l.strip() for l in msg.strip().split('\n')] lines = [l.strip() for l in msg.strip().split('\n')]
self.respond("// " + "\n// ".join(lines)) self.respond("// " + "\n// ".join(lines))
def respond_error(self, msg): def _respond_error(self, msg):
logging.warning(msg) logging.warning(msg)
lines = msg.strip().split('\n') lines = msg.strip().split('\n')
if len(lines) > 1: if len(lines) > 1:
@ -412,7 +412,7 @@ class GCodeParser:
# G-Code special command handlers # G-Code special command handlers
def cmd_default(self, params): def cmd_default(self, params):
if not self.is_printer_ready: if not self.is_printer_ready:
self.respond_error(self.printer.get_state_message()) raise self.error(self.printer.get_state_message())
return return
cmd = params.get('#command') cmd = params.get('#command')
if not cmd: if not cmd:
@ -683,7 +683,7 @@ class GCodeParser:
return return
msg = self.printer.get_state_message() msg = self.printer.get_state_message()
msg = msg.rstrip() + "\nKlipper state: Not ready" msg = msg.rstrip() + "\nKlipper state: Not ready"
self.respond_error(msg) raise self.error(msg)
cmd_HELP_when_not_ready = True cmd_HELP_when_not_ready = True
def cmd_HELP(self, params): def cmd_HELP(self, params):
cmdhelp = [] cmdhelp = []