Skip to content

Commit f97d846

Browse files
committed
STM32F1: STDIO_UART_TX and STDIO_UART_RX can be now user defined
1 parent 8867831 commit f97d846

File tree

6 files changed

+45
-22
lines changed

6 files changed

+45
-22
lines changed

targets/TARGET_STM/TARGET_STM32F1/TARGET_BLUEPILL_F103C8/PeripheralNames.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,6 @@ typedef enum {
4646
UART_3 = (int)USART3_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_STM32F1/TARGET_BLUEPILL_F103C8/PinNames.h

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -132,15 +132,27 @@ typedef enum {
132132
C14 = PC_14,
133133
C15 = PC_15,
134134

135+
// STDIO for console print
136+
#ifdef MBED_CONF_TARGET_STDIO_UART_TX
137+
STDIO_UART_TX = MBED_CONF_TARGET_STDIO_UART_TX,
138+
#else
139+
STDIO_UART_TX = PA_2,
140+
#endif
141+
#ifdef MBED_CONF_TARGET_STDIO_UART_RX
142+
STDIO_UART_RX = MBED_CONF_TARGET_STDIO_UART_RX,
143+
#else
144+
STDIO_UART_RX = PA_3,
145+
#endif
146+
135147
// Generic signals namings
136148
LED1 = PC_13,
137149
LED2 = PC_13,
138150
LED3 = PC_13,
139151
LED4 = PC_13,
140-
SERIAL_TX = PA_9,
141-
SERIAL_RX = PA_10,
142-
USBTX = PA_9,
143-
USBRX = PA_10,
152+
SERIAL_TX = STDIO_UART_TX,
153+
SERIAL_RX = STDIO_UART_RX,
154+
USBTX = STDIO_UART_TX,
155+
USBRX = STDIO_UART_RX,
144156
I2C_SCL = PB_6,
145157
I2C_SDA = PB_7,
146158
SPI_MOSI = PA_7,

targets/TARGET_STM/TARGET_STM32F1/TARGET_DISCO_F100RB/PeripheralNames.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,6 @@ typedef enum {
4646
UART_3 = (int)USART3_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_STM32F1/TARGET_DISCO_F100RB/PinNames.h

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -143,6 +143,17 @@ typedef enum {
143143
PB14 = PB_14,
144144
PB15 = PB_15,
145145

146+
// STDIO for console print
147+
#ifdef MBED_CONF_TARGET_STDIO_UART_TX
148+
STDIO_UART_TX = MBED_CONF_TARGET_STDIO_UART_TX,
149+
#else
150+
STDIO_UART_TX = PA_2,
151+
#endif
152+
#ifdef MBED_CONF_TARGET_STDIO_UART_RX
153+
STDIO_UART_RX = MBED_CONF_TARGET_STDIO_UART_RX,
154+
#else
155+
STDIO_UART_RX = PA_3,
156+
#endif
146157

147158
// Generic signals namings
148159
LED1 = PC_9,
@@ -152,8 +163,8 @@ typedef enum {
152163
USER_BUTTON = PA_0,
153164
// Standardized button names
154165
BUTTON1 = USER_BUTTON,
155-
USBTX = PA_2,
156-
USBRX = PA_3,
166+
USBTX = STDIO_UART_TX,
167+
USBRX = STDIO_UART_RX,
157168
I2C_SCL = PB_6,
158169
I2C_SDA = PB_7,
159170
SPI_MOSI = PB_15,

targets/TARGET_STM/TARGET_STM32F1/TARGET_NUCLEO_F103RB/PeripheralNames.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,6 @@ typedef enum {
4646
UART_3 = (int)USART3_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_STM32F1/TARGET_NUCLEO_F103RB/PinNames.h

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,18 @@ typedef enum {
119119
D14 = PB_9,
120120
D15 = PB_8,
121121

122+
// STDIO for console print
123+
#ifdef MBED_CONF_TARGET_STDIO_UART_TX
124+
STDIO_UART_TX = MBED_CONF_TARGET_STDIO_UART_TX,
125+
#else
126+
STDIO_UART_TX = PA_2,
127+
#endif
128+
#ifdef MBED_CONF_TARGET_STDIO_UART_RX
129+
STDIO_UART_RX = MBED_CONF_TARGET_STDIO_UART_RX,
130+
#else
131+
STDIO_UART_RX = PA_3,
132+
#endif
133+
122134
// Generic signals namings
123135
LED1 = PA_5,
124136
LED2 = PA_5,
@@ -127,10 +139,10 @@ typedef enum {
127139
USER_BUTTON = PC_13,
128140
// Standardized button names
129141
BUTTON1 = USER_BUTTON,
130-
SERIAL_TX = PA_2,
131-
SERIAL_RX = PA_3,
132-
USBTX = PA_2,
133-
USBRX = PA_3,
142+
SERIAL_TX = STDIO_UART_TX,
143+
SERIAL_RX = STDIO_UART_RX,
144+
USBTX = STDIO_UART_TX,
145+
USBRX = STDIO_UART_RX,
134146
I2C_SCL = PB_8,
135147
I2C_SDA = PB_9,
136148
SPI_MOSI = PA_7,

0 commit comments

Comments
 (0)