Merge pull request #14387 from mark-psl/master

0xc0170 · web-flow · commit 7a707de9d7d7 · 2021-03-09T17:29:45.000Z
Update serial_api.c - Issue #14353 - Setting BufferedSerial pin to NC throws runtime assertion
diff --git a/targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_MCU_K64F/serial_api.c b/targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_MCU_K64F/serial_api.c
@@ -63,14 +63,14 @@ void serial_init_direct(serial_t *obj, const serial_pinmap_t *pinmap)
 
     UART_Init(uart_addrs[obj->serial.index], &config, CLOCK_GetFreq(uart_clocks[obj->serial.index]));
 
-    pin_function(pinmap->tx_pin, pinmap->tx_function);
-    pin_function(pinmap->rx_pin, pinmap->rx_function);
 
     if (pinmap->tx_pin != NC) {
+        pin_function(pinmap->tx_pin, pinmap->tx_function);
         UART_EnableTx(uart_addrs[obj->serial.index], true);
         pin_mode(pinmap->tx_pin, PullUp);
     }
     if (pinmap->rx_pin != NC) {
+        pin_function(pinmap->rx_pin, pinmap->rx_function);
         UART_EnableRx(uart_addrs[obj->serial.index], true);
         pin_mode(pinmap->rx_pin, PullUp);
     }

Original file line number	Diff line number	Diff line change
`@@ -63,14 +63,14 @@ void serial_init_direct(serial_t obj, const serial_pinmap_t pinmap)`
`63`	`63`
`64`	`64`	`UART_Init(uart_addrs[obj->serial.index], &config, CLOCK_GetFreq(uart_clocks[obj->serial.index]));`
`65`	`65`
`66`		`- pin_function(pinmap->tx_pin, pinmap->tx_function);`
`67`		`- pin_function(pinmap->rx_pin, pinmap->rx_function);`
`68`	`66`
`69`	`67`	`if (pinmap->tx_pin != NC) {`
	`68`	`+ pin_function(pinmap->tx_pin, pinmap->tx_function);`
`70`	`69`	`UART_EnableTx(uart_addrs[obj->serial.index], true);`
`71`	`70`	`pin_mode(pinmap->tx_pin, PullUp);`
`72`	`71`	`}`
`73`	`72`	`if (pinmap->rx_pin != NC) {`
	`73`	`+ pin_function(pinmap->rx_pin, pinmap->rx_function);`
`74`	`74`	`UART_EnableRx(uart_addrs[obj->serial.index], true);`
`75`	`75`	`pin_mode(pinmap->rx_pin, PullUp);`
`76`	`76`	`}`