Merge pull request #458 from Cheong2K/master

[RBL nRF51] Fixed pins for RBL nRF51822 board.
pull/461/head
Martin Kojtal 2014-08-21 07:52:12 +01:00
commit 51025c56d3
1 changed files with 24 additions and 17 deletions

View File

@ -98,10 +98,10 @@ typedef enum {
P0_29 = p29, P0_29 = p29,
P0_30 = p30, P0_30 = p30,
LED1 = p18, LED1 = p15,
LED2 = p19, LED2 = p15,
LED3 = p18, LED3 = p15,
LED4 = p19, LED4 = p15,
BUTTON1 = p16, BUTTON1 = p16,
BUTTON2 = p17, BUTTON2 = p17,
@ -114,18 +114,16 @@ typedef enum {
// mBed interface Pins // mBed interface Pins
USBTX = TX_PIN_NUMBER, USBTX = TX_PIN_NUMBER,
USBRX = RX_PIN_NUMBER, USBRX = RX_PIN_NUMBER,
/*
SPI_PSELMOSI0 = p20, SPI_PSELMOSI0 = p20,
SPI_PSELMISO0 = p22, SPI_PSELMISO0 = p22,
SPI_PSELSS0 = p24, SPI_PSELSS0 = p14,
SPI_PSELSCK0 = p25, SPI_PSELSCK0 = p25,
SPI_PSELMOSI1 = p12, SPI_PSELMOSI1 = p20,
SPI_PSELMISO1 = p13, SPI_PSELMISO1 = p22,
SPI_PSELSS1 = p14, SPI_PSELSS1 = p14,
SPI_PSELSCK1 = p15, SPI_PSELSCK1 = p25,
*/
SPIS_PSELMOSI = p20, SPIS_PSELMOSI = p20,
SPIS_PSELMISO = p22, SPIS_PSELMISO = p22,
@ -137,8 +135,8 @@ typedef enum {
/* /*
I2C_SDA1 = p13, I2C_SDA1 = p13,
I2C_SCL1 = p15, I2C_SCL1 = p15,
*/ /*
D0 = p11, D0 = p11,
D1 = p9, D1 = p9,
@ -156,10 +154,12 @@ typedef enum {
D12 = p13, D12 = p13,
D13 = p15, D13 = p15,
/* D14 = p29, // I2C - SDA
D14 = p5, D15 = p28, // I2C - SCL
D15 = p6,
*/ D16 = p25, // SPI - SCK
D17 = p22, // SPI - MISO
D18 = p20, // SPI - MOSI
A0 = p6, A0 = p6,
A1 = p5, A1 = p5,
@ -168,6 +168,13 @@ typedef enum {
A4 = p2, A4 = p2,
A5 = p1, A5 = p1,
D19 = A0,
D20 = A1,
D21 = A2,
D22 = A3,
D23 = A4,
D24 = A5,
// Not connected // Not connected
NC = (int)0xFFFFFFFF NC = (int)0xFFFFFFFF
} PinName; } PinName;