Skip to content

Commit 93b3407

Browse files
jeromecoutantjeromecoutant
committed
STM32F7: STDIO_UART_TX and STDIO_UART_RX can be now user defined
1 parent a7bddff commit 93b3407

File tree

10 files changed

+80
-40
lines changed

10 files changed

+80
-40
lines changed

‎targets/TARGET_STM/TARGET_STM32F7/TARGET_STM32F746xG/TARGET_DISCO_F746NG/PeripheralNames.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,10 +57,6 @@ typedef enum {
5757
UART_8 = (int)UART8_BASE
5858
} UARTName;
5959

60-
#define STDIO_UART_TX PA_9
61-
#define STDIO_UART_RX PB_7
62-
#define STDIO_UART UART_1
63-
6460
typedef enum {
6561
SPI_1 = (int)SPI1_BASE,
6662
SPI_2 = (int)SPI2_BASE,

‎targets/TARGET_STM/TARGET_STM32F7/TARGET_STM32F746xG/TARGET_DISCO_F746NG/PinNames.h

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -246,6 +246,18 @@ typedef enum {
246246
D14 = PB_9,
247247
D15 = PB_8,
248248

249+
// STDIO for console print
250+
#ifdef MBED_CONF_TARGET_STDIO_UART_TX
251+
STDIO_UART_TX = MBED_CONF_TARGET_STDIO_UART_TX,
252+
#else
253+
STDIO_UART_TX = PA_9,
254+
#endif
255+
#ifdef MBED_CONF_TARGET_STDIO_UART_RX
256+
STDIO_UART_RX = MBED_CONF_TARGET_STDIO_UART_RX,
257+
#else
258+
STDIO_UART_RX = PB_7,
259+
#endif
260+
249261
// Generic signals namings
250262
LED1 = PI_1, // LD1 = GREEN
251263
LED2 = PI_1,
@@ -254,10 +266,10 @@ typedef enum {
254266
USER_BUTTON = PI_11,
255267
// Standardized button names
256268
BUTTON1 = USER_BUTTON,
257-
SERIAL_TX = PA_9, // Virtual Com Port
258-
SERIAL_RX = PB_7, // Virtual Com Port
259-
USBTX = PA_9, // Virtual Com Port
260-
USBRX = PB_7, // Virtual Com Port
269+
SERIAL_TX = STDIO_UART_TX, // Virtual Com Port
270+
SERIAL_RX = STDIO_UART_RX, // Virtual Com Port
271+
USBTX = STDIO_UART_TX, // Virtual Com Port
272+
USBRX = STDIO_UART_RX, // Virtual Com Port
261273
I2C_SCL = D15,
262274
I2C_SDA = D14,
263275
SPI_MOSI = D11,

‎targets/TARGET_STM/TARGET_STM32F7/TARGET_STM32F746xG/TARGET_NUCLEO_F746ZG/PeripheralNames.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,10 +57,6 @@ typedef enum {
5757
UART_8 = (int)UART8_BASE
5858
} UARTName;
5959

60-
#define STDIO_UART_TX PD_8
61-
#define STDIO_UART_RX PD_9
62-
#define STDIO_UART UART_3
63-
6460
typedef enum {
6561
SPI_1 = (int)SPI1_BASE,
6662
SPI_2 = (int)SPI2_BASE,

‎targets/TARGET_STM/TARGET_STM32F7/TARGET_STM32F746xG/TARGET_NUCLEO_F746ZG/PinNames.h

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -189,6 +189,18 @@ typedef enum {
189189
D14 = PB_9,
190190
D15 = PB_8,
191191

192+
// STDIO for console print
193+
#ifdef MBED_CONF_TARGET_STDIO_UART_TX
194+
STDIO_UART_TX = MBED_CONF_TARGET_STDIO_UART_TX,
195+
#else
196+
STDIO_UART_TX = PD_8,
197+
#endif
198+
#ifdef MBED_CONF_TARGET_STDIO_UART_RX
199+
STDIO_UART_RX = MBED_CONF_TARGET_STDIO_UART_RX,
200+
#else
201+
STDIO_UART_RX = PD_9,
202+
#endif
203+
192204
// Generic signals namings
193205
LED1 = PB_0, // LD1 = GREEN
194206
LED2 = PB_7, // Blue
@@ -197,10 +209,10 @@ typedef enum {
197209
USER_BUTTON = PC_13,
198210
// Standardized button names
199211
BUTTON1 = USER_BUTTON,
200-
SERIAL_TX = PD_8, // Virtual Com Port
201-
SERIAL_RX = PD_9, // Virtual Com Port
202-
USBTX = PD_8, // Virtual Com Port
203-
USBRX = PD_9, // Virtual Com Port
212+
SERIAL_TX = STDIO_UART_TX, // Virtual Com Port
213+
SERIAL_RX = STDIO_UART_RX, // Virtual Com Port
214+
USBTX = STDIO_UART_TX, // Virtual Com Port
215+
USBRX = STDIO_UART_RX, // Virtual Com Port
204216
I2C_SCL = D15,
205217
I2C_SDA = D14,
206218
SPI_MOSI = D11,

‎targets/TARGET_STM/TARGET_STM32F7/TARGET_STM32F756xG/TARGET_NUCLEO_F756ZG/PeripheralNames.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,10 +57,6 @@ typedef enum {
5757
UART_8 = (int)UART8_BASE
5858
} UARTName;
5959

60-
#define STDIO_UART_TX PD_8
61-
#define STDIO_UART_RX PD_9
62-
#define STDIO_UART UART_3
63-
6460
typedef enum {
6561
SPI_1 = (int)SPI1_BASE,
6662
SPI_2 = (int)SPI2_BASE,

‎targets/TARGET_STM/TARGET_STM32F7/TARGET_STM32F756xG/TARGET_NUCLEO_F756ZG/PinNames.h

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -189,6 +189,18 @@ typedef enum {
189189
D14 = PB_9,
190190
D15 = PB_8,
191191

192+
// STDIO for console print
193+
#ifdef MBED_CONF_TARGET_STDIO_UART_TX
194+
STDIO_UART_TX = MBED_CONF_TARGET_STDIO_UART_TX,
195+
#else
196+
STDIO_UART_TX = PD_8,
197+
#endif
198+
#ifdef MBED_CONF_TARGET_STDIO_UART_RX
199+
STDIO_UART_RX = MBED_CONF_TARGET_STDIO_UART_RX,
200+
#else
201+
STDIO_UART_RX = PD_9,
202+
#endif
203+
192204
// Generic signals namings
193205
LED1 = PB_0, // LD1 = GREEN
194206
LED2 = PB_7, // Blue
@@ -197,10 +209,10 @@ typedef enum {
197209
USER_BUTTON = PC_13,
198210
// Standardized button names
199211
BUTTON1 = USER_BUTTON,
200-
SERIAL_TX = PD_8, // Virtual Com Port
201-
SERIAL_RX = PD_9, // Virtual Com Port
202-
USBTX = PD_8, // Virtual Com Port
203-
USBRX = PD_9, // Virtual Com Port
212+
SERIAL_TX = STDIO_UART_TX, // Virtual Com Port
213+
SERIAL_RX = STDIO_UART_RX, // Virtual Com Port
214+
USBTX = STDIO_UART_TX, // Virtual Com Port
215+
USBRX = STDIO_UART_RX, // Virtual Com Port
204216
I2C_SCL = D15,
205217
I2C_SDA = D14,
206218
SPI_MOSI = D11,

‎targets/TARGET_STM/TARGET_STM32F7/TARGET_STM32F767xI/TARGET_NUCLEO_F767ZI/PeripheralNames.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,10 +57,6 @@ typedef enum {
5757
UART_8 = (int)UART8_BASE
5858
} UARTName;
5959

60-
#define STDIO_UART_TX PD_8
61-
#define STDIO_UART_RX PD_9
62-
#define STDIO_UART UART_3
63-
6460
typedef enum {
6561
SPI_1 = (int)SPI1_BASE,
6662
SPI_2 = (int)SPI2_BASE,

‎targets/TARGET_STM/TARGET_STM32F7/TARGET_STM32F767xI/TARGET_NUCLEO_F767ZI/PinNames.h

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -189,6 +189,18 @@ typedef enum {
189189
D14 = PB_9,
190190
D15 = PB_8,
191191

192+
// STDIO for console print
193+
#ifdef MBED_CONF_TARGET_STDIO_UART_TX
194+
STDIO_UART_TX = MBED_CONF_TARGET_STDIO_UART_TX,
195+
#else
196+
STDIO_UART_TX = PD_8,
197+
#endif
198+
#ifdef MBED_CONF_TARGET_STDIO_UART_RX
199+
STDIO_UART_RX = MBED_CONF_TARGET_STDIO_UART_RX,
200+
#else
201+
STDIO_UART_RX = PD_9,
202+
#endif
203+
192204
// Generic signals namings
193205
LED1 = PB_0, // LD1 = GREEN
194206
LED2 = PB_7, // Blue
@@ -197,10 +209,10 @@ typedef enum {
197209
USER_BUTTON = PC_13,
198210
// Standardized button names
199211
BUTTON1 = USER_BUTTON,
200-
SERIAL_TX = PD_8, // Virtual Com Port
201-
SERIAL_RX = PD_9, // Virtual Com Port
202-
USBTX = PD_8, // Virtual Com Port
203-
USBRX = PD_9, // Virtual Com Port
212+
SERIAL_TX = STDIO_UART_TX, // Virtual Com Port
213+
SERIAL_RX = STDIO_UART_RX, // Virtual Com Port
214+
USBTX = STDIO_UART_TX, // Virtual Com Port
215+
USBRX = STDIO_UART_RX, // Virtual Com Port
204216
I2C_SCL = D15,
205217
I2C_SDA = D14,
206218
SPI_MOSI = D11,

‎targets/TARGET_STM/TARGET_STM32F7/TARGET_STM32F769xI/TARGET_DISCO_F769NI/PeripheralNames.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,10 +57,6 @@ typedef enum {
5757
UART_8 = (int)UART8_BASE
5858
} UARTName;
5959

60-
#define STDIO_UART_TX PA_9
61-
#define STDIO_UART_RX PA_10
62-
#define STDIO_UART UART_1
63-
6460
typedef enum {
6561
SPI_1 = (int)SPI1_BASE,
6662
SPI_2 = (int)SPI2_BASE,

‎targets/TARGET_STM/TARGET_STM32F7/TARGET_STM32F769xI/TARGET_DISCO_F769NI/PinNames.h

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -246,6 +246,18 @@ typedef enum {
246246
D14 = PB_9,
247247
D15 = PB_8,
248248

249+
// STDIO for console print
250+
#ifdef MBED_CONF_TARGET_STDIO_UART_TX
251+
STDIO_UART_TX = MBED_CONF_TARGET_STDIO_UART_TX,
252+
#else
253+
STDIO_UART_TX = PA_9,
254+
#endif
255+
#ifdef MBED_CONF_TARGET_STDIO_UART_RX
256+
STDIO_UART_RX = MBED_CONF_TARGET_STDIO_UART_RX,
257+
#else
258+
STDIO_UART_RX = PA_10,
259+
#endif
260+
249261
// Generic signals namings
250262
LED1 = PJ_13, // LD1 = RED
251263
LED2 = PJ_5, // LD2 = GREEN
@@ -254,10 +266,10 @@ typedef enum {
254266
USER_BUTTON = PA_0,
255267
// Standardized button names
256268
BUTTON1 = USER_BUTTON,
257-
SERIAL_TX = PA_9, // Virtual Com Port
258-
SERIAL_RX = PA_10, // Virtual Com Port
259-
USBTX = PA_9, // Virtual Com Port
260-
USBRX = PA_10, // Virtual Com Port
269+
SERIAL_TX = STDIO_UART_TX, // Virtual Com Port
270+
SERIAL_RX = STDIO_UART_RX, // Virtual Com Port
271+
USBTX = STDIO_UART_TX, // Virtual Com Port
272+
USBRX = STDIO_UART_RX, // Virtual Com Port
261273
I2C_SCL = D15,
262274
I2C_SDA = D14,
263275
SPI_MOSI = D11,

0 commit comments

Comments
 (0)