K64F, NUCLEO_F429ZI: Use explicit pinmap for console

Author: mprse

platform/source/mbed_retarget.cpp

@@ -141,6 +141,7 @@ extern serial_t stdio_uart;
 class DirectSerial : public FileHandle {
 public:
     DirectSerial(PinName tx, PinName rx, int baud);
+    DirectSerial(const serial_pinmap_t &explicit_pinmap, int baud);
     virtual ssize_t write(const void *buffer, size_t size);
     virtual ssize_t read(void *buffer, size_t size);
     virtual off_t seek(off_t offset, int whence = SEEK_SET)
@@ -178,6 +179,22 @@ DirectSerial::DirectSerial(PinName tx, PinName rx, int baud)
 #endif
 }
 
+DirectSerial::DirectSerial(const serial_pinmap_t &explicit_pinmap, int baud)
+{
+    if (stdio_uart_inited) {
+        return;
+    }
+    serial_init_direct(&stdio_uart, &explicit_pinmap);
+    serial_baud(&stdio_uart, baud);
+#if   CONSOLE_FLOWCONTROL == CONSOLE_FLOWCONTROL_RTS
+    serial_set_flow_control(&stdio_uart, FlowControlRTS, STDIO_UART_RTS, NC);
+#elif CONSOLE_FLOWCONTROL == CONSOLE_FLOWCONTROL_CTS
+    serial_set_flow_control(&stdio_uart, FlowControlCTS, NC, STDIO_UART_CTS);
+#elif CONSOLE_FLOWCONTROL == CONSOLE_FLOWCONTROL_RTSCTS
+    serial_set_flow_control(&stdio_uart, FlowControlRTSCTS, STDIO_UART_RTS, STDIO_UART_CTS);
+#endif
+}
+
 ssize_t DirectSerial::write(const void *buffer, size_t size)
 {
     const unsigned char *buf = static_cast<const unsigned char *>(buffer);
@@ -262,7 +279,12 @@ static FileHandle *default_console()
 {
 #if MBED_CONF_TARGET_CONSOLE_UART && DEVICE_SERIAL
 #  if MBED_CONF_PLATFORM_STDIO_BUFFERED_SERIAL
-    static UARTSerial console(STDIO_UART_TX, STDIO_UART_RX, MBED_CONF_PLATFORM_STDIO_BAUD_RATE);
+#   if defined(STDIO_UART_TX) && defined(STDIO_UART_TX_FUNC) && defined(STDIO_UART_RX) && defined(STDIO_UART_RX_FUNC) && defined(STDIO_UART)
+      const serial_pinmap_t explicit_pinmap = {STDIO_UART, STDIO_UART_TX, STDIO_UART_TX_FUNC, STDIO_UART_RX, STDIO_UART_RX_FUNC, 1};
+      static UARTSerial console(explicit_pinmap, MBED_CONF_PLATFORM_STDIO_BAUD_RATE);
+#   else
+      static UARTSerial console(STDIO_UART_TX, STDIO_UART_RX, MBED_CONF_PLATFORM_STDIO_BAUD_RATE);
+#   endif
 #   if   CONSOLE_FLOWCONTROL == CONSOLE_FLOWCONTROL_RTS
     console.set_flow_control(SerialBase::RTS, STDIO_UART_RTS, NC);
 #   elif CONSOLE_FLOWCONTROL == CONSOLE_FLOWCONTROL_CTS
@@ -271,7 +293,12 @@ static FileHandle *default_console()
     console.set_flow_control(SerialBase::RTSCTS, STDIO_UART_RTS, STDIO_UART_CTS);
 #   endif
 #  else
-    static DirectSerial console(STDIO_UART_TX, STDIO_UART_RX, MBED_CONF_PLATFORM_STDIO_BAUD_RATE);
+#   if defined(STDIO_UART_TX) && defined(STDIO_UART_TX_FUNC) && defined(STDIO_UART_RX) && defined(STDIO_UART_RX_FUNC) && defined(STDIO_UART)
+      const serial_pinmap_t explicit_pinmap = {STDIO_UART, STDIO_UART_TX, STDIO_UART_TX_FUNC, STDIO_UART_RX, STDIO_UART_RX_FUNC, 1};
+      static DirectSerial console(explicit_pinmap, MBED_CONF_PLATFORM_STDIO_BAUD_RATE);
+#   else
+      static DirectSerial console(STDIO_UART_TX, STDIO_UART_RX, MBED_CONF_PLATFORM_STDIO_BAUD_RATE);
+#   endif
 #  endif
 #else // MBED_CONF_TARGET_CONSOLE_UART && DEVICE_SERIAL
     static Sink console;

targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_MCU_K64F/TARGET_FRDM/PeripheralNames.h

@@ -38,9 +38,11 @@ typedef enum {
     UART_4 = 4,
 } UARTName;
 
-#define STDIO_UART_TX     USBTX
-#define STDIO_UART_RX     USBRX
-#define STDIO_UART        UART_0
+#define STDIO_UART_TX            USBTX
+#define STDIO_UART_TX_FUNC       3
+#define STDIO_UART_RX            USBRX
+#define STDIO_UART_RX_FUNC       3
+#define STDIO_UART               UART_0
 
 typedef enum {
     I2C_0 = 0,

targets/TARGET_STM/TARGET_STM32F4/TARGET_STM32F429xI/TARGET_NUCLEO_F429ZI/PinNames.h

@@ -38,6 +38,22 @@
 extern "C" {
 #endif
 
+#define STDIO_UART               UART_3
+
+    // STDIO for console print
+#ifdef MBED_CONF_TARGET_STDIO_UART_TX
+#  define STDIO_UART_TX MBED_CONF_TARGET_STDIO_UART_TX
+#else
+#  define STDIO_UART_TX PD_8
+#  define STDIO_UART_TX_FUNC STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)
+#endif
+#ifdef MBED_CONF_TARGET_STDIO_UART_RX
+#  define STDIO_UART_RX MBED_CONF_TARGET_STDIO_UART_RX
+#else
+#  define STDIO_UART_RX PD_9
+#  define STDIO_UART_RX_FUNC STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)
+#endif
+
 typedef enum {
     ALT0  = 0x100,
     ALT1  = 0x200,
@@ -241,19 +257,6 @@ typedef enum {
     D13         = PA_5,
     D14         = PB_9,
     D15         = PB_8,
-
-    // STDIO for console print
-#ifdef MBED_CONF_TARGET_STDIO_UART_TX
-    STDIO_UART_TX = MBED_CONF_TARGET_STDIO_UART_TX,
-#else
-    STDIO_UART_TX = PD_8,
-#endif
-#ifdef MBED_CONF_TARGET_STDIO_UART_RX
-    STDIO_UART_RX = MBED_CONF_TARGET_STDIO_UART_RX,
-#else
-    STDIO_UART_RX = PD_9,
-#endif
-
     // Generic signals namings
     LED1        = PB_0,  // LD1 = GREEN
     LED2        = PB_7,  // Blue