diff options
| author | Kevin O'Connor <kevin@koconnor.net> | 2019-08-09 11:42:50 -0400 |
|---|---|---|
| committer | KevinOConnor <kevin@koconnor.net> | 2019-08-19 12:57:59 -0400 |
| commit | 395429be146238a7a59fb9fde28cfdd2bdab8ccc (patch) | |
| tree | a4cc9b75a1efe28e826247b147193a1aa20e20c3 /klippy/extras | |
| parent | a482ddf582862103fdf4ef465cbad81ea46af90b (diff) | |
| download | kutter-395429be146238a7a59fb9fde28cfdd2bdab8ccc.tar.gz kutter-395429be146238a7a59fb9fde28cfdd2bdab8ccc.tar.xz kutter-395429be146238a7a59fb9fde28cfdd2bdab8ccc.zip | |
pins: Move reserved pin handling into PinResolver class
Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
Diffstat (limited to 'klippy/extras')
| -rw-r--r-- | klippy/extras/bus.py | 3 | ||||
| -rw-r--r-- | klippy/extras/replicape.py | 5 |
2 files changed, 5 insertions, 3 deletions
diff --git a/klippy/extras/bus.py b/klippy/extras/bus.py index 04795a88..0b50efc7 100644 --- a/klippy/extras/bus.py +++ b/klippy/extras/bus.py @@ -26,9 +26,10 @@ def resolve_bus_name(mcu, param, bus): # Check for reserved bus pins constants = mcu.get_constants() reserve_pins = constants.get('BUS_PINS_%s' % (bus,), None) + pin_resolver = ppins.get_pin_resolver(mcu_name) if reserve_pins is not None: for pin in reserve_pins.split(','): - ppins.reserve_pin(mcu_name, pin, bus) + pin_resolver.reserve_pin(pin, bus) return bus diff --git a/klippy/extras/replicape.py b/klippy/extras/replicape.py index 75687277..6817a051 100644 --- a/klippy/extras/replicape.py +++ b/klippy/extras/replicape.py @@ -128,8 +128,9 @@ class servo_pwm: pru_mcu = replicape.mcu_pwm_enable.get_mcu() printer = pru_mcu.get_printer() ppins = printer.lookup_object('pins') - ppins.reserve_pin(pru_mcu.get_name(), resv1, config_name) - ppins.reserve_pin(pru_mcu.get_name(), resv2, config_name) + pin_resolver = ppins.get_pin_resolver(pru_mcu.get_name()) + pin_resolver.reserve_pin(resv1, config_name) + pin_resolver.reserve_pin(resv2, config_name) def setup_cycle_time(self, cycle_time, hardware_pwm=False): self.mcu_pwm.setup_cycle_time(cycle_time, True); |