erki/esp-tunnel
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Install larger RX buffer, and implement error handling via flushing

Browse Source
This commit is contained in:
erki 2023-06-26 14:41:40 +03:00
parent 2e4171fac4
commit 3c29475b82
3 changed files with 30 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
main/app_serial.cpp
View File

@ -28,11 +28,16 @@ QueueHandle_t setupSerial(const uart_port_t uart)
.source_clk = UART_SCLK_DEFAULT, .source_clk = UART_SCLK_DEFAULT,
}; };
ESP_ERROR_CHECK(uart_driver_install(uart, 132, 128 * 2, 4, &s_uart_queue, 0)); ESP_ERROR_CHECK(uart_driver_install(uart, 128 * 2, 128 * 2, 4, &s_uart_queue, 0));
ESP_ERROR_CHECK(uart_param_config(uart, &config)); ESP_ERROR_CHECK(uart_param_config(uart, &config));
ESP_ERROR_CHECK(uart_set_pin(uart, UART_PIN_NO_CHANGE, UART_PIN_NO_CHANGE, UART_PIN_NO_CHANGE, UART_PIN_NO_CHANGE)); ESP_ERROR_CHECK(uart_set_pin(uart, UART_PIN_NO_CHANGE, UART_PIN_NO_CHANGE, UART_PIN_NO_CHANGE, UART_PIN_NO_CHANGE));
return s_uart_queue; return s_uart_queue;
} }
void discardRxBuffer(const uart_port_t uart)
{
ESP_ERROR_CHECK(uart_flush(uart));
}
} }

2
main/app_serial.hpp
View File

@ -13,4 +13,6 @@ namespace Serial
[[nodiscard]] QueueHandle_t setupSerial(const uart_port_t uart); [[nodiscard]] QueueHandle_t setupSerial(const uart_port_t uart);
void discardRxBuffer(const uart_port_t uart);
} }

27
main/esp_tunnel.cpp
View File

@ -1,6 +1,7 @@
#include <array> #include <array>
#include <cstdint> #include <cstdint>
#include <stdio.h> #include <stdio.h>
#include <algorithm>
#include "app_networking.hpp" #include "app_networking.hpp"
#include "app_serial.hpp" #include "app_serial.hpp"
@ -26,13 +27,15 @@ QueueSetHandle_t s_queue_set = nullptr;
QueueHandle_t s_esp_now_queue = nullptr; QueueHandle_t s_esp_now_queue = nullptr;
QueueHandle_t s_uart_queue = nullptr; QueueHandle_t s_uart_queue = nullptr;
void s_sendUartData(const std::size_t len) void s_sendUartData(std::size_t len)
{ {
len = std::clamp<std::size_t>(len, 1, 128);
ESP_LOGD(LOG_TAG, "Sending %u bytes via UART.", len); ESP_LOGD(LOG_TAG, "Sending %u bytes via UART.", len);
std::array<std::uint8_t, 128> tx_buffer; std::array<std::uint8_t, 128> tx_buffer;
uart_read_bytes(CONFIG_ESPTNL_UART, tx_buffer.data(), len, 0); uart_read_bytes(CONFIG_ESPTNL_UART, tx_buffer.data(), len, 0);
xTimerStop(s_timer, 0);
Networking::sendData(tx_buffer, len); Networking::sendData(tx_buffer, len);
} }
@ -54,7 +57,7 @@ std::size_t s_uartBytesWaiting()
if (queue_select == s_esp_now_queue) if (queue_select == s_esp_now_queue)
{ {
Networking::EspNowEvent event; Networking::EspNowEvent event;
xQueueReceive(queue_select, &event, 0); xQueueReceive(s_esp_now_queue, &event, 0);
ESP_LOGD(LOG_TAG, "ESP-NOW event: %u, rx-length: %ull.", event.type, event.rx_length); ESP_LOGD(LOG_TAG, "ESP-NOW event: %u, rx-length: %ull.", event.type, event.rx_length);
@ -81,7 +84,6 @@ std::size_t s_uartBytesWaiting()
if (s_uartBytesWaiting() >= 128) if (s_uartBytesWaiting() >= 128)
{ {
s_sendUartData(bytes_waiting); s_sendUartData(bytes_waiting);
xTimerStop(s_timer, 0);
} }
} }
} }
@ -94,11 +96,26 @@ std::size_t s_uartBytesWaiting()
if (event.type == UART_DATA) if (event.type == UART_DATA)
{ {
if (event.size >= 128) const std::size_t recv_size = s_uartBytesWaiting();
s_sendUartData(event.size); if (recv_size >= 128)
s_sendUartData(recv_size);
else else
xTimerReset(s_timer, 0); xTimerReset(s_timer, 0);
} }
else if (event.type == UART_BUFFER_FULL)
{
const std::size_t recv_size = s_uartBytesWaiting();
s_sendUartData(recv_size);
}
else if (event.type == UART_FIFO_OVF)
{
ESP_LOGE(LOG_TAG, "UART FIFO overflow. Flushing.");
Serial::discardRxBuffer(CONFIG_ESPTNL_UART);
}
}
else
{
ESP_LOGW(LOG_TAG, "Unknown event type.");
} }
} }
} }