From 5bc47d9416f7c8b7565a6e27ffd97ad9ad97cade Mon Sep 17 00:00:00 2001 From: Kevin O'Connor Date: Thu, 21 Feb 2019 11:35:58 -0500 Subject: tmc2130: Use FieldHelper() to set/get driver fields Use the field helper to simplify the bit manipulation in the driver. This also enables the extended DUMP_TMC output. Signed-off-by: Kevin O'Connor --- klippy/extras/tmc2208.py | 21 ++++----------------- 1 file changed, 4 insertions(+), 17 deletions(-) (limited to 'klippy/extras/tmc2208.py') diff --git a/klippy/extras/tmc2208.py b/klippy/extras/tmc2208.py index ef476e3b..3057b163 100644 --- a/klippy/extras/tmc2208.py +++ b/klippy/extras/tmc2208.py @@ -168,26 +168,13 @@ Fields["PWM_AUTO"] = { "PWM_GRAD_AUTO": 0xff << 16 } -FieldFormatters = { - "I_scale_analog": (lambda v: "1(ExtVREF)" if v else ""), - "shaft": (lambda v: "1(Reverse)" if v else ""), - "drv_err": (lambda v: "1(ErrorShutdown!)" if v else ""), - "uv_cp": (lambda v: "1(Undervoltage!)" if v else ""), +FieldFormatters = dict(tmc2130.FieldFormatters) +FieldFormatters.update({ "SEL_A": (lambda v: "%d(%s)" % (v, ["TMC222x", "TMC220x"][v])), - "VERSION": (lambda v: "%#x" % v), - "CUR_A": (lambda v: str(tmc2130.decode_signed_int(v, 9))), - "CUR_B": (lambda v: str(tmc2130.decode_signed_int(v, 9))), - "MRES": (lambda v: "%d(%dusteps)" % (v, 0x100 >> v)), - "otpw": (lambda v: "1(OvertempWarning!)" if v else ""), - "ot": (lambda v: "1(OvertempError!)" if v else ""), - "s2ga": (lambda v: "1(ShortToGND_A!)" if v else ""), - "s2gb": (lambda v: "1(ShortToGND_B!)" if v else ""), "s2vsa": (lambda v: "1(LowSideShort_A!)" if v else ""), "s2vsb": (lambda v: "1(LowSideShort_B!)" if v else ""), - "ola": (lambda v: "1(OpenLoad_A!)" if v else ""), - "olb": (lambda v: "1(OpenLoad_B!)" if v else ""), - "PWM_SCALE_AUTO": (lambda v: str(tmc2130.decode_signed_int(v, 9))) -} + "PWM_SCALE_AUTO": (lambda v: tmc2130.decode_signed_int(v, 9)) +}) ###################################################################### -- cgit v1.2.3-70-g09d2