From ae24baf99a8be29fc3850580cd2c282f3d1b055e Mon Sep 17 00:00:00 2001 From: Kevin O'Connor Date: Tue, 12 Mar 2019 12:31:07 -0400 Subject: pru: Use enumerations for pin mappings Signed-off-by: Kevin O'Connor --- klippy/pins.py | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) (limited to 'klippy/pins.py') diff --git a/klippy/pins.py b/klippy/pins.py index 26d0bf67..8cd9f636 100644 --- a/klippy/pins.py +++ b/klippy/pins.py @@ -13,18 +13,7 @@ class error(Exception): # Hardware pin names ###################################################################### -def named_pins(fmt, port_count, bit_count=32): - return { fmt % (port, portbit) : port * bit_count + portbit - for port in range(port_count) - for portbit in range(bit_count) } - -def beaglebone_pins(): - gpios = named_pins("gpio%d_%d", 4) - gpios.update({"AIN%d" % i: i+4*32 for i in range(8)}) - return gpios - MCU_PINS = { - "pru": beaglebone_pins(), "linux": {"analog%d" % i: i for i in range(8)}, # XXX } @@ -141,8 +130,7 @@ beagleboneblack_mappings = { def update_map_beaglebone(pins, mcu): if mcu != 'pru': raise error("Beaglebone aliases not supported on mcu '%s'" % (mcu,)) - for pin, gpio in beagleboneblack_mappings.items(): - pins[pin] = pins[gpio] + pins.update(beagleboneblack_mappings) ###################################################################### -- cgit v1.2.3-70-g09d2