Merge pull request #2726 from jeromecoutant/PR_NUCLEO_F207ZG_D11

[NUCLEO_F207ZG] Conflict with Arduino D11 and Ethernet port
pull/2822/head^2
Sam Grove 2016-09-27 21:51:48 -07:00 committed by GitHub
commit 5ef720246b
2 changed files with 2 additions and 2 deletions

View File

@ -255,7 +255,7 @@ const PinMap PinMap_UART_CTS[] = {
//*** SPI ***
const PinMap PinMap_SPI_MOSI[] = {
// {PA_7, SPI_1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)}, // Ethernet RMII RX Data Valid
{PA_7, SPI_1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)}, // Ethernet RMII RX Data Valid // D11
{PB_5, SPI_1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
// {PB_5, SPI_3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_SPI3)}, // choice: PB_5 with SPI_1
{PB_15, SPI_2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},

View File

@ -235,7 +235,7 @@ typedef enum {
USBRX = SERIAL_RX,
I2C_SCL = D15,
I2C_SDA = D14,
SPI_MOSI = D11,
SPI_MOSI = PB_5, // Conflict between D11 and RMII RX Data Valid (PA7)
SPI_MISO = D12,
SPI_SCK = D13,
SPI_CS = D10,