Fixes UART MODBUS and Loopback issue (espressif#6133)

SuGlider · web-flow · commit 5ae3886c66b0 · 2022-01-17T14:54:13.000+02:00
diff --git a/cores/esp32/esp32-hal-uart.c b/cores/esp32/esp32-hal-uart.c
@@ -153,9 +153,6 @@ uart_t* uartBegin(uint8_t uart_nr, uint32_t baudrate, uint32_t config, int8_t rx
         ESP_ERROR_CHECK(uart_set_line_inverse(uart_nr, UART_SIGNAL_TXD_INV | UART_SIGNAL_RXD_INV));    
     }
 
-    // Set RS485 half duplex mode on UART.  This shall force flush to wait up to sending all bits out
-    ESP_ERROR_CHECK(uart_set_mode(uart_nr, UART_MODE_RS485_HALF_DUPLEX));
-
     UART_MUTEX_UNLOCK();
 
     uartFlush(uart);
@@ -306,7 +303,7 @@ void uartFlushTxOnly(uart_t* uart, bool txOnly)
     }
     
     UART_MUTEX_LOCK();
-    ESP_ERROR_CHECK(uart_wait_tx_done(uart->num, portMAX_DELAY));
+    while(!uart_ll_is_tx_idle(UART_LL_GET_HW(uart->num)));
 
     if ( !txOnly ) {
         ESP_ERROR_CHECK(uart_flush_input(uart->num));

Original file line number	Diff line number	Diff line change
`@@ -153,9 +153,6 @@ uart_t* uartBegin(uint8_t uart_nr, uint32_t baudrate, uint32_t config, int8_t rx`
`153`	`153`	`ESP_ERROR_CHECK(uart_set_line_inverse(uart_nr, UART_SIGNAL_TXD_INV \| UART_SIGNAL_RXD_INV));`
`154`	`154`	`}`
`155`	`155`
`156`		`- // Set RS485 half duplex mode on UART. This shall force flush to wait up to sending all bits out`
`157`		`- ESP_ERROR_CHECK(uart_set_mode(uart_nr, UART_MODE_RS485_HALF_DUPLEX));`
`158`		`-`
`159`	`156`	`UART_MUTEX_UNLOCK();`
`160`	`157`
`161`	`158`	`uartFlush(uart);`
`@@ -306,7 +303,7 @@ void uartFlushTxOnly(uart_t* uart, bool txOnly)`
`306`	`303`	`}`
`307`	`304`
`308`	`305`	`UART_MUTEX_LOCK();`
`309`		`- ESP_ERROR_CHECK(uart_wait_tx_done(uart->num, portMAX_DELAY));`
	`306`	`+ while(!uart_ll_is_tx_idle(UART_LL_GET_HW(uart->num)));`
`310`	`307`
`311`	`308`	`if ( !txOnly ) {`
`312`	`309`	`ESP_ERROR_CHECK(uart_flush_input(uart->num));`