Skip to content

Commit f01fbde

Browse files
cmonrcmonr
authored
Merge pull request #5795 from jeromecoutant/PR_USER_DEFINED_STDIO
STM32 STDIO pins number are now configurable
2 parents 3cb9728 + 9c6e7c0 commit f01fbde

File tree

114 files changed

+935
-471
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

114 files changed

+935
-471
lines changed

‎targets/TARGET_STM/TARGET_STM32F0/TARGET_DISCO_F051R8/PeripheralNames.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,10 +50,6 @@ typedef enum {
5050
UART_2 = (int)USART2_BASE
5151
} UARTName;
5252

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

‎targets/TARGET_STM/TARGET_STM32F0/TARGET_DISCO_F051R8/PinNames.h

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,18 @@ typedef enum {
127127
// D14 = PB_9,
128128
// D15 = PB_8,
129129

130+
// STDIO for console print
131+
#ifdef MBED_CONF_TARGET_STDIO_UART_TX
132+
STDIO_UART_TX = MBED_CONF_TARGET_STDIO_UART_TX,
133+
#else
134+
STDIO_UART_TX = PA_2,
135+
#endif
136+
#ifdef MBED_CONF_TARGET_STDIO_UART_RX
137+
STDIO_UART_RX = MBED_CONF_TARGET_STDIO_UART_RX,
138+
#else
139+
STDIO_UART_RX = PA_3,
140+
#endif
141+
130142
// STM32F0-Discovery(STM32F051R8) connector namings
131143
PA0 = PA_0,
132144
PA1 = PA_1,
@@ -188,10 +200,10 @@ typedef enum {
188200
USER_BUTTON = PA_0,
189201
// Standardized button names
190202
BUTTON1 = USER_BUTTON,
191-
SERIAL_TX = PA_2,
192-
SERIAL_RX = PA_3,
193-
USBTX = PA_2,
194-
USBRX = PA_3,
203+
SERIAL_TX = STDIO_UART_TX,
204+
SERIAL_RX = STDIO_UART_RX,
205+
USBTX = STDIO_UART_TX,
206+
USBRX = STDIO_UART_RX,
195207
I2C_SCL = PB_8,
196208
I2C_SDA = PB_9,
197209
SPI_MOSI = PA_7,

‎targets/TARGET_STM/TARGET_STM32F0/TARGET_NUCLEO_F030R8/PeripheralNames.h

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

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,18 @@ typedef enum {
127127
D14 = PB_9,
128128
D15 = PB_8,
129129

130+
// STDIO for console print
131+
#ifdef MBED_CONF_TARGET_STDIO_UART_TX
132+
STDIO_UART_TX = MBED_CONF_TARGET_STDIO_UART_TX,
133+
#else
134+
STDIO_UART_TX = PA_2,
135+
#endif
136+
#ifdef MBED_CONF_TARGET_STDIO_UART_RX
137+
STDIO_UART_RX = MBED_CONF_TARGET_STDIO_UART_RX,
138+
#else
139+
STDIO_UART_RX = PA_3,
140+
#endif
141+
130142
// Generic signals namings
131143
LED1 = PA_5,
132144
LED2 = PA_5,
@@ -135,10 +147,10 @@ typedef enum {
135147
USER_BUTTON = PC_13,
136148
// Standardized button names
137149
BUTTON1 = USER_BUTTON,
138-
SERIAL_TX = PA_2,
139-
SERIAL_RX = PA_3,
140-
USBTX = PA_2,
141-
USBRX = PA_3,
150+
SERIAL_TX = STDIO_UART_TX,
151+
SERIAL_RX = STDIO_UART_RX,
152+
USBTX = STDIO_UART_TX,
153+
USBRX = STDIO_UART_RX,
142154
I2C_SCL = PB_8,
143155
I2C_SDA = PB_9,
144156
SPI_MOSI = PA_7,

‎targets/TARGET_STM/TARGET_STM32F0/TARGET_NUCLEO_F031K6/PeripheralNames.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,6 @@ typedef enum {
4444
UART_1 = (int)USART1_BASE
4545
} UARTName;
4646

47-
#define STDIO_UART_TX PA_2
48-
#define STDIO_UART_RX PA_15
49-
#define STDIO_UART UART_1
50-
5147
typedef enum {
5248
SPI_1 = (int)SPI1_BASE
5349
} SPIName;

‎targets/TARGET_STM/TARGET_STM32F0/TARGET_NUCLEO_F031K6/PinNames.h

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -97,15 +97,27 @@ typedef enum {
9797
D12 = PB_4,
9898
D13 = PB_3,
9999

100+
// STDIO for console print
101+
#ifdef MBED_CONF_TARGET_STDIO_UART_TX
102+
STDIO_UART_TX = MBED_CONF_TARGET_STDIO_UART_TX,
103+
#else
104+
STDIO_UART_TX = PA_2,
105+
#endif
106+
#ifdef MBED_CONF_TARGET_STDIO_UART_RX
107+
STDIO_UART_RX = MBED_CONF_TARGET_STDIO_UART_RX,
108+
#else
109+
STDIO_UART_RX = PA_15,
110+
#endif
111+
100112
// Generic signals namings
101113
LED1 = PB_3,
102114
LED2 = PB_3,
103115
LED3 = PB_3,
104116
LED4 = PB_3,
105-
SERIAL_TX = PA_2,
106-
SERIAL_RX = PA_15,
107-
USBTX = PA_2,
108-
USBRX = PA_15,
117+
SERIAL_TX = STDIO_UART_TX,
118+
SERIAL_RX = STDIO_UART_RX,
119+
USBTX = STDIO_UART_TX,
120+
USBRX = STDIO_UART_RX,
109121
I2C_SCL = PA_9,
110122
I2C_SDA = PA_10,
111123
SPI_MOSI = PB_5,

‎targets/TARGET_STM/TARGET_STM32F0/TARGET_NUCLEO_F042K6/PeripheralNames.h

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

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

‎targets/TARGET_STM/TARGET_STM32F0/TARGET_NUCLEO_F042K6/PinNames.h

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -110,15 +110,27 @@ typedef enum {
110110
D12 = PB_4,
111111
D13 = PB_3,
112112

113+
// STDIO for console print
114+
#ifdef MBED_CONF_TARGET_STDIO_UART_TX
115+
STDIO_UART_TX = MBED_CONF_TARGET_STDIO_UART_TX,
116+
#else
117+
STDIO_UART_TX = PA_2,
118+
#endif
119+
#ifdef MBED_CONF_TARGET_STDIO_UART_RX
120+
STDIO_UART_RX = MBED_CONF_TARGET_STDIO_UART_RX,
121+
#else
122+
STDIO_UART_RX = PA_15,
123+
#endif
124+
113125
// Generic signals namings
114126
LED1 = PB_3,
115127
LED2 = PB_3,
116128
LED3 = PB_3,
117129
LED4 = PB_3,
118-
SERIAL_TX = PA_2,
119-
SERIAL_RX = PA_15,
120-
USBTX = PA_2,
121-
USBRX = PA_15,
130+
SERIAL_TX = STDIO_UART_TX,
131+
SERIAL_RX = STDIO_UART_RX,
132+
USBTX = STDIO_UART_TX,
133+
USBRX = STDIO_UART_RX,
122134
I2C_SCL = PA_9,
123135
I2C_SDA = PA_10,
124136
SPI_MOSI = PB_5,

‎targets/TARGET_STM/TARGET_STM32F0/TARGET_NUCLEO_F070RB/PeripheralNames.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,6 @@ typedef enum {
4747
UART_4 = (int)USART4_BASE
4848
} UARTName;
4949

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

‎targets/TARGET_STM/TARGET_STM32F0/TARGET_NUCLEO_F070RB/PinNames.h

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

126+
// STDIO for console print
127+
#ifdef MBED_CONF_TARGET_STDIO_UART_TX
128+
STDIO_UART_TX = MBED_CONF_TARGET_STDIO_UART_TX,
129+
#else
130+
STDIO_UART_TX = PA_2,
131+
#endif
132+
#ifdef MBED_CONF_TARGET_STDIO_UART_RX
133+
STDIO_UART_RX = MBED_CONF_TARGET_STDIO_UART_RX,
134+
#else
135+
STDIO_UART_RX = PA_3,
136+
#endif
137+
126138
// Generic signals namings
127139
LED1 = PA_5,
128140
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,

0 commit comments

Comments
 (0)