pins: Remove module level get_printer_pins() and setup_pin() functions

Most callers did a lookup of the pins module via
printer.lookup_object("pins").  Use that as the standard method and
remove these less frequently used methods.

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>

1 files changed, 11 insertions, 12 deletions

diff --git a/klippy/stepper.py b/klippy/stepper.py
index e279fad2..cd852f05 100644
--- a/klippy/stepper.py
+++ b/klippy/stepper.py
@@ -4,7 +4,7 @@
 #
 # This file may be distributed under the terms of the GNU GPLv3 license.
 import math, logging
-import homing, pins
+import homing
 
 # Tracking of shared stepper enable pins
 class StepperEnablePin:
@@ -21,11 +21,10 @@ class StepperEnablePin:
             if not self.enable_count:
                 self.mcu_enable.set_digital(print_time, 0)
 
-def lookup_enable_pin(printer, pin):
+def lookup_enable_pin(ppins, pin):
     if pin is None:
         return StepperEnablePin(None, 9999)
-    pin_params = pins.get_printer_pins(printer).lookup_pin(
-        'digital_out', pin, 'stepper_enable')
+    pin_params = ppins.lookup_pin('digital_out', pin, 'stepper_enable')
     enable = pin_params.get('class')
     if enable is None:
         mcu_enable = pin_params['chip'].setup_pin(pin_params)
@@ -41,17 +40,16 @@ class PrinterStepper:
             self.name = self.name[8:]
         self.need_motor_enable = True
         # Stepper definition
-        self.mcu_stepper = pins.setup_pin(
-            printer, 'stepper', config.get('step_pin'))
-        dir_pin_params = pins.get_printer_pins(printer).lookup_pin(
-            'digital_out', config.get('dir_pin'))
+        ppins = printer.lookup_object('pins')
+        self.mcu_stepper = ppins.setup_pin('stepper', config.get('step_pin'))
+        dir_pin_params = ppins.lookup_pin('digital_out', config.get('dir_pin'))
         self.mcu_stepper.setup_dir_pin(dir_pin_params)
         self.step_dist = config.getfloat('step_distance', above=0.)
         self.mcu_stepper.setup_step_distance(self.step_dist)
         self.step = self.mcu_stepper.step
         self.step_const = self.mcu_stepper.step_const
         self.step_delta = self.mcu_stepper.step_delta
-        self.enable = lookup_enable_pin(printer, config.get('enable_pin', None))
+        self.enable = lookup_enable_pin(ppins, config.get('enable_pin', None))
     def _dist_to_time(self, dist, start_velocity, accel):
         # Calculate the time it takes to travel a distance with constant accel
         time_offset = start_velocity / accel
@@ -76,8 +74,8 @@ class PrinterHomingStepper(PrinterStepper):
     def __init__(self, printer, config, default_position=None):
         PrinterStepper.__init__(self, printer, config)
         # Endstop and its position
-        self.mcu_endstop = pins.setup_pin(
-            printer, 'endstop', config.get('endstop_pin'))
+        ppins = printer.lookup_object('pins')
+        self.mcu_endstop = ppins.setup_pin('endstop', config.get('endstop_pin'))
         self.mcu_endstop.add_stepper(self.mcu_stepper)
         if default_position is None:
             self.position_endstop = config.getfloat('position_endstop')
@@ -178,7 +176,8 @@ class PrinterMultiStepper(PrinterHomingStepper):
             self.all_step_const.append(extra.step_const)
             extraendstop = extraconfig.get('endstop_pin', None)
             if extraendstop is not None:
-                mcu_endstop = pins.setup_pin(printer, 'endstop', extraendstop)
+                ppins = printer.lookup_object('pins')
+                mcu_endstop = ppins.setup_pin('endstop', extraendstop)
                 mcu_endstop.add_stepper(extra.mcu_stepper)
                 self.endstops.append((mcu_endstop, extra.name))
             else: