From 8aa8feedb8b9b3b76144713c927573ed17c35167 Mon Sep 17 00:00:00 2001 From: Kevin O'Connor Date: Tue, 12 Mar 2019 12:22:49 -0400 Subject: [PATCH] lpc176x: Use enumerations for pin mappings Signed-off-by: Kevin O'Connor --- klippy/pins.py | 5 ----- src/lpc176x/gpio.c | 6 ++++++ 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/klippy/pins.py b/klippy/pins.py index b47b0091..e998f248 100644 --- a/klippy/pins.py +++ b/klippy/pins.py @@ -28,10 +28,6 @@ def named_pins(fmt, port_count, bit_count=32): for port in range(port_count) for portbit in range(bit_count) } -def lpc_pins(): - return { 'P%d.%d' % (port, pin) : port * 32 + pin - for port in range(5) for pin in range(32) } - def beaglebone_pins(): gpios = named_pins("gpio%d_%d", 4) gpios.update({"AIN%d" % i: i+4*32 for i in range(8)}) @@ -39,7 +35,6 @@ def beaglebone_pins(): MCU_PINS = { "stm32f103": port_pins(5, 16), - "lpc176x": lpc_pins(), "pru": beaglebone_pins(), "linux": {"analog%d" % i: i for i in range(8)}, # XXX } diff --git a/src/lpc176x/gpio.c b/src/lpc176x/gpio.c index 5c76ec55..b7afda74 100644 --- a/src/lpc176x/gpio.c +++ b/src/lpc176x/gpio.c @@ -17,6 +17,12 @@ * Pin mappings ****************************************************************/ +DECL_ENUMERATION_RANGE("pin", "P0.0", GPIO(0, 0), 32); +DECL_ENUMERATION_RANGE("pin", "P1.0", GPIO(1, 0), 32); +DECL_ENUMERATION_RANGE("pin", "P2.0", GPIO(2, 0), 32); +DECL_ENUMERATION_RANGE("pin", "P3.0", GPIO(3, 0), 32); +DECL_ENUMERATION_RANGE("pin", "P4.0", GPIO(4, 0), 32); + static LPC_GPIO_TypeDef * const digital_regs[] = { LPC_GPIO0, LPC_GPIO1, LPC_GPIO2, LPC_GPIO3, LPC_GPIO4 };