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
pull/3176/head
Rida Jichi 2016-11-01 09:05:39 +00:00
parent 3a1af14803
commit ac17fb7cf8
1 changed files with 82 additions and 96 deletions

View File

@ -30,134 +30,120 @@ typedef enum {
#define PORT_SHIFT 3 #define PORT_SHIFT 3
typedef enum { typedef enum {
p0 = 0, //MCU PINS
p1 = 1, P0_0 = 0,
p2 = 2, P0_1 = 1,
p3 = 3, P0_2 = 2,
p4 = 4, P0_3 = 3,
p5 = 5, P0_4 = 4,
p6 = 6, P0_5 = 5,
p7 = 7, P0_6 = 6,
p8 = 8, P0_7 = 7,
p9 = 9, P0_8 = 8,
p10 = 10, P0_9 = 9,
p11 = 11, P0_10 = 10,
p12 = 12, P0_11 = 11,
p13 = 13, P0_12 = 12,
p14 = 14, P0_13 = 13,
p15 = 15, P0_14 = 14,
p16 = 16, P0_15 = 15,
p17 = 17, P0_16 = 16,
p18 = 18, P0_17 = 17,
p19 = 19, P0_18 = 18,
p20 = 20, P0_19 = 19,
p21 = 21, P0_20 = 20,
p22 = 22, P0_21 = 21,
p23 = 23, P0_22 = 22,
p24 = 24, P0_23 = 23,
p25 = 25, P0_24 = 24,
p26 = 26, P0_25 = 25,
p27 = 27, P0_26 = 26,
p28 = 28, P0_27 = 27,
p29 = 29, P0_28 = 28,
p30 = 30, P0_29 = 29,
P0_30 = 30,
//NORMAL PINS...
P0_0 = p0, //MICROBIT EDGE CONNECTOR PINS
P0_1 = p1, P0 = P0_3,
P0_2 = p2, P1 = P0_2,
P0_3 = p3, P2 = P0_1,
P0_4 = p4, P3 = P0_4,
P0_5 = p5, P4 = P0_5,
P0_6 = p6, P5 = P0_17,
P0_7 = p7, P6 = P0_12,
P7 = P0_11,
P0_8 = p8, P8 = P0_18,
P0_9 = p9, P9 = P0_10,
P0_10 = p10, P10 = P0_6,
P0_11 = p11, P11 = P0_26,
P0_12 = p12, P12 = P0_20,
P0_13 = p13, P13 = P0_23,
P0_14 = p14, P14 = P0_22,
P0_15 = p15, P15 = P0_21,
P16 = P0_16,
P0_16 = p16, P19 = P0_0,
P0_17 = p17, P20 = P0_30,
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,
//PADS //PADS
PAD3 = p1, PAD3 = P0_1,
PAD2 = p2, PAD2 = P0_2,
PAD1 = p3, PAD1 = P0_3,
//LED MATRIX COLS //LED MATRIX COLS
COL1 = p4, COL1 = P0_4,
COL2 = p5, COL2 = P0_5,
COL3 = p6, COL3 = P0_6,
COL4 = p7, COL4 = P0_7,
COL5 = p8, COL5 = P0_8,
COL6 = p9, COL6 = P0_9,
COL7 = p10, COL7 = P0_10,
COL8 = p11, COL8 = P0_11,
COL9 = p12, COL9 = P0_12,
//LED MATRIX ROWS //LED MATRIX ROWS
ROW1 = p13, ROW1 = P0_13,
ROW2 = p14, ROW2 = P0_14,
ROW3 = p15, ROW3 = P0_15,
//NORMAL PIN (NO SPECIFIED FUNCTIONALITY) //NORMAL PIN (NO SPECIFIED FUNCTIONALITY)
//PIN_16 //PIN_16
// BUTTON A // BUTTON A
BUTTON_A = p17, BUTTON_A = P0_17,
//NORMAL PIN (NO SPECIFIED FUNCTIONALITY) //NORMAL PIN (NO SPECIFIED FUNCTIONALITY)
//PIN_18 //PIN_18
//TARGET RESET //TARGET RESET
TGT_NRESET = p19, TGT_NRESET = P0_19,
//NORMAL PIN (NO SPECIFIED FUNCTIONALITY) //NORMAL PIN (NO SPECIFIED FUNCTIONALITY)
//PIN_20 //PIN_20
//MASTER OUT SLAVE IN //MASTER OUT SLAVE IN
MOSI = p21, MOSI = P0_21,
//MASTER IN SLAVE OUT //MASTER IN SLAVE OUT
MISO = p22, MISO = P0_22,
//SERIAL CLOCK //SERIAL CLOCK
SCK = p23, SCK = P0_23,
// RX AND TX PINS // RX AND TX PINS
TGT_TX = p24, TGT_TX = P0_24,
TGT_RX = p25, TGT_RX = P0_25,
//BUTTON B //BUTTON B
BUTTON_B = p26, BUTTON_B = P0_26,
//ACCEL INTERRUPT PINS (MMA8653FC) //ACCEL INTERRUPT PINS (MMA8653FC)
ACCEL_INT2 = p27, ACCEL_INT2 = P0_27,
ACCEL_INT1 = p28, ACCEL_INT1 = P0_28,
//MAGENETOMETER INTERRUPT PIN (MAG3110) //MAGENETOMETER INTERRUPT PIN (MAG3110)
MAG_INT1 = p29, MAG_INT1 = P0_29,
// Not connected // Not connected
NC = (int)0xFFFFFFFF, NC = (int)0xFFFFFFFF,
@ -177,10 +163,10 @@ typedef enum {
LED4 = P0_16, LED4 = P0_16,
//SDA (SERIAL DATA LINE) //SDA (SERIAL DATA LINE)
I2C_SDA0 = p30, I2C_SDA0 = P0_30,
//SCL (SERIAL CLOCK LINE) //SCL (SERIAL CLOCK LINE)
I2C_SCL0 = p0 I2C_SCL0 = P0_0
} PinName; } PinName;