From ac17fb7cf8efa744b56bf98a075cac882d10a2f5 Mon Sep 17 00:00:00 2001 From: Rida Jichi Date: Tue, 1 Nov 2016 09:05:39 +0000 Subject: [PATCH] Modified micro:bit pin names to mirror micro:bit edge connector Resolved issue: https://github.com/ARMmbed/mbed-os/issues/2713 Removed pins p{0..30} definitions Defined pins P{0..20} as per micro:bit DAL's mappings: (https://github.com/lancaster-university/microbit-dal/blob/master/inc/drivers/MicroBitPin.h) Developers can now use the pin names as they appear on the mbed micro:bit pinout in https://developer.mbed.org/platforms/Microbit/#pinout Change-Id: I72b81dbe23b11d5ef215583adb211f364b4a5e91 --- .../TARGET_NRF51_MICROBIT/PinNames.h | 178 ++++++++---------- 1 file changed, 82 insertions(+), 96 deletions(-) diff --git a/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/TARGET_NRF51_MICROBIT/PinNames.h b/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/TARGET_NRF51_MICROBIT/PinNames.h index ac930c2ddd..b2f1583cdb 100644 --- a/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/TARGET_NRF51_MICROBIT/PinNames.h +++ b/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/TARGET_NRF51_MICROBIT/PinNames.h @@ -30,134 +30,120 @@ typedef enum { #define PORT_SHIFT 3 typedef enum { - p0 = 0, - p1 = 1, - p2 = 2, - p3 = 3, - p4 = 4, - p5 = 5, - p6 = 6, - p7 = 7, - p8 = 8, - p9 = 9, - p10 = 10, - p11 = 11, - p12 = 12, - p13 = 13, - p14 = 14, - p15 = 15, - p16 = 16, - p17 = 17, - p18 = 18, - p19 = 19, - p20 = 20, - p21 = 21, - p22 = 22, - p23 = 23, - p24 = 24, - p25 = 25, - p26 = 26, - p27 = 27, - p28 = 28, - p29 = 29, - p30 = 30, - - //NORMAL PINS... - P0_0 = p0, - P0_1 = p1, - P0_2 = p2, - P0_3 = p3, - P0_4 = p4, - P0_5 = p5, - P0_6 = p6, - P0_7 = p7, - - P0_8 = p8, - P0_9 = p9, - P0_10 = p10, - P0_11 = p11, - P0_12 = p12, - P0_13 = p13, - P0_14 = p14, - P0_15 = p15, - - P0_16 = p16, - P0_17 = p17, - P0_18 = p18, - P0_19 = p19, - P0_20 = p20, - P0_21 = p21, - P0_22 = p22, - P0_23 = p23, - - P0_24 = p24, - P0_25 = p25, - P0_26 = p26, - P0_27 = p27, - P0_28 = p28, - P0_29 = p29, - P0_30 = p30, - + //MCU PINS + P0_0 = 0, + P0_1 = 1, + P0_2 = 2, + P0_3 = 3, + P0_4 = 4, + P0_5 = 5, + P0_6 = 6, + P0_7 = 7, + P0_8 = 8, + P0_9 = 9, + P0_10 = 10, + P0_11 = 11, + P0_12 = 12, + P0_13 = 13, + P0_14 = 14, + P0_15 = 15, + P0_16 = 16, + P0_17 = 17, + P0_18 = 18, + P0_19 = 19, + P0_20 = 20, + P0_21 = 21, + P0_22 = 22, + P0_23 = 23, + P0_24 = 24, + P0_25 = 25, + P0_26 = 26, + P0_27 = 27, + P0_28 = 28, + P0_29 = 29, + P0_30 = 30, + + //MICROBIT EDGE CONNECTOR PINS + P0 = P0_3, + P1 = P0_2, + P2 = P0_1, + P3 = P0_4, + P4 = P0_5, + P5 = P0_17, + P6 = P0_12, + P7 = P0_11, + P8 = P0_18, + P9 = P0_10, + P10 = P0_6, + P11 = P0_26, + P12 = P0_20, + P13 = P0_23, + P14 = P0_22, + P15 = P0_21, + P16 = P0_16, + P19 = P0_0, + P20 = P0_30, + //PADS - PAD3 = p1, - PAD2 = p2, - PAD1 = p3, + PAD3 = P0_1, + PAD2 = P0_2, + PAD1 = P0_3, //LED MATRIX COLS - COL1 = p4, - COL2 = p5, - COL3 = p6, - COL4 = p7, - COL5 = p8, - COL6 = p9, - COL7 = p10, - COL8 = p11, - COL9 = p12, + COL1 = P0_4, + COL2 = P0_5, + COL3 = P0_6, + COL4 = P0_7, + COL5 = P0_8, + COL6 = P0_9, + COL7 = P0_10, + COL8 = P0_11, + COL9 = P0_12, //LED MATRIX ROWS - ROW1 = p13, - ROW2 = p14, - ROW3 = p15, + ROW1 = P0_13, + ROW2 = P0_14, + ROW3 = P0_15, //NORMAL PIN (NO SPECIFIED FUNCTIONALITY) //PIN_16 // BUTTON A - BUTTON_A = p17, + BUTTON_A = P0_17, //NORMAL PIN (NO SPECIFIED FUNCTIONALITY) //PIN_18 //TARGET RESET - TGT_NRESET = p19, + TGT_NRESET = P0_19, //NORMAL PIN (NO SPECIFIED FUNCTIONALITY) //PIN_20 //MASTER OUT SLAVE IN - MOSI = p21, + MOSI = P0_21, //MASTER IN SLAVE OUT - MISO = p22, + MISO = P0_22, //SERIAL CLOCK - SCK = p23, + SCK = P0_23, // RX AND TX PINS - TGT_TX = p24, - TGT_RX = p25, + TGT_TX = P0_24, + TGT_RX = P0_25, //BUTTON B - BUTTON_B = p26, + BUTTON_B = P0_26, //ACCEL INTERRUPT PINS (MMA8653FC) - ACCEL_INT2 = p27, - ACCEL_INT1 = p28, + ACCEL_INT2 = P0_27, + ACCEL_INT1 = P0_28, //MAGENETOMETER INTERRUPT PIN (MAG3110) - MAG_INT1 = p29, + MAG_INT1 = P0_29, // Not connected NC = (int)0xFFFFFFFF, @@ -177,10 +163,10 @@ typedef enum { LED4 = P0_16, //SDA (SERIAL DATA LINE) - I2C_SDA0 = p30, + I2C_SDA0 = P0_30, //SCL (SERIAL CLOCK LINE) - I2C_SCL0 = p0 + I2C_SCL0 = P0_0 } PinName;