Mirror
/
klipper-dgus
mirror of https://github.com/Desuuuu/klipper.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

tmc: Simplify internal DUMP_TMC interface 

Only the tmc2208 driver needs special read register translation logic.
Rework the code so a default implementation is available for all the
other drivers.

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
This commit is contained in:
Kevin O'Connor 2019-06-23 12:37:27 -04:00
parent cf0a42ed6b
commit 52b5ca182c
6 changed files with 19 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
klippy/extras/tmc.py
View File

@ -86,7 +86,7 @@ class TMCCommandHelper:
self.name = config.get_name().split()[-1]
self.mcu_tmc = mcu_tmc
self.fields = mcu_tmc.get_fields()
self.query_registers = None
self.read_registers = self.read_translate = None
self.gcode = self.printer.lookup_object("gcode")
self.gcode.register_mux_command(
"SET_TMC_FIELD", "STEPPER", self.name,
@ -131,8 +131,9 @@ class TMCCommandHelper:
print_time = self.printer.lookup_object('toolhead').get_last_move_time()
self.mcu_tmc.set_register(reg_name, reg_val, print_time)
# DUMP_TMC support
def setup_register_dump(self, query_registers):
self.query_registers = query_registers
def setup_register_dump(self, read_registers, read_translate=None):
self.read_registers = read_registers
self.read_translate = read_translate
self.gcode.register_mux_command(
"DUMP_TMC", "STEPPER", self.name,
self.cmd_DUMP_TMC, desc=self.cmd_DUMP_TMC_help)
@ -140,15 +141,16 @@ class TMCCommandHelper:
def cmd_DUMP_TMC(self, params):
logging.info("DUMP_TMC %s", self.name)
print_time = self.printer.lookup_object('toolhead').get_last_move_time()
read_regs = self.query_registers(print_time)
read_regs_by_name = { reg_name: val for reg_name, val in read_regs }
self.gcode.respond_info("========== Write-only registers ==========")
for reg_name, val in self.fields.registers.items():
if reg_name not in read_regs_by_name:
if reg_name not in self.read_registers:
self.gcode.respond_info(
self.fields.pretty_format(reg_name, val))
self.gcode.respond_info("========== Queried registers ==========")
for reg_name, val in read_regs:
for reg_name in self.read_registers:
val = self.mcu_tmc.get_register(reg_name)
if self.read_translate is not None:
reg_name, val = self.read_translate(reg_name, val)
self.gcode.respond_info(self.fields.pretty_format(reg_name, val))

5
klippy/extras/tmc2130.py
View File

@ -208,7 +208,7 @@ class TMC2130:
tmc.TMCEndstopHelper(config, self.mcu_tmc, diag1_pin)
# Register commands
cmdhelper = tmc.TMCCommandHelper(config, self.mcu_tmc)
cmdhelper.setup_register_dump(self.query_registers)
cmdhelper.setup_register_dump(ReadRegisters)
# Setup basic register values
TMCCurrentHelper(config, self.mcu_tmc)
mh = tmc.TMCMicrostepHelper(config, self.mcu_tmc)
@ -229,9 +229,6 @@ class TMC2130:
set_config_field(config, "pwm_freq", 1)
set_config_field(config, "pwm_autoscale", True)
set_config_field(config, "sgt", 0)
def query_registers(self, print_time=0.):
return [(reg_name, self.mcu_tmc.get_register(reg_name))
for reg_name in ReadRegisters]
def load_config_prefix(config):
return TMC2130(config)

18
klippy/extras/tmc2208.py
View File

@ -189,7 +189,7 @@ class TMC2208:
self.mcu_tmc = tmc_uart.MCU_TMC_uart(config, Registers, self.fields)
# Register commands
cmdhelper = tmc.TMCCommandHelper(config, self.mcu_tmc)
cmdhelper.setup_register_dump(self.query_registers)
cmdhelper.setup_register_dump(ReadRegisters, self.read_translate)
# Setup basic register values
self.fields.set_field("pdn_disable", True)
self.fields.set_field("mstep_reg_select", True)
@ -215,17 +215,11 @@ class TMC2208:
set_config_field(config, "pwm_autograd", True)
set_config_field(config, "PWM_REG", 8)
set_config_field(config, "PWM_LIM", 12)
def query_registers(self, print_time=0.):
out = []
for reg_name in ReadRegisters:
val = self.mcu_tmc.get_register(reg_name)
# IOIN has different mappings depending on the driver type
# (SEL_A field of IOIN reg)
if reg_name == "IOIN":
drv_type = self.fields.get_field("SEL_A", val)
reg_name = "IOIN@TMC220x" if drv_type else "IOIN@TMC222x"
out.append((reg_name, val))
return out
def read_translate(self, reg_name, val):
if reg_name == "IOIN":
drv_type = self.fields.get_field("SEL_A", val)
reg_name = "IOIN@TMC220x" if drv_type else "IOIN@TMC222x"
return reg_name, val
def load_config_prefix(config):
return TMC2208(config)

5
klippy/extras/tmc2209.py
View File

@ -61,7 +61,7 @@ class TMC2209:
self.mcu_tmc = tmc_uart.MCU_TMC_uart(config, Registers, self.fields)
# Register commands
cmdhelper = tmc.TMCCommandHelper(config, self.mcu_tmc)
cmdhelper.setup_register_dump(self.query_registers)
cmdhelper.setup_register_dump(ReadRegisters)
# Setup basic register values
self.fields.set_field("pdn_disable", True)
self.fields.set_field("mstep_reg_select", True)
@ -88,9 +88,6 @@ class TMC2209:
set_config_field(config, "PWM_REG", 8)
set_config_field(config, "PWM_LIM", 12)
set_config_field(config, "SGTHRS", 0)
def query_registers(self, print_time=0.):
return [(reg_name, self.mcu_tmc.get_register(reg_name))
for reg_name in ReadRegisters]
def load_config_prefix(config):
return TMC2209(config)

6
klippy/extras/tmc2660.py
View File

@ -236,7 +236,7 @@ class TMC2660:
self.mcu_tmc = MCU_TMC2660_SPI(config, Registers, self.fields)
# Register commands
cmdhelper = tmc.TMCCommandHelper(config, self.mcu_tmc)
cmdhelper.setup_register_dump(self.query_registers)
cmdhelper.setup_register_dump(ReadRegisters)
# DRVCTRL
mh = tmc.TMCMicrostepHelper(config, self.mcu_tmc)
@ -274,9 +274,5 @@ class TMC2660:
set_config_field(config, "DISS2G", 0)
set_config_field(config, "TS2G", 3)
def query_registers(self, print_time=0.):
return [(reg_name, self.mcu_tmc.get_register(reg_name))
for reg_name in ReadRegisters]
def load_config_prefix(config):
return TMC2660(config)

5
klippy/extras/tmc5160.py
View File

@ -296,7 +296,7 @@ class TMC5160:
tmc.TMCEndstopHelper(config, self.mcu_tmc, diag1_pin)
# Register commands
cmdhelper = tmc.TMCCommandHelper(config, self.mcu_tmc)
cmdhelper.setup_register_dump(self.query_registers)
cmdhelper.setup_register_dump(ReadRegisters)
# Setup basic register values
mh = tmc.TMCMicrostepHelper(config, self.mcu_tmc)
self.get_microsteps = mh.get_microsteps
@ -339,9 +339,6 @@ class TMC5160:
set_config_field(config, "PWM_LIM", 12)
# TPOWERDOWN
set_config_field(config, "TPOWERDOWN", 10)
def query_registers(self, print_time=0.):
return [(reg_name, self.mcu_tmc.get_register(reg_name))
for reg_name in ReadRegisters]
def load_config_prefix(config):
return TMC5160(config)