andry/EMS-ESP32
1
0
Fork 0
mirror of https://github.com/emsesp/EMS-ESP32.git synced 2025-12-07 16:29:51 +03:00
Code Issues Packages Projects Releases Wiki Activity

uart, tx-mode 1 check buffersize

Browse Source
This commit is contained in:
MichaelDvP
2022-05-07 15:29:11 +02:00
parent db9237451f
commit 9d2ed1cdbd
1 changed files with 21 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
src/uart/emsuart_esp32.cpp
View File

@@ -22,7 +22,6 @@
#include "freertos/FreeRTOS.h" #include "freertos/FreeRTOS.h"
#include "freertos/task.h" #include "freertos/task.h"
#include "freertos/ringbuf.h"
#include "freertos/queue.h" #include "freertos/queue.h"
#include "driver/uart.h" #include "driver/uart.h"
#include "soc/uart_reg.h" #include "soc/uart_reg.h"
@@ -34,36 +33,27 @@ namespace emsesp {
static QueueHandle_t uart_queue; static QueueHandle_t uart_queue;
uint8_t tx_mode_; uint8_t tx_mode_;
/*
* receive task, wait for break and call incoming_telegram
*/
void EMSuart::uart_event_task(void * pvParameters) { void EMSuart::uart_event_task(void * pvParameters) {
uart_event_t event; uart_event_t event;
uint8_t data[EMS_MAXBUFFERSIZE]; uint8_t telegram[EMS_MAXBUFFERSIZE];
uint8_t len = 0; size_t length;
bool ignore = true; // ignore first telegram
while (1) { while (1) {
//Waiting for UART event. //Waiting for UART event.
if (xQueueReceive(uart_queue, (void *)&event, (portTickType)portMAX_DELAY)) { if (xQueueReceive(uart_queue, (void *)&event, portMAX_DELAY)) {
switch (event.type) { if (event.type == UART_BREAK) {
case UART_DATA: uart_get_buffered_data_len(EMSUART_NUM, &length);
case UART_BUFFER_FULL: if (length == 2 || (length >= 6 && length <= EMS_MAXBUFFERSIZE)) {
if ((event.size + len) <= EMS_MAXBUFFERSIZE) { uart_read_bytes(EMSUART_NUM, telegram, length, portMAX_DELAY);
uart_read_bytes(EMSUART_NUM, data + len, event.size, portMAX_DELAY); if (telegram[0] && !telegram[length - 1]) {
len += event.size; EMSESP::incoming_telegram(telegram, (uint8_t)(length - 1));
} else { // ignore telegram
uint8_t buf[event.size];
uart_read_bytes(EMSUART_NUM, buf, event.size, portMAX_DELAY);
ignore = true;
} }
break; } else {
case UART_BREAK: uart_flush_input(EMSUART_NUM);
if (!ignore && (len == 2 || len >= 4) && data[0] != 0) {
EMSESP::incoming_telegram(data, len - 1);
} }
ignore = false;
len = 0;
break;
default:
break;
} }
} }
} }
@@ -83,17 +73,13 @@ void EMSuart::start(const uint8_t tx_mode, const uint8_t rx_gpio, const uint8_t
.flow_ctrl = UART_HW_FLOWCTRL_DISABLE, .flow_ctrl = UART_HW_FLOWCTRL_DISABLE,
.source_clk = UART_SCLK_APB, .source_clk = UART_SCLK_APB,
}; };
uart_driver_install(EMSUART_NUM, 256, 0, EMS_MAXBUFFERSIZE * 3, &uart_queue, 0); // buffer 128 crash uart_driver_install(EMSUART_NUM, 129, 0, EMS_MAXBUFFERSIZE * 3, &uart_queue, 0); // buffer must be > fifo
uart_param_config(EMSUART_NUM, &uart_config); uart_param_config(EMSUART_NUM, &uart_config);
uart_set_pin(EMSUART_NUM, tx_gpio, rx_gpio, UART_PIN_NO_CHANGE, UART_PIN_NO_CHANGE); uart_set_pin(EMSUART_NUM, tx_gpio, rx_gpio, UART_PIN_NO_CHANGE, UART_PIN_NO_CHANGE);
uart_set_rx_full_threshold(EMSUART_NUM, 1); uart_set_rx_full_threshold(EMSUART_NUM, 1);
// using own interrupt
// uart_isr_free(EMSUART_NUM);
// uart_isr_register(EMSUART_NUM, uart_intr_handle, NULL, ESP_INTR_FLAG_IRAM, &handle_console));
xTaskCreate(uart_event_task, "uart_event_task", 2048, NULL, configMAX_PRIORITIES - 1, NULL); xTaskCreate(uart_event_task, "uart_event_task", 2048, NULL, configMAX_PRIORITIES - 1, NULL);
} }
tx_mode_ = tx_mode; tx_mode_ = tx_mode;
// uart_enable_intr_mask(EMSUART_NUM, 0x81);
uart_enable_intr_mask(EMSUART_NUM, UART_BRK_DET_INT_ENA | UART_RXFIFO_FULL_INT_ENA); uart_enable_intr_mask(EMSUART_NUM, UART_BRK_DET_INT_ENA | UART_RXFIFO_FULL_INT_ENA);
} }
@@ -101,7 +87,6 @@ void EMSuart::start(const uint8_t tx_mode, const uint8_t rx_gpio, const uint8_t
* Stop, disable interrupt * Stop, disable interrupt
*/ */
void EMSuart::stop() { void EMSuart::stop() {
// uart_disable_intr_mask(EMSUART_NUM, 0xFFFFFFFF);
uart_disable_intr_mask(EMSUART_NUM, UART_BRK_DET_INT_ENA | UART_RXFIFO_FULL_INT_ENA); uart_disable_intr_mask(EMSUART_NUM, UART_BRK_DET_INT_ENA | UART_RXFIFO_FULL_INT_ENA);
}; };
@@ -155,14 +140,14 @@ uint16_t EMSuart::transmit(const uint8_t * buf, const uint8_t len) {
// mode 1: wait for echo after each byte // mode 1: wait for echo after each byte
for (uint8_t i = 0; i < len; i++) { for (uint8_t i = 0; i < len; i++) {
// or use size_t rx0, rx1;
// uart_get_buffered_data_len(EMSUART_NUM, size_t *size); uart_get_buffered_data_len(EMSUART_NUM, &rx0);
uint8_t _usrxc = uxQueueMessagesWaiting(uart_queue);
uart_write_bytes(EMSUART_NUM, &buf[i], 1); uart_write_bytes(EMSUART_NUM, &buf[i], 1);
uint16_t timeoutcnt = EMSUART_TX_TIMEOUT; uint16_t timeoutcnt = EMSUART_TX_TIMEOUT;
while ((uxQueueMessagesWaiting(uart_queue) == _usrxc) && (--timeoutcnt > 0)) { do {
delayMicroseconds(EMSUART_TX_BUSY_WAIT); // burn CPU cycles... delayMicroseconds(EMSUART_TX_BUSY_WAIT); // burn CPU cycles...
} uart_get_buffered_data_len(EMSUART_NUM, &rx1);
} while ((rx1 == rx0) && (--timeoutcnt));
} }
uart_set_line_inverse(EMSUART_NUM, UART_SIGNAL_TXD_INV); uart_set_line_inverse(EMSUART_NUM, UART_SIGNAL_TXD_INV);
delayMicroseconds(EMSUART_TX_BRK_EMS); delayMicroseconds(EMSUART_TX_BRK_EMS);