STM32F4: STDIO_UART_TX and STDIO_UART_RX can be now user defined

NB for UBLOX targets: usb_rx and usb_tx config name are still available
in order to not break current applications.
pull/5795/head
jeromecoutant 2017-12-07 11:56:49 +01:00
parent 59b4b228c4
commit 9c6e7c0fa0
39 changed files with 329 additions and 171 deletions

View File

@ -46,10 +46,6 @@ typedef enum {
UART_6 = (int)USART6_BASE
} UARTName;
#define STDIO_UART_TX PA_2
#define STDIO_UART_RX PA_3
#define STDIO_UART UART_2
typedef enum {
SPI_1 = (int)SPI1_BASE,
SPI_2 = (int)SPI2_BASE,

View File

@ -113,6 +113,18 @@ typedef enum {
ADC_VREF = 0xF1,
ADC_VBAT = 0xF2,
// 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_2,
#endif
#ifdef MBED_CONF_TARGET_STDIO_UART_RX
STDIO_UART_RX = MBED_CONF_TARGET_STDIO_UART_RX,
#else
STDIO_UART_RX = PA_3,
#endif
// Generic signals namings
LED1 = PD_12,
LED2 = PD_13,
@ -122,10 +134,10 @@ typedef enum {
USER_BUTTON = PA_0,
// Standardized button names
BUTTON1 = USER_BUTTON,
SERIAL_TX = PA_2,
SERIAL_RX = PA_3,
USBTX = PA_2,
USBRX = PA_3,
SERIAL_TX = STDIO_UART_TX,
SERIAL_RX = STDIO_UART_RX,
USBTX = STDIO_UART_TX,
USBRX = STDIO_UART_RX,
I2C_SCL = PB_8,
I2C_SDA = PB_9,
SPI_MOSI = PA_7,

View File

@ -46,10 +46,6 @@ typedef enum {
UART_6 = (int)USART6_BASE
} UARTName;
#define STDIO_UART_TX PA_2
#define STDIO_UART_RX PA_3
#define STDIO_UART UART_2
typedef enum {
SPI_1 = (int)SPI1_BASE,
SPI_2 = (int)SPI2_BASE,

View File

@ -122,6 +122,18 @@ typedef enum {
D14 = PB_9,
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_2,
#endif
#ifdef MBED_CONF_TARGET_STDIO_UART_RX
STDIO_UART_RX = MBED_CONF_TARGET_STDIO_UART_RX,
#else
STDIO_UART_RX = PA_3,
#endif
// Generic signals namings
LED1 = PA_5,
LED2 = PA_5,
@ -131,10 +143,10 @@ typedef enum {
USER_BUTTON = PC_13,
// Standardized button names
BUTTON1 = USER_BUTTON,
SERIAL_TX = PA_2,
SERIAL_RX = PA_3,
USBTX = PA_2,
USBRX = PA_3,
SERIAL_TX = STDIO_UART_TX,
SERIAL_RX = STDIO_UART_RX,
USBTX = STDIO_UART_TX,
USBRX = STDIO_UART_RX,
I2C_SCL = PB_8,
I2C_SDA = PB_9,
SPI_MOSI = PA_7,

View File

@ -56,10 +56,6 @@ typedef enum {
UART_6 = (int)USART6_BASE,
} UARTName;
#define STDIO_UART_TX PC_6
#define STDIO_UART_RX PC_7
#define STDIO_UART UART_6
typedef enum {
SPI_1 = (int)SPI1_BASE,
SPI_2 = (int)SPI2_BASE,

View File

@ -222,13 +222,25 @@ typedef enum {
D14 = PB_9,
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 = PC_6,
#endif
#ifdef MBED_CONF_TARGET_STDIO_UART_RX
STDIO_UART_RX = MBED_CONF_TARGET_STDIO_UART_RX,
#else
STDIO_UART_RX = PC_7,
#endif
// Generic signals namings
LED1 = PB_3,
LED2 = PD_8,
LED3 = PD_9,
LED4 = PD_10,
USBTX = PC_6, /* USART6 */
USBRX = PC_7,
USBTX = STDIO_UART_TX, /* USART6 */
USBRX = STDIO_UART_RX,
I2C_SCL = PB_8, /* I2C1 */
I2C_SDA = PB_9,
SPI_MOSI = PC_3,

View File

@ -56,10 +56,6 @@ typedef enum {
UART_6 = (int)USART6_BASE,
} UARTName;
#define STDIO_UART_TX PA_2
#define STDIO_UART_RX PA_3
#define STDIO_UART UART_2
typedef enum {
SPI_1 = (int)SPI1_BASE,
SPI_2 = (int)SPI2_BASE,

View File

@ -196,6 +196,18 @@ typedef enum {
ADC_VREF = 0xF1,
ADC_VBAT = 0xF2,
// 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_2,
#endif
#ifdef MBED_CONF_TARGET_STDIO_UART_RX
STDIO_UART_RX = MBED_CONF_TARGET_STDIO_UART_RX,
#else
STDIO_UART_RX = PA_3,
#endif
// Generic signals namings
LED1 = PD_13,
LED2 = PD_12,
@ -207,10 +219,10 @@ typedef enum {
USER_BUTTON = PA_0,
// Standardized button names
BUTTON1 = USER_BUTTON,
SERIAL_TX = PA_2, /* USART2 */
SERIAL_RX = PA_3,
USBTX = PA_2, /* USART2 */
USBRX = PA_3,
SERIAL_TX = STDIO_UART_TX, /* USART2 */
SERIAL_RX = STDIO_UART_RX,
USBTX = STDIO_UART_TX, /* USART2 */
USBRX = STDIO_UART_RX,
I2C_SCL = PB_8, /* I2C1 */
I2C_SDA = PB_9,
SPI_MOSI = PA_7,

View File

@ -51,10 +51,6 @@ typedef enum {
UART_6 = (int)USART6_BASE
} UARTName;
#define STDIO_UART_TX PA_2
#define STDIO_UART_RX PA_3
#define STDIO_UART UART_2
typedef enum {
SPI_1 = (int)SPI1_BASE,
SPI_2 = (int)SPI2_BASE,

View File

@ -122,6 +122,18 @@ typedef enum {
D14 = PB_9,
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_2,
#endif
#ifdef MBED_CONF_TARGET_STDIO_UART_RX
STDIO_UART_RX = MBED_CONF_TARGET_STDIO_UART_RX,
#else
STDIO_UART_RX = PA_3,
#endif
// Generic signals namings
LED1 = PA_5,
LED2 = PA_5,
@ -131,10 +143,10 @@ typedef enum {
USER_BUTTON = PC_13,
// Standardized button names
BUTTON1 = USER_BUTTON,
SERIAL_TX = PA_2,
SERIAL_RX = PA_3,
USBTX = PA_2,
USBRX = PA_3,
SERIAL_TX = STDIO_UART_TX,
SERIAL_RX = STDIO_UART_RX,
USBTX = STDIO_UART_TX,
USBRX = STDIO_UART_RX,
I2C_SCL = PB_8,
I2C_SDA = PB_9,
SPI_MOSI = PB_15,

View File

@ -46,10 +46,6 @@ typedef enum {
UART_6 = (int)USART6_BASE
} UARTName;
#define STDIO_UART_TX PA_9
#define STDIO_UART_RX PA_10
#define STDIO_UART UART_1
typedef enum {
SPI_1 = (int)SPI1_BASE, ELMO_RF_SPI2 = SPI_1,
SPI_2 = (int)SPI2_BASE, ELMO_SPI1 = SPI_2,

View File

@ -125,6 +125,18 @@ typedef enum {
D14 = PC_9,
D15 = PA_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
LED1 = PB_0,
LED2 = PB_1,
@ -133,10 +145,10 @@ typedef enum {
USER_BUTTON = PB_7,
// Standardized button names
BUTTON1 = USER_BUTTON,
SERIAL_TX = PA_9,
SERIAL_RX = PA_10,
USBTX = PA_9,
USBRX = PA_10,
SERIAL_TX = STDIO_UART_TX,
SERIAL_RX = STDIO_UART_RX,
USBTX = STDIO_UART_TX,
USBRX = STDIO_UART_RX,
I2C_SCL = D15,
I2C_SDA = D14,
SPI_MOSI = D11,

View File

@ -46,10 +46,6 @@ typedef enum {
UART_6 = (int)USART6_BASE
} UARTName;
#define STDIO_UART_TX PA_2
#define STDIO_UART_RX PA_3
#define STDIO_UART UART_2
typedef enum {
SPI_1 = (int)SPI1_BASE,
SPI_2 = (int)SPI2_BASE,

View File

@ -122,6 +122,18 @@ typedef enum {
D14 = PB_9,
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_2,
#endif
#ifdef MBED_CONF_TARGET_STDIO_UART_RX
STDIO_UART_RX = MBED_CONF_TARGET_STDIO_UART_RX,
#else
STDIO_UART_RX = PA_3,
#endif
// Generic signals namings
LED1 = PA_5,
LED2 = PA_5,
@ -131,10 +143,10 @@ typedef enum {
USER_BUTTON = PC_13,
// Standardized button names
BUTTON1 = USER_BUTTON,
SERIAL_TX = PA_2,
SERIAL_RX = PA_3,
USBTX = PA_2,
USBRX = PA_3,
SERIAL_TX = STDIO_UART_TX,
SERIAL_RX = STDIO_UART_RX,
USBTX = STDIO_UART_TX,
USBRX = STDIO_UART_RX,
I2C_SCL = PB_8,
I2C_SDA = PB_9,
SPI_MOSI = PA_7,

View File

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

View File

@ -175,6 +175,18 @@ typedef enum {
D14 = PB_9,
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
LED1 = PB_0,
LED2 = PB_7,
@ -184,10 +196,10 @@ typedef enum {
USER_BUTTON = PC_13,
// Standardized button names
BUTTON1 = USER_BUTTON,
SERIAL_TX = PD_8,
SERIAL_RX = PD_9,
USBTX = SERIAL_TX,
USBRX = SERIAL_RX,
SERIAL_TX = STDIO_UART_TX,
SERIAL_RX = STDIO_UART_RX,
USBTX = STDIO_UART_TX,
USBRX = STDIO_UART_RX,
I2C_SCL = D15,
I2C_SDA = D14,
SPI_MOSI = D11,

View File

@ -43,10 +43,6 @@ typedef enum {
UART_10 = (int)UART10_BASE
} UARTName;
#define STDIO_UART_TX PG_14
#define STDIO_UART_RX PG_9
#define STDIO_UART UART_6
typedef enum {
SPI_1 = (int)SPI1_BASE,
SPI_2 = (int)SPI2_BASE,

View File

@ -222,6 +222,18 @@ typedef enum {
D14 = PB_11,
D15 = PB_10,
// STDIO for console print
#ifdef MBED_CONF_TARGET_STDIO_UART_TX
STDIO_UART_TX = MBED_CONF_TARGET_STDIO_UART_TX,
#else
STDIO_UART_TX = PG_14,
#endif
#ifdef MBED_CONF_TARGET_STDIO_UART_RX
STDIO_UART_RX = MBED_CONF_TARGET_STDIO_UART_RX,
#else
STDIO_UART_RX = PG_9,
#endif
// Generic signals namings
LED1 = PC_5, // Green = LD3 on the board
LED2 = PE_3, // Red = LD4 on the board
@ -230,10 +242,10 @@ typedef enum {
LED_RED = LED2,
USER_BUTTON = PA_0,
BUTTON1 = USER_BUTTON,
SERIAL_TX = PG_14,
SERIAL_RX = PG_9,
USBTX = SERIAL_TX,
USBRX = SERIAL_RX,
SERIAL_TX = STDIO_UART_TX,
SERIAL_RX = STDIO_UART_RX,
USBTX = STDIO_UART_TX,
USBRX = STDIO_UART_RX,
I2C_SCL = D15,
I2C_SDA = D14,
SPI_MOSI = D11,

View File

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

View File

@ -211,6 +211,18 @@ typedef enum {
ADC_VREF = 0xF1,
ADC_VBAT = 0xF2,
// 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
LED1 = PG_13, // Corresponds to LD3 on MB1075B
LED2 = PG_14, // Corresponds to LD4 on MB1075B
@ -220,10 +232,10 @@ typedef enum {
USER_BUTTON = PA_0,
// Standardized button names
BUTTON1 = USER_BUTTON,
SERIAL_TX = PA_9,
SERIAL_RX = PA_10,
USBTX = PA_9,
USBRX = PA_10,
SERIAL_TX = STDIO_UART_TX,
SERIAL_RX = STDIO_UART_RX,
USBTX = STDIO_UART_TX,
USBRX = STDIO_UART_RX,
SPI_MOSI = PA_7,
SPI_MISO = PA_6,
SPI_SCK = PA_5,

View File

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

View File

@ -235,6 +235,18 @@ typedef enum {
D14 = PB_9,
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
LED1 = PB_0, // LD1 = GREEN
LED2 = PB_7, // Blue
@ -244,10 +256,10 @@ typedef enum {
USER_BUTTON = PC_13,
// Standardized button names
BUTTON1 = USER_BUTTON,
SERIAL_TX = PD_8, // Virtual Com Port
SERIAL_RX = PD_9, // Virtual Com Port
USBTX = PD_8, // Virtual Com Port
USBRX = PD_9, // Virtual Com Port
SERIAL_TX = STDIO_UART_TX, // Virtual Com Port
SERIAL_RX = STDIO_UART_RX, // Virtual Com Port
USBTX = STDIO_UART_TX, // Virtual Com Port
USBRX = STDIO_UART_RX, // Virtual Com Port
I2C_SCL = D15,
I2C_SDA = D14,
SPI_MOSI = D11,

View File

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

View File

@ -145,9 +145,21 @@ typedef enum {
SPI_CLK = D13,
SPI_NSS = D10,
// 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
// ST-Link
USBRX = PA_10,
USBTX = PA_9,
USBRX = STDIO_UART_RX,
USBTX = STDIO_UART_TX,
SWDIO = PA_13,
SWCLK = PA_14,
NTRST = PB_4,

View File

@ -57,9 +57,6 @@ typedef enum {
UART_8 = (int)UART8_BASE
} UARTName;
#define STDIO_UART_TX USBTX
#define STDIO_UART_RX USBRX
typedef enum {
SPI_1 = (int)SPI1_BASE,
SPI_2 = (int)SPI2_BASE,

View File

@ -155,9 +155,26 @@ typedef enum {
SPI_SCK = SPI0_SCK,
SPI_CS = SPI0_CS,
// STDIO for console print
#ifdef MBED_CONF_TARGET_STDIO_UART_TX
STDIO_UART_TX = MBED_CONF_TARGET_STDIO_UART_TX,
#elif MBED_CONF_TARGET_USB_TX
STDIO_UART_TX = MBED_CONF_TARGET_USB_TX,
#else
STDIO_UART_TX = PA_9,
#endif
#ifdef MBED_CONF_TARGET_STDIO_UART_RX
STDIO_UART_RX = MBED_CONF_TARGET_STDIO_UART_RX,
#elif MBED_CONF_TARGET_USB_RX
STDIO_UART_TX = MBED_CONF_TARGET_USB_RX,
#else
STDIO_UART_RX = PA_10,
#endif
// DAPLink
USBRX = MBED_CONF_TARGET_USB_RX,
USBTX = MBED_CONF_TARGET_USB_TX,
USBRX = STDIO_UART_RX,
USBTX = STDIO_UART_TX,
SWDIO = PA_15,
SWCLK = PA_14,
NTRST = PB_4,

View File

@ -179,9 +179,26 @@ typedef enum {
SPI_SCK = SPI0_SCK,
SPI_CS = SPI0_CS,
// STDIO for console print
#ifdef MBED_CONF_TARGET_STDIO_UART_TX
STDIO_UART_TX = MBED_CONF_TARGET_STDIO_UART_TX,
#elif MBED_CONF_TARGET_USB_TX
STDIO_UART_TX = MBED_CONF_TARGET_USB_TX,
#else
STDIO_UART_TX = PA_11,
#endif
#ifdef MBED_CONF_TARGET_STDIO_UART_RX
STDIO_UART_RX = MBED_CONF_TARGET_STDIO_UART_RX,
#elif MBED_CONF_TARGET_USB_RX
STDIO_UART_TX = MBED_CONF_TARGET_USB_RX,
#else
STDIO_UART_RX = PA_13,
#endif
// DAPLink
USBRX = MBED_CONF_TARGET_USB_RX,
USBTX = MBED_CONF_TARGET_USB_TX,
USBRX = STDIO_UART_RX,
USBTX = STDIO_UART_TX,
SWDIO = PA_15,
SWCLK = PA_14,
NTRST = PB_4,

View File

@ -178,9 +178,26 @@ typedef enum {
BUTTON1 = SW0,
BUTTON2 = SW1,
// STDIO for console print
#ifdef MBED_CONF_TARGET_STDIO_UART_TX
STDIO_UART_TX = MBED_CONF_TARGET_STDIO_UART_TX,
#elif MBED_CONF_TARGET_USB_TX
STDIO_UART_TX = MBED_CONF_TARGET_USB_TX,
#else
STDIO_UART_TX = D8,
#endif
#ifdef MBED_CONF_TARGET_STDIO_UART_RX
STDIO_UART_RX = MBED_CONF_TARGET_STDIO_UART_RX,
#elif MBED_CONF_TARGET_USB_RX
STDIO_UART_TX = MBED_CONF_TARGET_USB_RX,
#else
STDIO_UART_RX = D2,
#endif
// ST-Link
USBRX = MBED_CONF_TARGET_USB_RX,
USBTX = MBED_CONF_TARGET_USB_TX,
USBRX = STDIO_UART_RX,
USBTX = STDIO_UART_TX,
SWDIO = PA_15,
SWCLK = PA_14,
NTRST = PB_4,

View File

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

View File

@ -189,6 +189,18 @@ typedef enum {
D14 = PB_9,
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
LED1 = PB_0, // LD1 = GREEN
LED2 = PB_7, // Blue
@ -198,10 +210,10 @@ typedef enum {
USER_BUTTON = PC_13,
// Standardized button names
BUTTON1 = USER_BUTTON,
SERIAL_TX = PD_8, // Virtual Com Port
SERIAL_RX = PD_9, // Virtual Com Port
USBTX = PD_8, // Virtual Com Port
USBRX = PD_9, // Virtual Com Port
SERIAL_TX = STDIO_UART_TX, // Virtual Com Port
SERIAL_RX = STDIO_UART_RX, // Virtual Com Port
USBTX = STDIO_UART_TX, // Virtual Com Port
USBRX = STDIO_UART_RX, // Virtual Com Port
I2C_SCL = D15,
I2C_SDA = D14,
SPI_MOSI = D11,

View File

@ -60,10 +60,6 @@ typedef enum {
DMA_2 = (int)DMA2_BASE
} DMAName;
#define STDIO_UART_TX PC_10
#define STDIO_UART_RX PC_11
#define STDIO_UART UART_4
typedef enum {
SPI_1 = (int)SPI1_BASE,
SPI_2 = (int)SPI2_BASE,

View File

@ -154,6 +154,18 @@ typedef enum {
D14 = PC_12,
D15 = PB_10,
// STDIO for console print
#ifdef MBED_CONF_TARGET_STDIO_UART_TX
STDIO_UART_TX = MBED_CONF_TARGET_STDIO_UART_TX,
#else
STDIO_UART_TX = PC_10,
#endif
#ifdef MBED_CONF_TARGET_STDIO_UART_RX
STDIO_UART_RX = MBED_CONF_TARGET_STDIO_UART_RX,
#else
STDIO_UART_RX = PC_11,
#endif
// Generic signals namings
LED1 = PD_10,
LED2 = LED1,
@ -163,10 +175,10 @@ typedef enum {
USER_BUTTON = PD_13,
// Standardized button names
BUTTON1 = USER_BUTTON,
SERIAL_TX = PC_10,
SERIAL_RX = PC_11,
USBTX = SERIAL_TX,
USBRX = SERIAL_RX,
SERIAL_TX = STDIO_UART_TX,
SERIAL_RX = STDIO_UART_RX,
USBTX = STDIO_UART_TX,
USBRX = STDIO_UART_RX,
I2C_SCL = D15,
I2C_SDA = D14,
SPI_MOSI = D11,

View File

@ -55,10 +55,6 @@ typedef enum {
UART_6 = (int)USART6_BASE
} UARTName;
#define STDIO_UART_TX PA_2
#define STDIO_UART_RX PA_3
#define STDIO_UART UART_2
typedef enum {
SPI_1 = (int)SPI1_BASE,
SPI_2 = (int)SPI2_BASE,

View File

@ -122,6 +122,18 @@ typedef enum {
D14 = PB_9,
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_2,
#endif
#ifdef MBED_CONF_TARGET_STDIO_UART_RX
STDIO_UART_RX = MBED_CONF_TARGET_STDIO_UART_RX,
#else
STDIO_UART_RX = PA_3,
#endif
// Generic signals namings
LED1 = PA_5,
LED2 = PA_5,
@ -131,10 +143,10 @@ typedef enum {
USER_BUTTON = PC_13,
// Standardized button names
BUTTON1 = USER_BUTTON,
SERIAL_TX = PA_2,
SERIAL_RX = PA_3,
USBTX = PA_2,
USBRX = PA_3,
SERIAL_TX = STDIO_UART_TX,
SERIAL_RX = STDIO_UART_RX,
USBTX = STDIO_UART_TX,
USBRX = STDIO_UART_RX,
I2C_SCL = PB_8,
I2C_SDA = PB_9,
SPI_MOSI = PA_7,

View File

@ -55,10 +55,6 @@ typedef enum {
UART_6 = (int)USART6_BASE
} UARTName;
#define STDIO_UART_TX SERIAL_TX
#define STDIO_UART_RX SERIAL_RX
#define STDIO_UART UART_3
typedef enum {
SPI_1 = (int)SPI1_BASE,
SPI_2 = (int)SPI2_BASE,

View File

@ -190,6 +190,18 @@ typedef enum {
D14 = PB_9,
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
LED1 = PB_0,
LED2 = PB_7,
@ -199,10 +211,10 @@ typedef enum {
USER_BUTTON = PC_13,
// Standardized button names
BUTTON1 = USER_BUTTON,
SERIAL_TX = PD_8, // Virtual Com Port
SERIAL_RX = PD_9, // Virtual Com Port
USBTX = SERIAL_TX, // Virtual Com Port
USBRX = SERIAL_RX, // Virtual Com Port
SERIAL_TX = STDIO_UART_TX, // Virtual Com Port
SERIAL_RX = STDIO_UART_RX, // Virtual Com Port
USBTX = STDIO_UART_TX, // Virtual Com Port
USBRX = STDIO_UART_RX, // Virtual Com Port
I2C_SCL = D15,
I2C_SDA = D14,
SPI_MOSI = D11,

View File

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

View File

@ -237,6 +237,17 @@ typedef enum {
D14 = PB_9,
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 = PB_10,
#endif
#ifdef MBED_CONF_TARGET_STDIO_UART_RX
STDIO_UART_RX = MBED_CONF_TARGET_STDIO_UART_RX,
#else
STDIO_UART_RX = PB_11,
#endif
// Generic signals namings
LED1 = PG_6,
@ -248,10 +259,10 @@ typedef enum {
USER_BUTTON = PA_0,
// Standardized button names
BUTTON1 = USER_BUTTON,
SERIAL_TX = PB_10,
SERIAL_RX = PB_11,
USBTX = PB_10,
USBRX = PB_11,
SERIAL_TX = STDIO_UART_TX,
SERIAL_RX = STDIO_UART_RX,
USBTX = STDIO_UART_TX,
USBRX = STDIO_UART_RX,
I2C_SCL = PB_8,
I2C_SDA = PB_9,
SPI_MOSI = PB_15,

View File

@ -1801,18 +1801,13 @@
"supported_form_factors": ["ARDUINO"],
"release_versions": ["5"],
"config": {
"usb_tx": {
"stdio_uart_tx": {
"help": "Value: D8(default) or D1",
"value": "D8"
},
"usb_rx": {
"stdio_uart_rx": {
"help": "Value: D2(default) or D0",
"value": "D2"
},
"stdio_uart": {
"help": "Value: UART_1(default) or UART_3",
"value": "UART_1",
"macro_name": "STDIO_UART"
}
}
},
@ -1820,39 +1815,19 @@
"inherits": ["MODULE_UBLOX_ODIN_W2"],
"release_versions": ["5"],
"config": {
"usb_tx": {
"stdio_uart_tx": {
"help": "Value: PA_9(default) or PD_8",
"value": "PA_9"
},
"usb_rx": {
"stdio_uart_rx": {
"help": "Value: PA_10(default) or PD_9",
"value": "PA_10"
},
"stdio_uart": {
"help": "Value: UART_1(default) or UART_3",
"value": "UART_1",
"macro_name": "STDIO_UART"
}
}
},
"MTB_UBLOX_ODIN_W2": {
"inherits": ["MODULE_UBLOX_ODIN_W2"],
"release_versions": ["5"],
"config": {
"usb_tx": {
"help": "Value PA_11",
"value": "PA_11"
},
"usb_rx": {
"help": "Value PA_13",
"value": "PA_13"
},
"stdio_uart": {
"help": "Value: UART_1",
"value": "UART_1",
"macro_name": "STDIO_UART"
}
}
"release_versions": ["5"]
},
"UBLOX_C030": {
"inherits": ["FAMILY_STM32"],