Merge pull request #8474 from naveenkaje/NRF_RTS_Followon_Fix

0xc0170 · web-flow · commit ab6429f4afb8 · 2018-10-24T09:40:00.000+01:00
NRF52 : Fix UART RTS initialization
diff --git a/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF52/TARGET_MCU_NRF52832/TARGET_DELTA_DFBM_NQ620/PinNames.h b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF52/TARGET_MCU_NRF52832/TARGET_DELTA_DFBM_NQ620/PinNames.h
@@ -141,6 +141,8 @@ typedef enum {
     USBRX = RX_PIN_NUMBER,
     STDIO_UART_TX = TX_PIN_NUMBER,
     STDIO_UART_RX = RX_PIN_NUMBER,
+    STDIO_UART_CTS = CTS_PIN_NUMBER,
+    STDIO_UART_RTS = RTS_PIN_NUMBER,
 
     SPI_PSELMOSI0 = p23,
     SPI_PSELMISO0 = p24,
diff --git a/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF52/TARGET_MCU_NRF52832/TARGET_DELTA_DFBM_NQ620/mbed_overrides.c b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF52/TARGET_MCU_NRF52832/TARGET_DELTA_DFBM_NQ620/mbed_overrides.c
diff --git a/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF52/TARGET_MCU_NRF52832/TARGET_MTB_UBLOX_NINA_B1/PinNames.h b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF52/TARGET_MCU_NRF52832/TARGET_MTB_UBLOX_NINA_B1/PinNames.h
@@ -121,6 +121,8 @@ typedef enum {
     RTS_PIN_NUMBER = p31,
     STDIO_UART_TX = TX_PIN_NUMBER,
     STDIO_UART_RX = RX_PIN_NUMBER,
+    STDIO_UART_CTS = CTS_PIN_NUMBER,
+    STDIO_UART_RTS = RTS_PIN_NUMBER,
 
     I2C_SDA = p2,
     I2C_SCL = p3,
diff --git a/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF52/TARGET_MCU_NRF52832/TARGET_RBLAB_BLENANO2/PinNames.h b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF52/TARGET_MCU_NRF52832/TARGET_RBLAB_BLENANO2/PinNames.h
@@ -132,6 +132,8 @@ typedef enum {
     RTS_PIN_NUMBER = p2,
     STDIO_UART_TX = TX_PIN_NUMBER,
     STDIO_UART_RX = RX_PIN_NUMBER,
+    STDIO_UART_CTS = CTS_PIN_NUMBER,
+    STDIO_UART_RTS = RTS_PIN_NUMBER,
 
     // mBed interface Pins
     USBTX = TX_PIN_NUMBER,
diff --git a/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF52/TARGET_MCU_NRF52832/TARGET_UBLOX_EVA_NINA/PinNames.h b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF52/TARGET_MCU_NRF52832/TARGET_UBLOX_EVA_NINA/PinNames.h
@@ -86,6 +86,8 @@ typedef enum {
     RTS_PIN_NUMBER = p31,
     STDIO_UART_TX = TX_PIN_NUMBER,
     STDIO_UART_RX = RX_PIN_NUMBER,
+    STDIO_UART_CTS = CTS_PIN_NUMBER,
+    STDIO_UART_RTS = RTS_PIN_NUMBER,
 
     I2C_SDA0 = p2,
     I2C_SCL0 = p3,
diff --git a/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF52/reloc_vector_table.c b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF52/reloc_vector_table.c
@@ -113,12 +113,13 @@ void nrf_reloc_vector_table(void)
 #endif
 }
 
-#if (STDIO_UART_RTS != NC)
+
 void mbed_sdk_init(void)
 {
-	gpio_t rts;
-	gpio_init_out(&rts, STDIO_UART_RTS);
-	/* Set STDIO_UART_RTS as gpio driven low */
-	gpio_write(&rts, 0);
+	if (STDIO_UART_RTS != NC) {
+		gpio_t rts;
+		gpio_init_out(&rts, STDIO_UART_RTS);
+		/* Set STDIO_UART_RTS as gpio driven low */
+		gpio_write(&rts, 0);
+	}
 }
-#endif

Original file line number	Diff line number	Diff line change
`@@ -113,12 +113,13 @@ void nrf_reloc_vector_table(void)`
`113`	`113`	`#endif`
`114`	`114`	`}`
`115`	`115`
`116`		`-#if (STDIO_UART_RTS != NC)`
	`116`	`+`
`117`	`117`	`void mbed_sdk_init(void)`
`118`	`118`	`{`
`119`		`- gpio_t rts;`
`120`		`- gpio_init_out(&rts, STDIO_UART_RTS);`
`121`		`- /* Set STDIO_UART_RTS as gpio driven low */`
`122`		`- gpio_write(&rts, 0);`
	`119`	`+ if (STDIO_UART_RTS != NC) {`
	`120`	`+ gpio_t rts;`
	`121`	`+ gpio_init_out(&rts, STDIO_UART_RTS);`
	`122`	`+ /* Set STDIO_UART_RTS as gpio driven low */`
	`123`	`+ gpio_write(&rts, 0);`
	`124`	`+ }`
`123`	`125`	`}`
`124`		`-#endif`