From 273a98d39a88a372c8a2c816622e7df1f777e77d Mon Sep 17 00:00:00 2001 From: Kevin O'Connor Date: Thu, 26 Jul 2018 09:44:45 -0400 Subject: pins: Explicitly pass can_invert and can_pullup to lookup_pin() Don't pass pin_type to lookup_pin() - instead, if a pin can be inverted or can have a pullup, then the caller must explicitly specify that when calling lookup_pin(). This simplifies the code for the cases where it is not valid to invert or pullup. Explicitly pass the pin_type to setup_pin() and have ppins.setup_pin() apply default pullup and invert flags. Signed-off-by: Kevin O'Connor --- klippy/extras/tmc2130.py | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'klippy/extras/tmc2130.py') diff --git a/klippy/extras/tmc2130.py b/klippy/extras/tmc2130.py index 001e6229..949145f2 100644 --- a/klippy/extras/tmc2130.py +++ b/klippy/extras/tmc2130.py @@ -26,9 +26,7 @@ class TMC2130: # pin setup ppins = self.printer.lookup_object("pins") cs_pin = config.get('cs_pin') - cs_pin_params = ppins.lookup_pin('digital_out', cs_pin) - if cs_pin_params['invert']: - raise pins.error("tmc2130 can not invert pin") + cs_pin_params = ppins.lookup_pin(cs_pin) self.mcu = cs_pin_params['chip'] pin = cs_pin_params['pin'] self.oid = self.mcu.create_oid() @@ -113,9 +111,8 @@ class TMC2130: step_dist = stepper_config.getfloat('step_distance') step_dist_256 = step_dist / (1 << self.mres) return int(TMC_FREQUENCY * step_dist_256 / velocity + .5) - def setup_pin(self, pin_params): - if (pin_params['pin'] != 'virtual_endstop' - or pin_params['type'] != 'endstop'): + def setup_pin(self, pin_type, pin_params): + if pin_type != 'endstop' or pin_params['pin'] != 'virtual_endstop': raise pins.error("tmc2130 virtual endstop only useful as endstop") if pin_params['invert'] or pin_params['pullup']: raise pins.error("Can not pullup/invert tmc2130 virtual endstop") -- cgit v1.2.3-70-g09d2