Skip to content

Commit 9c6e7c0

Browse files
jeromecoutantjeromecoutant
committed
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.
1 parent 59b4b22 commit 9c6e7c0

File tree

39 files changed

+329
-171
lines changed

39 files changed

+329
-171
lines changed

‎targets/TARGET_STM/TARGET_STM32F4/TARGET_STM32F401xC/TARGET_DISCO_F401VC/PeripheralNames.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,6 @@ typedef enum {
4646
UART_6 = (int)USART6_BASE
4747
} UARTName;
4848

49-
#define STDIO_UART_TX PA_2
50-
#define STDIO_UART_RX PA_3
51-
#define STDIO_UART UART_2
52-
5349
typedef enum {
5450
SPI_1 = (int)SPI1_BASE,
5551
SPI_2 = (int)SPI2_BASE,

‎targets/TARGET_STM/TARGET_STM32F4/TARGET_STM32F401xC/TARGET_DISCO_F401VC/PinNames.h

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,18 @@ typedef enum {
113113
ADC_VREF = 0xF1,
114114
ADC_VBAT = 0xF2,
115115

116+
// STDIO for console print
117+
#ifdef MBED_CONF_TARGET_STDIO_UART_TX
118+
STDIO_UART_TX = MBED_CONF_TARGET_STDIO_UART_TX,
119+
#else
120+
STDIO_UART_TX = PA_2,
121+
#endif
122+
#ifdef MBED_CONF_TARGET_STDIO_UART_RX
123+
STDIO_UART_RX = MBED_CONF_TARGET_STDIO_UART_RX,
124+
#else
125+
STDIO_UART_RX = PA_3,
126+
#endif
127+
116128
// Generic signals namings
117129
LED1 = PD_12,
118130
LED2 = PD_13,
@@ -122,10 +134,10 @@ typedef enum {
122134
USER_BUTTON = PA_0,
123135
// Standardized button names
124136
BUTTON1 = USER_BUTTON,
125-
SERIAL_TX = PA_2,
126-
SERIAL_RX = PA_3,
127-
USBTX = PA_2,
128-
USBRX = PA_3,
137+
SERIAL_TX = STDIO_UART_TX,
138+
SERIAL_RX = STDIO_UART_RX,
139+
USBTX = STDIO_UART_TX,
140+
USBRX = STDIO_UART_RX,
129141
I2C_SCL = PB_8,
130142
I2C_SDA = PB_9,
131143
SPI_MOSI = PA_7,

‎targets/TARGET_STM/TARGET_STM32F4/TARGET_STM32F401xE/TARGET_NUCLEO_F401RE/PeripheralNames.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,6 @@ typedef enum {
4646
UART_6 = (int)USART6_BASE
4747
} UARTName;
4848

49-
#define STDIO_UART_TX PA_2
50-
#define STDIO_UART_RX PA_3
51-
#define STDIO_UART UART_2
52-
5349
typedef enum {
5450
SPI_1 = (int)SPI1_BASE,
5551
SPI_2 = (int)SPI2_BASE,

‎targets/TARGET_STM/TARGET_STM32F4/TARGET_STM32F401xE/TARGET_NUCLEO_F401RE/PinNames.h

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,18 @@ typedef enum {
122122
D14 = PB_9,
123123
D15 = PB_8,
124124

125+
// STDIO for console print
126+
#ifdef MBED_CONF_TARGET_STDIO_UART_TX
127+
STDIO_UART_TX = MBED_CONF_TARGET_STDIO_UART_TX,
128+
#else
129+
STDIO_UART_TX = PA_2,
130+
#endif
131+
#ifdef MBED_CONF_TARGET_STDIO_UART_RX
132+
STDIO_UART_RX = MBED_CONF_TARGET_STDIO_UART_RX,
133+
#else
134+
STDIO_UART_RX = PA_3,
135+
#endif
136+
125137
// Generic signals namings
126138
LED1 = PA_5,
127139
LED2 = PA_5,
@@ -131,10 +143,10 @@ typedef enum {
131143
USER_BUTTON = PC_13,
132144
// Standardized button names
133145
BUTTON1 = USER_BUTTON,
134-
SERIAL_TX = PA_2,
135-
SERIAL_RX = PA_3,
136-
USBTX = PA_2,
137-
USBRX = PA_3,
146+
SERIAL_TX = STDIO_UART_TX,
147+
SERIAL_RX = STDIO_UART_RX,
148+
USBTX = STDIO_UART_TX,
149+
USBRX = STDIO_UART_RX,
138150
I2C_SCL = PB_8,
139151
I2C_SDA = PB_9,
140152
SPI_MOSI = PA_7,

‎targets/TARGET_STM/TARGET_STM32F4/TARGET_STM32F407xG/TARGET_ARCH_MAX/PeripheralNames.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,10 +56,6 @@ typedef enum {
5656
UART_6 = (int)USART6_BASE,
5757
} UARTName;
5858

59-
#define STDIO_UART_TX PC_6
60-
#define STDIO_UART_RX PC_7
61-
#define STDIO_UART UART_6
62-
6359
typedef enum {
6460
SPI_1 = (int)SPI1_BASE,
6561
SPI_2 = (int)SPI2_BASE,

‎targets/TARGET_STM/TARGET_STM32F4/TARGET_STM32F407xG/TARGET_ARCH_MAX/PinNames.h

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -222,13 +222,25 @@ typedef enum {
222222
D14 = PB_9,
223223
D15 = PB_8,
224224

225+
// STDIO for console print
226+
#ifdef MBED_CONF_TARGET_STDIO_UART_TX
227+
STDIO_UART_TX = MBED_CONF_TARGET_STDIO_UART_TX,
228+
#else
229+
STDIO_UART_TX = PC_6,
230+
#endif
231+
#ifdef MBED_CONF_TARGET_STDIO_UART_RX
232+
STDIO_UART_RX = MBED_CONF_TARGET_STDIO_UART_RX,
233+
#else
234+
STDIO_UART_RX = PC_7,
235+
#endif
236+
225237
// Generic signals namings
226238
LED1 = PB_3,
227239
LED2 = PD_8,
228240
LED3 = PD_9,
229241
LED4 = PD_10,
230-
USBTX = PC_6, /* USART6 */
231-
USBRX = PC_7,
242+
USBTX = STDIO_UART_TX, /* USART6 */
243+
USBRX = STDIO_UART_RX,
232244
I2C_SCL = PB_8, /* I2C1 */
233245
I2C_SDA = PB_9,
234246
SPI_MOSI = PC_3,

‎targets/TARGET_STM/TARGET_STM32F4/TARGET_STM32F407xG/TARGET_DISCO_F407VG/PeripheralNames.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,10 +56,6 @@ typedef enum {
5656
UART_6 = (int)USART6_BASE,
5757
} UARTName;
5858

59-
#define STDIO_UART_TX PA_2
60-
#define STDIO_UART_RX PA_3
61-
#define STDIO_UART UART_2
62-
6359
typedef enum {
6460
SPI_1 = (int)SPI1_BASE,
6561
SPI_2 = (int)SPI2_BASE,

‎targets/TARGET_STM/TARGET_STM32F4/TARGET_STM32F407xG/TARGET_DISCO_F407VG/PinNames.h

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -196,6 +196,18 @@ typedef enum {
196196
ADC_VREF = 0xF1,
197197
ADC_VBAT = 0xF2,
198198

199+
// STDIO for console print
200+
#ifdef MBED_CONF_TARGET_STDIO_UART_TX
201+
STDIO_UART_TX = MBED_CONF_TARGET_STDIO_UART_TX,
202+
#else
203+
STDIO_UART_TX = PA_2,
204+
#endif
205+
#ifdef MBED_CONF_TARGET_STDIO_UART_RX
206+
STDIO_UART_RX = MBED_CONF_TARGET_STDIO_UART_RX,
207+
#else
208+
STDIO_UART_RX = PA_3,
209+
#endif
210+
199211
// Generic signals namings
200212
LED1 = PD_13,
201213
LED2 = PD_12,
@@ -207,10 +219,10 @@ typedef enum {
207219
USER_BUTTON = PA_0,
208220
// Standardized button names
209221
BUTTON1 = USER_BUTTON,
210-
SERIAL_TX = PA_2, /* USART2 */
211-
SERIAL_RX = PA_3,
212-
USBTX = PA_2, /* USART2 */
213-
USBRX = PA_3,
222+
SERIAL_TX = STDIO_UART_TX, /* USART2 */
223+
SERIAL_RX = STDIO_UART_RX,
224+
USBTX = STDIO_UART_TX, /* USART2 */
225+
USBRX = STDIO_UART_RX,
214226
I2C_SCL = PB_8, /* I2C1 */
215227
I2C_SDA = PB_9,
216228
SPI_MOSI = PA_7,

‎targets/TARGET_STM/TARGET_STM32F4/TARGET_STM32F410xB/TARGET_NUCLEO_F410RB/PeripheralNames.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,10 +51,6 @@ typedef enum {
5151
UART_6 = (int)USART6_BASE
5252
} UARTName;
5353

54-
#define STDIO_UART_TX PA_2
55-
#define STDIO_UART_RX PA_3
56-
#define STDIO_UART UART_2
57-
5854
typedef enum {
5955
SPI_1 = (int)SPI1_BASE,
6056
SPI_2 = (int)SPI2_BASE,

‎targets/TARGET_STM/TARGET_STM32F4/TARGET_STM32F410xB/TARGET_NUCLEO_F410RB/PinNames.h

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,18 @@ typedef enum {
122122
D14 = PB_9,
123123
D15 = PB_8,
124124

125+
// STDIO for console print
126+
#ifdef MBED_CONF_TARGET_STDIO_UART_TX
127+
STDIO_UART_TX = MBED_CONF_TARGET_STDIO_UART_TX,
128+
#else
129+
STDIO_UART_TX = PA_2,
130+
#endif
131+
#ifdef MBED_CONF_TARGET_STDIO_UART_RX
132+
STDIO_UART_RX = MBED_CONF_TARGET_STDIO_UART_RX,
133+
#else
134+
STDIO_UART_RX = PA_3,
135+
#endif
136+
125137
// Generic signals namings
126138
LED1 = PA_5,
127139
LED2 = PA_5,
@@ -131,10 +143,10 @@ typedef enum {
131143
USER_BUTTON = PC_13,
132144
// Standardized button names
133145
BUTTON1 = USER_BUTTON,
134-
SERIAL_TX = PA_2,
135-
SERIAL_RX = PA_3,
136-
USBTX = PA_2,
137-
USBRX = PA_3,
146+
SERIAL_TX = STDIO_UART_TX,
147+
SERIAL_RX = STDIO_UART_RX,
148+
USBTX = STDIO_UART_TX,
149+
USBRX = STDIO_UART_RX,
138150
I2C_SCL = PB_8,
139151
I2C_SDA = PB_9,
140152
SPI_MOSI = PB_15,

0 commit comments

Comments
 (0)