Merge pull request #80 from tasmota/revert6134

Revert PR 6134

Author: Jason2866

cores/esp32/HardwareSerial.cpp

@@ -163,10 +163,10 @@ void HardwareSerial::begin(unsigned long baud, uint32_t config, int8_t rxPin, in
     }
 }
 
-void HardwareSerial::onReceive(void(*function)(void))
-{
-    uartOnReceive(_uart, function);
-}
+//void HardwareSerial::onReceive(void(*function)(void))
+//{
+//    uartOnReceive(_uart, function);
+//}
 
 void HardwareSerial::updateBaudRate(unsigned long baud)
 {

cores/esp32/HardwareSerial.h

@@ -59,7 +59,7 @@ class HardwareSerial: public Stream
 
     // onReceive will setup a callback for whenever UART data is received
     // it will work as UART Rx interrupt 
-    void onReceive(void(*function)(void));
+    //void onReceive(void(*function)(void));
 
     void begin(unsigned long baud, uint32_t config=SERIAL_8N1, int8_t rxPin=-1, int8_t txPin=-1, bool invert=false, unsigned long timeout_ms = 20000UL, uint8_t rxfifo_full_thrhd = 112);
     void end(bool turnOffDebug = true);

cores/esp32/esp32-hal-uart.c

@@ -34,9 +34,6 @@ struct uart_struct_t {
     uint8_t num;
     bool has_peek;
     uint8_t peek_byte;
-    QueueHandle_t uart_event_queue;
-    void (*onReceive)(void);
-    TaskHandle_t envent_task;
 };
 
 #if CONFIG_DISABLE_HAL_LOCKS
@@ -45,12 +42,12 @@ struct uart_struct_t {
 #define UART_MUTEX_UNLOCK()
 
 static uart_t _uart_bus_array[] = {
-    {0, false, 0, NULL, NULL, NULL},
+    {0, false, 0},
 #if SOC_UART_NUM > 1
-    {1, false, 0, NULL, NULL, NULL},
+    {1, false, 0},
 #endif
 #if SOC_UART_NUM > 2
-    {2, false, 0, NULL, NULL, NULL},
+    {2, false, 0},
 #endif
 };
 
@@ -60,12 +57,12 @@ static uart_t _uart_bus_array[] = {
 #define UART_MUTEX_UNLOCK()  xSemaphoreGive(uart->lock)
 
 static uart_t _uart_bus_array[] = {
-    {NULL, 0, false, 0, NULL, NULL, NULL},
+    {NULL, 0, false, 0},
 #if SOC_UART_NUM > 1
-    {NULL, 1, false, 0, NULL, NULL, NULL},
+    {NULL, 1, false, 0},
 #endif
 #if SOC_UART_NUM > 2
-    {NULL, 2, false, 0, NULL, NULL, NULL},
+    {NULL, 2, false, 0},
 #endif
 };
 
@@ -84,66 +81,7 @@ uint32_t _get_effective_baudrate(uint32_t baudrate)
     }
 }
 
-
-void uartOnReceive(uart_t* uart, void(*function)(void))
-{
-    if(uart == NULL || function == NULL) {
-        return;
-    }
-    UART_MUTEX_LOCK();
-    uart->onReceive = function;
-    UART_MUTEX_UNLOCK();
-}
-
-
-static void uart_event_task(void *args)
-{
-    uart_t* uart = (uart_t *)args;
-    uart_event_t event;
-    for(;;) {
-        //Waiting for UART event.
-        if(xQueueReceive(uart->uart_event_queue, (void * )&event, (portTickType)portMAX_DELAY)) {
-            switch(event.type) {
-                //Event of UART receving data
-                case UART_DATA:
-                    if(uart->onReceive) uart->onReceive();
-                    break;
-                //Event of HW FIFO overflow detected
-                case UART_FIFO_OVF:
-                    log_w("UART%d FIFO Overflow. Flushing data. Consider adding Flow Control to your Application.", uart->num);
-                    uart_flush_input(uart->num);
-                    xQueueReset(uart->uart_event_queue);
-                    break;
-                //Event of UART ring buffer full
-                case UART_BUFFER_FULL:
-                    log_w("UART%d Buffer Full. Flushing data. Consider encreasing your buffer size of your Application.", uart->num);
-                    uart_flush_input(uart->num);
-                    xQueueReset(uart->uart_event_queue);
-                    break;
-                //Event of UART RX break detected
-                case UART_BREAK:
-                    log_w("UART%d RX break.", uart->num);
-                    break;
-                //Event of UART parity check error
-                case UART_PARITY_ERR:
-                    log_w("UART%d parity error.", uart->num);
-                    break;
-                //Event of UART frame error
-                case UART_FRAME_ERR:
-                    log_w("UART%d frame error.", uart->num);
-                    break;
-                //Others
-                default:
-                    log_w("UART%d unknown event type %d.", uart->num, event.type);
-                    break;
-            }
-        }
-    }
-    vTaskDelete(NULL);
-}
-
-
-bool uartIsDriverInstalled(uart_t* uart)
+bool uartIsDriverInstalled(uart_t* uart) 
 {
     if(uart == NULL) {
         return 0;
@@ -204,20 +142,14 @@ uart_t* uartBegin(uint8_t uart_nr, uint32_t baudrate, uint32_t config, int8_t rx
     uart_config.source_clk = UART_SCLK_APB;
 
 
-    ESP_ERROR_CHECK(uart_driver_install(uart_nr, 2*queueLen, 0, 20, &(uart->uart_event_queue), 0));
+    ESP_ERROR_CHECK(uart_driver_install(uart_nr, 2*queueLen, 0, 0, NULL, 0));
     ESP_ERROR_CHECK(uart_param_config(uart_nr, &uart_config));
     ESP_ERROR_CHECK(uart_set_pin(uart_nr, txPin, rxPin, UART_PIN_NO_CHANGE, UART_PIN_NO_CHANGE));
 
     // Is it right or the idea is to swap rx and tx pins?
     if (inverted) {
         // invert signal for both Rx and Tx
-        ESP_ERROR_CHECK(uart_set_line_inverse(uart_nr, UART_SIGNAL_TXD_INV | UART_SIGNAL_RXD_INV));
-    }
-
-    // Creating UART event Task
-    xTaskCreate(uart_event_task, "uart_event_task", 2048, uart, configMAX_PRIORITIES - 1, &(uart->envent_task));
-    if (!uart->envent_task) {
-        log_e(" -- UART%d Event Task not Created!", uart_nr);
+        ESP_ERROR_CHECK(uart_set_line_inverse(uart_nr, UART_SIGNAL_TXD_INV | UART_SIGNAL_RXD_INV));    
     }
 
     UART_MUTEX_UNLOCK();
@@ -234,11 +166,6 @@ void uartEnd(uart_t* uart)
 
     UART_MUTEX_LOCK();
     uart_driver_delete(uart->num);
-    if (uart->envent_task) {
-        vTaskDelete(uart->envent_task);
-        uart->envent_task = NULL;
-        uart->onReceive = NULL;
-    }
     UART_MUTEX_UNLOCK();
 }
 
@@ -263,7 +190,7 @@ void uartSetRxInvert(uart_t* uart, bool invert)
         hw->conf0.rxd_inv = 1;
     else
         hw->conf0.rxd_inv = 0;
-#endif
+#endif 
 }
 
 
@@ -289,7 +216,7 @@ uint32_t uartAvailableForWrite(uart_t* uart)
         return 0;
     }
     UART_MUTEX_LOCK();
-    uint32_t available =  uart_ll_get_txfifo_len(UART_LL_GET_HW(uart->num));
+    uint32_t available =  uart_ll_get_txfifo_len(UART_LL_GET_HW(uart->num));  
     UART_MUTEX_UNLOCK();
     return available;
 }
@@ -373,7 +300,7 @@ void uartFlushTxOnly(uart_t* uart, bool txOnly)
     if(uart == NULL) {
         return;
     }
-
+    
     UART_MUTEX_LOCK();
     while(!uart_ll_is_tx_idle(UART_LL_GET_HW(uart->num)));
 
@@ -486,7 +413,7 @@ int log_printf(const char *format, ...)
         xSemaphoreTake(_uart_bus_array[s_uart_debug_nr].lock, portMAX_DELAY);
     }
 #endif
-
+    
     vsnprintf(temp, len+1, format, arg);
     ets_printf("%s", temp);
 
@@ -592,10 +519,10 @@ void uartStartDetectBaudrate(uart_t *uart) {
     uart_dev_t *hw = UART_LL_GET_HW(uart->num);
 
 #ifdef CONFIG_IDF_TARGET_ESP32C3
-
+    
     // ESP32-C3 requires further testing
-    // Baud rate detection returns wrong values
-
+    // Baud rate detection returns wrong values 
+   
     log_e("ESP32-C3 baud rate detection is not supported.");
     return;
 
@@ -611,7 +538,7 @@ void uartStartDetectBaudrate(uart_t *uart) {
     hw->auto_baud.en = 1;
 #endif
 }
-
+ 
 unsigned long
 uartDetectBaudrate(uart_t *uart)
 {
@@ -669,4 +596,4 @@ uartDetectBaudrate(uart_t *uart)
     log_e("ESP32-C3 baud rate detection is not supported.");
     return 0;
 #endif
-}
+}

cores/esp32/esp32-hal-uart.h

@@ -54,7 +54,7 @@ typedef struct uart_struct_t uart_t;
 uart_t* uartBegin(uint8_t uart_nr, uint32_t baudrate, uint32_t config, int8_t rxPin, int8_t txPin, uint16_t queueLen, bool inverted, uint8_t rxfifo_full_thrhd);
 void uartEnd(uart_t* uart);
 
-void uartOnReceive(uart_t* uart, void(*function)(void));
+//void uartOnReceive(uart_t* uart, void(*function)(void));
 
 uint32_t uartAvailable(uart_t* uart);
 uint32_t uartAvailableForWrite(uart_t* uart);