Skip to content

Commit c26db91

Browse files
committed
MTB_XX : STDIO configuration
Here is a proposition - to align with other STM32 - and to remove compilation warnings : [Warning] PeripheralNames.h@38,0: "STDIO_UART" redefined
1 parent 98611c8 commit c26db91

File tree

5 files changed

+42
-27
lines changed

5 files changed

+42
-27
lines changed

targets/TARGET_STM/TARGET_STM32F4/TARGET_MTB_MTS_DRAGONFLY/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 PB_6
50-
#define STDIO_UART_RX PB_7
51-
#define STDIO_UART UART_1
52-
5349
typedef enum {
5450
SPI_1 = (int)SPI1_BASE,
5551
SPI_2 = (int)SPI2_BASE,

targets/TARGET_STM/TARGET_STM32F4/TARGET_MTB_MTS_DRAGONFLY/PinNames.h

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -145,9 +145,26 @@ typedef enum {
145145
P_39 = PA_13,
146146
P_40 = PB_7,
147147

148+
// STDIO for console print
149+
#ifdef MBED_CONF_TARGET_STDIO_UART_TX
150+
STDIO_UART_TX = MBED_CONF_TARGET_STDIO_UART_TX,
151+
#elif MBED_CONF_TARGET_USB_TX
152+
STDIO_UART_TX = MBED_CONF_TARGET_USB_TX,
153+
#else
154+
STDIO_UART_TX = PB_6,
155+
#endif
156+
157+
#ifdef MBED_CONF_TARGET_STDIO_UART_RX
158+
STDIO_UART_RX = MBED_CONF_TARGET_STDIO_UART_RX,
159+
#elif MBED_CONF_TARGET_USB_RX
160+
STDIO_UART_TX = MBED_CONF_TARGET_USB_RX,
161+
#else
162+
STDIO_UART_RX = PB_7,
163+
#endif
164+
148165
//DAPLink
149-
USBTX = MBED_CONF_TARGET_USB_TX,
150-
USBRX = MBED_CONF_TARGET_USB_RX,
166+
USBTX = STDIO_UART_TX,
167+
USBRX = STDIO_UART_RX,
151168
SWDIO = PA_13,
152169
SWCLK = PA_14,
153170

targets/TARGET_STM/TARGET_STM32F4/TARGET_STM32F412xG/TARGET_MTB_MXCHIP_EMW3166/PeripheralNames.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,6 @@ typedef enum {
3333
UART_6 = (int)USART6_BASE
3434
} UARTName;
3535

36-
#define STDIO_UART_TX PD_8
37-
#define STDIO_UART_RX PD_9
38-
#define STDIO_UART UART_3
39-
4036
typedef enum {
4137
SPI_1 = (int)SPI1_BASE,
4238
SPI_2 = (int)SPI2_BASE,

targets/TARGET_STM/TARGET_STM32F4/TARGET_STM32F412xG/TARGET_MTB_MXCHIP_EMW3166/PinNames.h

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -219,9 +219,25 @@ typedef enum {
219219
SPI_SCK = P_6,
220220
SPI_CS = P_16,
221221

222+
// STDIO for console print
223+
#ifdef MBED_CONF_TARGET_STDIO_UART_TX
224+
STDIO_UART_TX = MBED_CONF_TARGET_STDIO_UART_TX,
225+
#elif MBED_CONF_TARGET_USB_TX
226+
STDIO_UART_TX = MBED_CONF_TARGET_USB_TX,
227+
#else
228+
STDIO_UART_TX = PB_6,
229+
#endif
230+
231+
#ifdef MBED_CONF_TARGET_STDIO_UART_RX
232+
STDIO_UART_RX = MBED_CONF_TARGET_STDIO_UART_RX,
233+
#elif MBED_CONF_TARGET_USB_RX
234+
STDIO_UART_TX = MBED_CONF_TARGET_USB_RX,
235+
#else
236+
STDIO_UART_RX = PB_7,
237+
#endif
222238
//DAPLink
223-
USBRX = MBED_CONF_TARGET_USB_RX,
224-
USBTX = MBED_CONF_TARGET_USB_TX,
239+
USBRX = STDIO_UART_RX,
240+
USBTX = STDIO_UART_TX,
225241
SWDIO = P_26,
226242
SWCLK = P_25,
227243
NTRST = P_13,

targets/targets.json

Lines changed: 5 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1088,19 +1088,14 @@
10881088
"device_name": "STM32F412ZG",
10891089
"bootloader_supported": true,
10901090
"config": {
1091-
"usb_tx": {
1091+
"stdio_uart_tx": {
10921092
"help": "Value PB_6",
10931093
"value": "PB_6"
10941094
},
1095-
"usb_rx": {
1095+
"stdio_uart_rx": {
10961096
"help": "Value PB_7",
10971097
"value": "PB_7"
10981098
},
1099-
"stdio_uart": {
1100-
"help": "Value: UART_1",
1101-
"value": "UART_1",
1102-
"macro_name": "STDIO_UART"
1103-
},
11041099
"clock_source": {
11051100
"help": "Mask value : USE_PLL_HSE_EXTC | USE_PLL_HSE_XTAL (need HW patch) | USE_PLL_HSI",
11061101
"value": "USE_PLL_HSI",
@@ -1891,19 +1886,14 @@
18911886
"value": 1,
18921887
"macro_name": "MODEM_ON_BOARD_UART"
18931888
},
1894-
"usb_tx": {
1889+
"stdio_uart_tx": {
18951890
"help": "Value PB_6",
18961891
"value": "PB_6"
18971892
},
1898-
"usb_rx": {
1893+
"stdio_uart_rx": {
18991894
"help": "Value PB_7",
19001895
"value": "PB_7"
1901-
},
1902-
"stdio_uart": {
1903-
"help": "Value: UART_1",
1904-
"value": "UART_1",
1905-
"macro_name": "STDIO_UART"
1906-
}
1896+
}
19071897
},
19081898
"overrides": {
19091899
"lse_available": 0

0 commit comments

Comments
 (0)