bltouch: Use new GCodeCommand wrappers

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
This commit is contained in:
Kevin O'Connor 2020-04-24 23:12:40 -04:00
parent 4fd5090253
commit 203568b909
1 changed files with 8 additions and 8 deletions

View File

@ -235,24 +235,24 @@ class BLTouchEndstopWrapper:
self.send_cmd('pin_up') self.send_cmd('pin_up')
self.send_cmd(None) self.send_cmd(None)
cmd_BLTOUCH_DEBUG_help = "Send a command to the bltouch for debugging" cmd_BLTOUCH_DEBUG_help = "Send a command to the bltouch for debugging"
def cmd_BLTOUCH_DEBUG(self, params): def cmd_BLTOUCH_DEBUG(self, gcmd):
cmd = self.gcode.get_str('COMMAND', params, None) cmd = gcmd.get('COMMAND', None)
if cmd is None or cmd not in Commands: if cmd is None or cmd not in Commands:
self.gcode.respond_info("BLTouch commands: %s" % ( gcmd.respond_info("BLTouch commands: %s" % (
", ".join(sorted([c for c in Commands if c is not None])))) ", ".join(sorted([c for c in Commands if c is not None]))))
return return
self.gcode.respond_info("Sending BLTOUCH_DEBUG COMMAND=%s" % (cmd,)) gcmd.respond_info("Sending BLTOUCH_DEBUG COMMAND=%s" % (cmd,))
self.sync_print_time() self.sync_print_time()
self.send_cmd(cmd, duration=self.pin_move_time) self.send_cmd(cmd, duration=self.pin_move_time)
self.send_cmd(None) self.send_cmd(None)
self.sync_print_time() self.sync_print_time()
cmd_BLTOUCH_STORE_help = "Store an output mode in the BLTouch EEPROM" cmd_BLTOUCH_STORE_help = "Store an output mode in the BLTouch EEPROM"
def cmd_BLTOUCH_STORE(self, params): def cmd_BLTOUCH_STORE(self, gcmd):
cmd = self.gcode.get_str('MODE', params, None) cmd = gcmd.get('MODE', None)
if cmd is None or cmd not in ['5V', 'OD']: if cmd is None or cmd not in ['5V', 'OD']:
self.gcode.respond_info("BLTouch output modes: 5V, OD") gcmd.respond_info("BLTouch output modes: 5V, OD")
return return
self.gcode.respond_info("Storing BLTouch output mode: %s" % (cmd,)) gcmd.respond_info("Storing BLTouch output mode: %s" % (cmd,))
self.sync_print_time() self.sync_print_time()
self.store_output_mode(cmd) self.store_output_mode(cmd)
self.sync_print_time() self.sync_print_time()