Merge pull request #175 from sg-/FRDM-fix

Frdm fix
pull/176/head
Emilio Monti 2014-02-18 22:12:51 +00:00
commit 111cad58e9
3 changed files with 43 additions and 23 deletions

View File

@ -23,23 +23,22 @@ const PinMap PinMap_RTC[] = {
/************ADC***************/ /************ADC***************/
const PinMap PinMap_ADC[] = { const PinMap PinMap_ADC[] = {
/* A0-A5 pins */
{PTA0, ADC0_SE12, 0}, {PTA0, ADC0_SE12, 0},
{PTA7, ADC0_SE7, 0},
{PTA8, ADC0_SE3, 0}, {PTA8, ADC0_SE3, 0},
{PTA9, ADC0_SE2, 0}, {PTA9, ADC0_SE2, 0},
{PTA12, ADC0_SE0, 0},
{PTB0, ADC0_SE6, 0},
{PTB1, ADC0_SE5, 0},
{PTB2, ADC0_SE4, 0},
{PTB5, ADC0_SE1, 0},
{PTB8, ADC0_SE11, 0}, {PTB8, ADC0_SE11, 0},
{PTB9, ADC0_SE10, 0}, {PTB9, ADC0_SE10, 0},
{PTB10, ADC0_SE9, 0},
{PTB11, ADC0_SE8, 0},
{PTB13, ADC0_SE13, 0}, {PTB13, ADC0_SE13, 0},
/* Rest of pins ADC Mux */ {NC, NC, 0}
{PTB2, ADC0_SE4, 0},
{PTB1, ADC0_SE5, 0},
{PTB5, ADC0_SE1, 0},
{PTA12, ADC0_SE0, 0},
{PTB10, ADC0_SE9, 0},
{PTB11, ADC0_SE8, 0},
{PTB7, ADC0_SE7, 0},
{PTB0, ADC0_SE6, 0},
{NC, NC, 0}
}; };
/************DAC***************/ /************DAC***************/
@ -50,44 +49,59 @@ const PinMap PinMap_DAC[] = {
/************I2C***************/ /************I2C***************/
const PinMap PinMap_I2C_SDA[] = { const PinMap PinMap_I2C_SDA[] = {
{PTA3, I2C_0, 3},
{PTA4, I2C_0, 2},
{PTB4, I2C_0, 2}, {PTB4, I2C_0, 2},
{NC , NC , 0} {NC , NC , 0}
}; };
const PinMap PinMap_I2C_SCL[] = { const PinMap PinMap_I2C_SCL[] = {
{PTA3, I2C_0, 2},
{PTA4, I2C_0, 3},
{PTB3, I2C_0, 2}, {PTB3, I2C_0, 2},
{NC , NC , 0} {NC , NC , 0}
}; };
/************UART***************/ /************UART***************/
const PinMap PinMap_UART_TX[] = { const PinMap PinMap_UART_TX[] = {
{PTB1, UART_0, 2}, {PTB1, UART_0, 2},
{PTB2, UART_0, 3},
{PTB3, UART_0, 3},
{NC , NC , 0} {NC , NC , 0}
}; };
const PinMap PinMap_UART_RX[] = { const PinMap PinMap_UART_RX[] = {
{PTB1, UART_0, 3},
{PTB2, UART_0, 2}, {PTB2, UART_0, 2},
{PTB4, UART_0, 3},
{NC , NC , 0} {NC , NC , 0}
}; };
/************SPI***************/ /************SPI***************/
const PinMap PinMap_SPI_SCLK[] = { const PinMap PinMap_SPI_SCLK[] = {
{PTB0, SPI_0, 3}, {PTB0, SPI_0, 3},
{NC , NC , 0} {PTB17, SPI_0, 3},
{NC , NC , 0}
}; };
const PinMap PinMap_SPI_MOSI[] = { const PinMap PinMap_SPI_MOSI[] = {
{PTA7, SPI_0, 3}, {PTA7 , SPI_0, 3},
{NC , NC , 0} {PTB15, SPI_0, 2},
{PTB16, SPI_0, 3},
{NC , NC , 0}
}; };
const PinMap PinMap_SPI_MISO[] = { const PinMap PinMap_SPI_MISO[] = {
{PTA6, SPI_0, 3}, {PTA6 , SPI_0, 3},
{NC , NC , 0} {PTA7 , SPI_0, 2},
{PTB15, SPI_0, 3},
{PTB16, SPI_0, 2},
{NC , NC , 0}
}; };
const PinMap PinMap_SPI_SSEL[] = { const PinMap PinMap_SPI_SSEL[] = {
{PTA5, SPI_0, 3}, {PTA5 , SPI_0, 3},
{NC , NC , 0} {PTA19, SPI_0, 3},
{NC , NC , 0}
}; };
/************PWM***************/ /************PWM***************/

View File

@ -78,10 +78,10 @@ typedef enum {
LED_BLUE = PTB10, LED_BLUE = PTB10,
// mbed original LED naming // mbed original LED naming
LED1 = LED_BLUE, LED1 = LED_RED,
LED2 = LED_GREEN, LED2 = LED_GREEN,
LED3 = LED_RED, LED3 = LED_BLUE,
LED4 = LED_RED, LED4 = LED_BLUE,
// USB Pins // USB Pins
USBTX = PTB1, USBTX = PTB1,
@ -96,7 +96,7 @@ typedef enum {
D5 = PTA12, D5 = PTA12,
D6 = PTB6, D6 = PTB6,
D7 = PTB7, D7 = PTB7,
D8 = PTA10, D8 = PTB10,
D9 = PTB11, D9 = PTB11,
D10 = PTA5, D10 = PTA5,
D11 = PTA7, D11 = PTA7,
@ -111,6 +111,9 @@ typedef enum {
A3 = PTA0, A3 = PTA0,
A4 = PTA9, A4 = PTA9,
A5 = PTB13, A5 = PTB13,
I2C_SCL = D15,
I2C_SDA = D14,
// Not connected // Not connected
NC = (int)0xFFFFFFFF NC = (int)0xFFFFFFFF

View File

@ -232,6 +232,9 @@ typedef enum {
A3 = PTB3, A3 = PTB3,
A4 = PTC2, A4 = PTC2,
A5 = PTC1, A5 = PTC1,
I2C_SCL = D15,
I2C_SDA = D14,
// Not connected // Not connected
NC = (int)0xFFFFFFFF NC = (int)0xFFFFFFFF