STM32F7: STDIO_UART_TX and STDIO_UART_RX can be now user defined

pull/5795/head
jeromecoutant 2017-12-07 13:58:39 +01:00
parent a7bddff5cc
commit 93b34070ed
10 changed files with 80 additions and 40 deletions

View File

@ -57,10 +57,6 @@ typedef enum {
UART_8 = (int)UART8_BASE UART_8 = (int)UART8_BASE
} UARTName; } UARTName;
#define STDIO_UART_TX PA_9
#define STDIO_UART_RX PB_7
#define STDIO_UART UART_1
typedef enum { typedef enum {
SPI_1 = (int)SPI1_BASE, SPI_1 = (int)SPI1_BASE,
SPI_2 = (int)SPI2_BASE, SPI_2 = (int)SPI2_BASE,

View File

@ -246,6 +246,18 @@ typedef enum {
D14 = PB_9, D14 = PB_9,
D15 = PB_8, D15 = PB_8,
// STDIO for console print
#ifdef MBED_CONF_TARGET_STDIO_UART_TX
STDIO_UART_TX = MBED_CONF_TARGET_STDIO_UART_TX,
#else
STDIO_UART_TX = PA_9,
#endif
#ifdef MBED_CONF_TARGET_STDIO_UART_RX
STDIO_UART_RX = MBED_CONF_TARGET_STDIO_UART_RX,
#else
STDIO_UART_RX = PB_7,
#endif
// Generic signals namings // Generic signals namings
LED1 = PI_1, // LD1 = GREEN LED1 = PI_1, // LD1 = GREEN
LED2 = PI_1, LED2 = PI_1,
@ -254,10 +266,10 @@ typedef enum {
USER_BUTTON = PI_11, USER_BUTTON = PI_11,
// Standardized button names // Standardized button names
BUTTON1 = USER_BUTTON, BUTTON1 = USER_BUTTON,
SERIAL_TX = PA_9, // Virtual Com Port SERIAL_TX = STDIO_UART_TX, // Virtual Com Port
SERIAL_RX = PB_7, // Virtual Com Port SERIAL_RX = STDIO_UART_RX, // Virtual Com Port
USBTX = PA_9, // Virtual Com Port USBTX = STDIO_UART_TX, // Virtual Com Port
USBRX = PB_7, // Virtual Com Port USBRX = STDIO_UART_RX, // Virtual Com Port
I2C_SCL = D15, I2C_SCL = D15,
I2C_SDA = D14, I2C_SDA = D14,
SPI_MOSI = D11, SPI_MOSI = D11,

View File

@ -57,10 +57,6 @@ typedef enum {
UART_8 = (int)UART8_BASE UART_8 = (int)UART8_BASE
} UARTName; } UARTName;
#define STDIO_UART_TX PD_8
#define STDIO_UART_RX PD_9
#define STDIO_UART UART_3
typedef enum { typedef enum {
SPI_1 = (int)SPI1_BASE, SPI_1 = (int)SPI1_BASE,
SPI_2 = (int)SPI2_BASE, SPI_2 = (int)SPI2_BASE,

View File

@ -189,6 +189,18 @@ typedef enum {
D14 = PB_9, D14 = PB_9,
D15 = PB_8, D15 = PB_8,
// STDIO for console print
#ifdef MBED_CONF_TARGET_STDIO_UART_TX
STDIO_UART_TX = MBED_CONF_TARGET_STDIO_UART_TX,
#else
STDIO_UART_TX = PD_8,
#endif
#ifdef MBED_CONF_TARGET_STDIO_UART_RX
STDIO_UART_RX = MBED_CONF_TARGET_STDIO_UART_RX,
#else
STDIO_UART_RX = PD_9,
#endif
// Generic signals namings // Generic signals namings
LED1 = PB_0, // LD1 = GREEN LED1 = PB_0, // LD1 = GREEN
LED2 = PB_7, // Blue LED2 = PB_7, // Blue
@ -197,10 +209,10 @@ typedef enum {
USER_BUTTON = PC_13, USER_BUTTON = PC_13,
// Standardized button names // Standardized button names
BUTTON1 = USER_BUTTON, BUTTON1 = USER_BUTTON,
SERIAL_TX = PD_8, // Virtual Com Port SERIAL_TX = STDIO_UART_TX, // Virtual Com Port
SERIAL_RX = PD_9, // Virtual Com Port SERIAL_RX = STDIO_UART_RX, // Virtual Com Port
USBTX = PD_8, // Virtual Com Port USBTX = STDIO_UART_TX, // Virtual Com Port
USBRX = PD_9, // Virtual Com Port USBRX = STDIO_UART_RX, // Virtual Com Port
I2C_SCL = D15, I2C_SCL = D15,
I2C_SDA = D14, I2C_SDA = D14,
SPI_MOSI = D11, SPI_MOSI = D11,

View File

@ -57,10 +57,6 @@ typedef enum {
UART_8 = (int)UART8_BASE UART_8 = (int)UART8_BASE
} UARTName; } UARTName;
#define STDIO_UART_TX PD_8
#define STDIO_UART_RX PD_9
#define STDIO_UART UART_3
typedef enum { typedef enum {
SPI_1 = (int)SPI1_BASE, SPI_1 = (int)SPI1_BASE,
SPI_2 = (int)SPI2_BASE, SPI_2 = (int)SPI2_BASE,

View File

@ -189,6 +189,18 @@ typedef enum {
D14 = PB_9, D14 = PB_9,
D15 = PB_8, D15 = PB_8,
// STDIO for console print
#ifdef MBED_CONF_TARGET_STDIO_UART_TX
STDIO_UART_TX = MBED_CONF_TARGET_STDIO_UART_TX,
#else
STDIO_UART_TX = PD_8,
#endif
#ifdef MBED_CONF_TARGET_STDIO_UART_RX
STDIO_UART_RX = MBED_CONF_TARGET_STDIO_UART_RX,
#else
STDIO_UART_RX = PD_9,
#endif
// Generic signals namings // Generic signals namings
LED1 = PB_0, // LD1 = GREEN LED1 = PB_0, // LD1 = GREEN
LED2 = PB_7, // Blue LED2 = PB_7, // Blue
@ -197,10 +209,10 @@ typedef enum {
USER_BUTTON = PC_13, USER_BUTTON = PC_13,
// Standardized button names // Standardized button names
BUTTON1 = USER_BUTTON, BUTTON1 = USER_BUTTON,
SERIAL_TX = PD_8, // Virtual Com Port SERIAL_TX = STDIO_UART_TX, // Virtual Com Port
SERIAL_RX = PD_9, // Virtual Com Port SERIAL_RX = STDIO_UART_RX, // Virtual Com Port
USBTX = PD_8, // Virtual Com Port USBTX = STDIO_UART_TX, // Virtual Com Port
USBRX = PD_9, // Virtual Com Port USBRX = STDIO_UART_RX, // Virtual Com Port
I2C_SCL = D15, I2C_SCL = D15,
I2C_SDA = D14, I2C_SDA = D14,
SPI_MOSI = D11, SPI_MOSI = D11,

View File

@ -57,10 +57,6 @@ typedef enum {
UART_8 = (int)UART8_BASE UART_8 = (int)UART8_BASE
} UARTName; } UARTName;
#define STDIO_UART_TX PD_8
#define STDIO_UART_RX PD_9
#define STDIO_UART UART_3
typedef enum { typedef enum {
SPI_1 = (int)SPI1_BASE, SPI_1 = (int)SPI1_BASE,
SPI_2 = (int)SPI2_BASE, SPI_2 = (int)SPI2_BASE,

View File

@ -189,6 +189,18 @@ typedef enum {
D14 = PB_9, D14 = PB_9,
D15 = PB_8, D15 = PB_8,
// STDIO for console print
#ifdef MBED_CONF_TARGET_STDIO_UART_TX
STDIO_UART_TX = MBED_CONF_TARGET_STDIO_UART_TX,
#else
STDIO_UART_TX = PD_8,
#endif
#ifdef MBED_CONF_TARGET_STDIO_UART_RX
STDIO_UART_RX = MBED_CONF_TARGET_STDIO_UART_RX,
#else
STDIO_UART_RX = PD_9,
#endif
// Generic signals namings // Generic signals namings
LED1 = PB_0, // LD1 = GREEN LED1 = PB_0, // LD1 = GREEN
LED2 = PB_7, // Blue LED2 = PB_7, // Blue
@ -197,10 +209,10 @@ typedef enum {
USER_BUTTON = PC_13, USER_BUTTON = PC_13,
// Standardized button names // Standardized button names
BUTTON1 = USER_BUTTON, BUTTON1 = USER_BUTTON,
SERIAL_TX = PD_8, // Virtual Com Port SERIAL_TX = STDIO_UART_TX, // Virtual Com Port
SERIAL_RX = PD_9, // Virtual Com Port SERIAL_RX = STDIO_UART_RX, // Virtual Com Port
USBTX = PD_8, // Virtual Com Port USBTX = STDIO_UART_TX, // Virtual Com Port
USBRX = PD_9, // Virtual Com Port USBRX = STDIO_UART_RX, // Virtual Com Port
I2C_SCL = D15, I2C_SCL = D15,
I2C_SDA = D14, I2C_SDA = D14,
SPI_MOSI = D11, SPI_MOSI = D11,

View File

@ -57,10 +57,6 @@ typedef enum {
UART_8 = (int)UART8_BASE UART_8 = (int)UART8_BASE
} UARTName; } UARTName;
#define STDIO_UART_TX PA_9
#define STDIO_UART_RX PA_10
#define STDIO_UART UART_1
typedef enum { typedef enum {
SPI_1 = (int)SPI1_BASE, SPI_1 = (int)SPI1_BASE,
SPI_2 = (int)SPI2_BASE, SPI_2 = (int)SPI2_BASE,

View File

@ -246,6 +246,18 @@ typedef enum {
D14 = PB_9, D14 = PB_9,
D15 = PB_8, D15 = PB_8,
// STDIO for console print
#ifdef MBED_CONF_TARGET_STDIO_UART_TX
STDIO_UART_TX = MBED_CONF_TARGET_STDIO_UART_TX,
#else
STDIO_UART_TX = PA_9,
#endif
#ifdef MBED_CONF_TARGET_STDIO_UART_RX
STDIO_UART_RX = MBED_CONF_TARGET_STDIO_UART_RX,
#else
STDIO_UART_RX = PA_10,
#endif
// Generic signals namings // Generic signals namings
LED1 = PJ_13, // LD1 = RED LED1 = PJ_13, // LD1 = RED
LED2 = PJ_5, // LD2 = GREEN LED2 = PJ_5, // LD2 = GREEN
@ -254,10 +266,10 @@ typedef enum {
USER_BUTTON = PA_0, USER_BUTTON = PA_0,
// Standardized button names // Standardized button names
BUTTON1 = USER_BUTTON, BUTTON1 = USER_BUTTON,
SERIAL_TX = PA_9, // Virtual Com Port SERIAL_TX = STDIO_UART_TX, // Virtual Com Port
SERIAL_RX = PA_10, // Virtual Com Port SERIAL_RX = STDIO_UART_RX, // Virtual Com Port
USBTX = PA_9, // Virtual Com Port USBTX = STDIO_UART_TX, // Virtual Com Port
USBRX = PA_10, // Virtual Com Port USBRX = STDIO_UART_RX, // Virtual Com Port
I2C_SCL = D15, I2C_SCL = D15,
I2C_SDA = D14, I2C_SDA = D14,
SPI_MOSI = D11, SPI_MOSI = D11,