Merge pull request #15457 from chrJost/Console_Pin_Checks

0xc0170 · web-flow · commit 1a036c29fe03 · 2023-10-18T11:48:44.000+01:00
STM32: disable CONSOLE_* checks in for serial if no console available
diff --git a/targets/TARGET_STM/serial_api.c b/targets/TARGET_STM/serial_api.c
@@ -205,13 +205,15 @@ void serial_init(serial_t *obj, PinName tx, PinName rx)
 
     uint8_t stdio_config = false;
 
+#if defined(MBED_CONF_TARGET_CONSOLE_UART)
     if ((tx == CONSOLE_TX) || (rx == CONSOLE_RX)) {
         stdio_config = true;
     } else {
         if (uart_tx == pinmap_peripheral(CONSOLE_TX, PinMap_UART_TX)) {
             error("Error: new serial object is using same UART as STDIO");
         }
     }
+#endif
 
     const serial_pinmap_t explicit_uart_pinmap = {peripheral, tx, tx_function, rx, rx_function, stdio_config};
 

Original file line number	Diff line number	Diff line change
`@@ -205,13 +205,15 @@ void serial_init(serial_t *obj, PinName tx, PinName rx)`
`205`	`205`
`206`	`206`	`uint8_t stdio_config = false;`
`207`	`207`
	`208`	`+#if defined(MBED_CONF_TARGET_CONSOLE_UART)`
`208`	`209`	`if ((tx == CONSOLE_TX) \|\| (rx == CONSOLE_RX)) {`
`209`	`210`	`stdio_config = true;`
`210`	`211`	`} else {`
`211`	`212`	`if (uart_tx == pinmap_peripheral(CONSOLE_TX, PinMap_UART_TX)) {`
`212`	`213`	`error("Error: new serial object is using same UART as STDIO");`
`213`	`214`	`}`
`214`	`215`	`}`
	`216`	`+#endif`
`215`	`217`
`216`	`218`	`const serial_pinmap_t explicit_uart_pinmap = {peripheral, tx, tx_function, rx, rx_function, stdio_config};`
`217`	`219`