diff options
author | Kevin O'Connor <kevin@koconnor.net> | 2019-03-04 13:04:18 -0500 |
---|---|---|
committer | Kevin O'Connor <kevin@koconnor.net> | 2019-03-04 13:04:18 -0500 |
commit | 1731fbbca4ef799546fba47ccafd29c923c3d735 (patch) | |
tree | b8edfab6115d931e77903ba030401bdfec739ce8 /klippy/extras | |
parent | d62a41b930904f04c282e76de829f2bb21b5cd59 (diff) | |
download | kutter-1731fbbca4ef799546fba47ccafd29c923c3d735.tar.gz kutter-1731fbbca4ef799546fba47ccafd29c923c3d735.tar.xz kutter-1731fbbca4ef799546fba47ccafd29c923c3d735.zip |
gcode: Change respond_info() to log by default
It makes sense to log most respond_info() content, so do that by
default.
Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
Diffstat (limited to 'klippy/extras')
-rw-r--r-- | klippy/extras/bltouch.py | 5 | ||||
-rw-r--r-- | klippy/extras/display/menu.py | 5 | ||||
-rw-r--r-- | klippy/extras/tmc2130.py | 8 | ||||
-rw-r--r-- | klippy/extras/tmc2208.py | 8 | ||||
-rw-r--r-- | klippy/extras/z_tilt.py | 1 |
5 files changed, 7 insertions, 20 deletions
diff --git a/klippy/extras/bltouch.py b/klippy/extras/bltouch.py index 237fe690..889e23d2 100644 --- a/klippy/extras/bltouch.py +++ b/klippy/extras/bltouch.py @@ -118,7 +118,6 @@ class BLTouchEndstopWrapper: if retry >= 2: raise msg = "Failed to verify BLTouch probe is raised; retrying." - logging.warning(msg) self.gcode.respond_info(msg) self.next_cmd_time += RETRY_RESET_TIME continue @@ -172,9 +171,7 @@ class BLTouchEndstopWrapper: self.gcode.respond_info("BLTouch commands: %s" % ( ", ".join(sorted([c for c in Commands if c is not None])))) return - msg = "Sending BLTOUCH_DEBUG COMMAND=%s" % (cmd,) - self.gcode.respond_info(msg) - logging.info(msg) + self.gcode.respond_info("Sending BLTOUCH_DEBUG COMMAND=%s" % (cmd,)) self.sync_print_time() self.send_cmd(cmd, duration=self.pin_move_time) self.send_cmd(None) diff --git a/klippy/extras/display/menu.py b/klippy/extras/display/menu.py index e6304e39..b3c0ea16 100644 --- a/klippy/extras/display/menu.py +++ b/klippy/extras/display/menu.py @@ -1457,7 +1457,8 @@ class MenuManager: elif action == 'exit': self.exit() elif action == 'respond': - self.gcode.respond_info("{}".format(' '.join(map(str, args)))) + self.gcode.respond_info("{}".format(' '.join(map(str, args))), + log=False) elif action == 'event' and len(args) > 0: if len(str(args[0])) > 0: self.printer.send_event( @@ -1530,11 +1531,9 @@ class MenuManager: key1, key2, self.parameters[key1].get(key2) ) - logging.info(msg) self.gcode.respond_info(msg) else: msg = "{0} = {1}".format(key1, self.parameters.get(key1)) - logging.info(msg) self.gcode.respond_info(msg) # buttons & encoder callbacks diff --git a/klippy/extras/tmc2130.py b/klippy/extras/tmc2130.py index 0bbfcf32..67672659 100644 --- a/klippy/extras/tmc2130.py +++ b/klippy/extras/tmc2130.py @@ -280,15 +280,11 @@ class TMC2130: gcode.respond_info("========== Write-only registers ==========") for reg_name, val in self.regs.items(): if reg_name not in ReadRegisters: - msg = self.fields.pretty_format(reg_name, val) - logging.info(msg) - gcode.respond_info(msg) + gcode.respond_info(self.fields.pretty_format(reg_name, val)) gcode.respond_info("========== Queried registers ==========") for reg_name in ReadRegisters: val = self.get_register(reg_name) - msg = self.fields.pretty_format(reg_name, val) - logging.info(msg) - gcode.respond_info(msg) + gcode.respond_info(self.fields.pretty_format(reg_name, val)) cmd_INIT_TMC_help = "Initialize TMC stepper driver registers" def cmd_INIT_TMC(self, params): logging.info("INIT_TMC 2130 %s", self.name) diff --git a/klippy/extras/tmc2208.py b/klippy/extras/tmc2208.py index f312c205..51971b0a 100644 --- a/klippy/extras/tmc2208.py +++ b/klippy/extras/tmc2208.py @@ -359,9 +359,7 @@ class TMC2208: gcode.respond_info("========== Write-only registers ==========") for reg_name, val in self.regs.items(): if reg_name not in ReadRegisters: - msg = self.fields.pretty_format(reg_name, val) - logging.info(msg) - gcode.respond_info(msg) + gcode.respond_info(self.fields.pretty_format(reg_name, val)) gcode.respond_info("========== Queried registers ==========") for reg_name in ReadRegisters: try: @@ -373,9 +371,7 @@ class TMC2208: if reg_name == "IOIN": drv_type = self.fields.get_field("SEL_A", val) reg_name = "IOIN@TMC220x" if drv_type else "IOIN@TMC222x" - msg = self.fields.pretty_format(reg_name, val) - logging.info(msg) - gcode.respond_info(msg) + gcode.respond_info(self.fields.pretty_format(reg_name, val)) cmd_INIT_TMC_help = "Initialize TMC stepper driver registers" def cmd_INIT_TMC(self, params): logging.info("INIT_TMC 2208 %s", self.name) diff --git a/klippy/extras/z_tilt.py b/klippy/extras/z_tilt.py index 04b7d4c1..bcbfddd9 100644 --- a/klippy/extras/z_tilt.py +++ b/klippy/extras/z_tilt.py @@ -84,7 +84,6 @@ class ZTilt: stepstrs = ["%s = %.6f" % (s.get_name(), so) for so, s in positions] msg = "Making the following Z adjustments:\n%s\nz_adjust = %.6f" % ( "\n".join(stepstrs), z_adjust) - logging.info(msg) self.gcode.respond_info(msg) # Move each z stepper (sorted from lowest to highest) until they match positions.sort() |