Skip to content

Commit a7bddff

Browse files
jeromecoutantjeromecoutant
committed
STM32F3: STDIO_UART_TX and STDIO_UART_RX can be now user defined
1 parent 785862e commit a7bddff

File tree

14 files changed

+113
-58
lines changed

14 files changed

+113
-58
lines changed

‎targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F302x8/TARGET_NUCLEO_F302R8/PeripheralNames.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,10 +50,6 @@ typedef enum {
5050
UART_3 = (int)USART3_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_2 = (int)SPI2_BASE,
5955
SPI_3 = (int)SPI3_BASE

‎targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F302x8/TARGET_NUCLEO_F302R8/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 = PB_13,
128140
LED2 = PB_13,
@@ -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,

‎targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F303x8/TARGET_NUCLEO_F303K8/PeripheralNames.h

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -49,13 +49,9 @@ typedef enum {
4949
typedef enum {
5050
UART_1 = (int)USART1_BASE,
5151
UART_2 = (int)USART2_BASE,
52-
UART_3 = (int)USART3_BASE // defined for compilation issue. UART3 is not present on STM32F303K8
52+
UART_3 = (int)USART3_BASE
5353
} UARTName;
5454

55-
#define STDIO_UART_TX PA_2
56-
#define STDIO_UART_RX PA_15
57-
#define STDIO_UART UART_2
58-
5955
typedef enum {
6056
SPI_1 = (int)SPI1_BASE
6157
} SPIName;

‎targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F303x8/TARGET_NUCLEO_F303K8/PinNames.h

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,18 @@ typedef enum {
115115
D12 = PB_4,
116116
D13 = PB_3,
117117

118+
// STDIO for console print
119+
#ifdef MBED_CONF_TARGET_STDIO_UART_TX
120+
STDIO_UART_TX = MBED_CONF_TARGET_STDIO_UART_TX,
121+
#else
122+
STDIO_UART_TX = PA_2,
123+
#endif
124+
#ifdef MBED_CONF_TARGET_STDIO_UART_RX
125+
STDIO_UART_RX = MBED_CONF_TARGET_STDIO_UART_RX,
126+
#else
127+
STDIO_UART_RX = PA_15,
128+
#endif
129+
118130
// Generic signals namings
119131
LED1 = PB_3,
120132
LED2 = PB_3,
@@ -123,10 +135,10 @@ typedef enum {
123135
USER_BUTTON = 0x20, // no user button on the board
124136
// Standardized button names
125137
BUTTON1 = USER_BUTTON,
126-
SERIAL_TX = PA_2,
127-
SERIAL_RX = PA_15,
128-
USBTX = PA_2,
129-
USBRX = PA_15,
138+
SERIAL_TX = STDIO_UART_TX,
139+
SERIAL_RX = STDIO_UART_RX,
140+
USBTX = STDIO_UART_TX,
141+
USBRX = STDIO_UART_RX,
130142
I2C_SCL = PB_6,
131143
I2C_SDA = PB_7,
132144
SPI_MOSI = PB_5,

‎targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F303xC/TARGET_DISCO_F303VC/PeripheralNames.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,10 +55,6 @@ typedef enum {
5555
UART_5 = (int)UART5_BASE
5656
} UARTName;
5757

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

‎targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F303xC/TARGET_DISCO_F303VC/PinNames.h

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -177,6 +177,18 @@ typedef enum {
177177
D14 = PB_9,
178178
D15 = PB_8,
179179

180+
// STDIO for console print
181+
#ifdef MBED_CONF_TARGET_STDIO_UART_TX
182+
STDIO_UART_TX = MBED_CONF_TARGET_STDIO_UART_TX,
183+
#else
184+
STDIO_UART_TX = PA_2,
185+
#endif
186+
#ifdef MBED_CONF_TARGET_STDIO_UART_RX
187+
STDIO_UART_RX = MBED_CONF_TARGET_STDIO_UART_RX,
188+
#else
189+
STDIO_UART_RX = PA_3,
190+
#endif
191+
180192
// Generic signals namings
181193
LED1 = PE_9,
182194
LED2 = PE_8,
@@ -191,10 +203,10 @@ typedef enum {
191203
USER_BUTTON = PA_0,
192204
// Standardized button names
193205
BUTTON1 = USER_BUTTON,
194-
SERIAL_TX = PA_2,
195-
SERIAL_RX = PA_3,
196-
USBTX = PA_2,
197-
USBRX = PA_3,
206+
SERIAL_TX = STDIO_UART_TX,
207+
SERIAL_RX = STDIO_UART_RX,
208+
USBTX = STDIO_UART_TX,
209+
USBRX = STDIO_UART_RX,
198210
I2C_SCL = PB_8,
199211
I2C_SDA = PB_9,
200212
SPI_MOSI = PB_15,

‎targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F303xE/TARGET_NUCLEO_F303RE/PeripheralNames.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,10 +55,6 @@ typedef enum {
5555
UART_5 = (int)UART5_BASE
5656
} UARTName;
5757

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

‎targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F303xE/TARGET_NUCLEO_F303RE/PinNames.h

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,18 @@ typedef enum {
131131
D14 = PB_9,
132132
D15 = PB_8,
133133

134+
// STDIO for console print
135+
#ifdef MBED_CONF_TARGET_STDIO_UART_TX
136+
STDIO_UART_TX = MBED_CONF_TARGET_STDIO_UART_TX,
137+
#else
138+
STDIO_UART_TX = PA_2,
139+
#endif
140+
#ifdef MBED_CONF_TARGET_STDIO_UART_RX
141+
STDIO_UART_RX = MBED_CONF_TARGET_STDIO_UART_RX,
142+
#else
143+
STDIO_UART_RX = PA_3,
144+
#endif
145+
134146
// Generic signals namings
135147
LED1 = PA_5,
136148
LED2 = PA_5,
@@ -139,10 +151,10 @@ typedef enum {
139151
USER_BUTTON = PC_13,
140152
// Standardized button names
141153
BUTTON1 = USER_BUTTON,
142-
SERIAL_TX = PA_2,
143-
SERIAL_RX = PA_3,
144-
USBTX = PA_2,
145-
USBRX = PA_3,
154+
SERIAL_TX = STDIO_UART_TX,
155+
SERIAL_RX = STDIO_UART_RX,
156+
USBTX = STDIO_UART_TX,
157+
USBRX = STDIO_UART_RX,
146158
I2C_SCL = PB_8,
147159
I2C_SDA = PB_9,
148160
SPI_MOSI = PA_7,

‎targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F303xE/TARGET_NUCLEO_F303ZE/PeripheralNames.h

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -55,11 +55,6 @@ typedef enum {
5555
UART_5 = (int)UART5_BASE
5656
} UARTName;
5757

58-
#define STDIO_UART_TX SERIAL_TX
59-
#define STDIO_UART_RX SERIAL_RX
60-
#define STDIO_UART UART_3
61-
62-
6358
typedef enum {
6459
SPI_1 = (int)SPI1_BASE,
6560
SPI_2 = (int)SPI2_BASE,

‎targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F303xE/TARGET_NUCLEO_F303ZE/PinNames.h

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -198,6 +198,18 @@ typedef enum {
198198
D14 = PB_9,
199199
D15 = PB_8,
200200

201+
// STDIO for console print
202+
#ifdef MBED_CONF_TARGET_STDIO_UART_TX
203+
STDIO_UART_TX = MBED_CONF_TARGET_STDIO_UART_TX,
204+
#else
205+
STDIO_UART_TX = PD_8,
206+
#endif
207+
#ifdef MBED_CONF_TARGET_STDIO_UART_RX
208+
STDIO_UART_RX = MBED_CONF_TARGET_STDIO_UART_RX,
209+
#else
210+
STDIO_UART_RX = PD_9,
211+
#endif
212+
201213
// Generic signals namings
202214
LED1 = PB_0,
203215
LED2 = PB_7,
@@ -206,10 +218,10 @@ typedef enum {
206218
USER_BUTTON = PC_13,
207219
// Standardized button names
208220
BUTTON1 = USER_BUTTON,
209-
SERIAL_TX = PD_8, // Virtual Com Port
210-
SERIAL_RX = PD_9, // Virtual Com Port
211-
USBTX = SERIAL_TX, // Virtual Com Port
212-
USBRX = SERIAL_RX, // Virtual Com Port
221+
SERIAL_TX = STDIO_UART_TX, // Virtual Com Port
222+
SERIAL_RX = STDIO_UART_RX, // Virtual Com Port
223+
USBTX = STDIO_UART_TX, // Virtual Com Port
224+
USBRX = STDIO_UART_RX, // Virtual Com Port
213225
I2C_SCL = D15,
214226
I2C_SDA = D14,
215227
SPI_MOSI = D11,

0 commit comments

Comments
 (0)