3D-printing/klipper
1
0
Fork 0
mirror of https://github.com/Klipper3d/klipper.git synced 2025-07-24 23:24:01 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

bus: Support bus enumerations and add support for reserved pins

Browse source 
Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
This commit is contained in:
Kevin O'Connor 2019-03-31 20:30:14 -04:00
parent 4c3d50693e
commit 1ab02e5225
5 changed files with 87 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

15
klippy/pins.py
View file

@ -129,8 +129,9 @@ def get_aliases_beaglebone(mcu):
re_pin = re.compile(r'(?P<prefix>[ _]pin=)(?P<name>[^ ]*)')
class PinResolver:
def __init__(self, mcu_type, validate_aliases=True):
def __init__(self, mcu_type, reserved_pins, validate_aliases=True):
self.mcu_type = mcu_type
self.reserved_pins = reserved_pins
self.validate_aliases = validate_aliases
self.aliases = {}
self.active_pins = {}
@ -149,6 +150,9 @@ class PinResolver:
and self.validate_aliases):
raise error("pin %s is an alias for %s" % (
name, self.active_pins[pin_id]))
if pin_id in self.reserved_pins:
raise error("pin %s is reserved for %s" % (
name, self.reserved_pins[pin_id]))
return m.group('prefix') + str(pin_id)
return re_pin.sub(pin_fixup, cmd)
@ -162,6 +166,7 @@ class PrinterPins:
def __init__(self):
self.chips = {}
self.active_pins = {}
self.reserved_pins = {}
def lookup_pin(self, pin_desc, can_invert=False, can_pullup=False,
share_type=None):
desc = pin_desc.strip()
@ -210,6 +215,14 @@ class PrinterPins:
def reset_pin_sharing(self, pin_params):
share_name = "%s:%s" % (pin_params['chip_name'], pin_params['pin'])
del self.active_pins[share_name]
def reserve_pin(self, chip_name, pin, reserve_name):
chip_reserve = self.reserved_pins.setdefault(chip_name, {})
if pin in chip_reserve and chip_reserve[pin] != reserve_name:
raise error("Pin %s:%s reserved for %s - can't reserve for %s" % (
chip_name, pin, chip_reserve[pin], reserve_name))
chip_reserve[pin] = reserve_name
def get_reserved_pins(self, chip_name):
return self.reserved_pins.get(chip_name, {})
def register_chip(self, chip_name, chip):
chip_name = chip_name.strip()
if chip_name in self.chips: