mirror/OpenBK7231T_App
3
0
Fork 0
mirror of https://github.com/openshwprojects/OpenBK7231T_App.git synced 2025-10-29 11:33:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

fin

Browse Source
This commit is contained in:
Tester23 2025-09-14 17:04:22 +02:00
parent 44f2c84076
commit aa7d4c8dc4
1 changed files with 43 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
src/hal/espidf/hal_uart_espidf.c
View File

@ -30,29 +30,29 @@ uint8_t* data = NULL;
static void uart_event_task(void* pvParameters)
{
uart_event_t event;
for(;;)
for (;;)
{
if(xQueueReceive(uart_queue, (void*)&event, (TickType_t)portMAX_DELAY))
if (xQueueReceive(uart_queue, (void*)&event, (TickType_t)portMAX_DELAY))
{
bzero(data, 512);
switch(event.type)
switch (event.type)
{
case UART_DATA:
uart_read_bytes(uartnum, data, event.size, portMAX_DELAY);
for(int i = 0; i < event.size; i++)
{
UART_AppendByteToReceiveRingBuffer(data[i]);
}
break;
case UART_BUFFER_FULL:
case UART_FIFO_OVF:
addLogAdv(LOG_WARN, LOG_FEATURE_CMD, "%s", event.type == UART_BUFFER_FULL ? "UART_BUFFER_FULL" : "UART_FIFO_OVF");
uart_flush_input(uartnum);
xQueueReset(uart_queue);
break;
default:
addLogAdv(LOG_INFO, LOG_FEATURE_TUYAMCU, "uart event type: %d", event.type);
break;
case UART_DATA:
uart_read_bytes(uartnum, data, event.size, portMAX_DELAY);
for (int i = 0; i < event.size; i++)
{
UART_AppendByteToReceiveRingBuffer(data[i]);
}
break;
case UART_BUFFER_FULL:
case UART_FIFO_OVF:
addLogAdv(LOG_WARN, LOG_FEATURE_CMD, "%s", event.type == UART_BUFFER_FULL ? "UART_BUFFER_FULL" : "UART_FIFO_OVF");
uart_flush_input(uartnum);
xQueueReset(uart_queue);
break;
default:
addLogAdv(LOG_INFO, LOG_FEATURE_TUYAMCU, "uart event type: %d", event.type);
break;
}
}
}
@ -85,12 +85,12 @@ static void uart_event_task(void* pvParameters)
static void uart_event_task(void* pvParameters)
{
uint8_t* data = (uint8_t*)malloc(512);
while(1)
while (1)
{
int len = uart_read_bytes(uartnum, data, 512, 20 / portTICK_RATE_MS);
if(len)
if (len)
{
for(int i = 0; i < len; i++)
for (int i = 0; i < len; i++)
{
UART_AppendByteToReceiveRingBuffer(data[i]);
}
@ -102,18 +102,10 @@ void HAL_UART_SendByte(byte b)
{
uart_write_bytes(uartnum, &b, 1);
}
void HAL_UART_Flush(void)
{
uart_wait_tx_done(uartnum, pdMS_TO_TICKS(100));
}
void HAL_SetBaud(uint32_t baud)
{
uart_set_baudrate(uartnum, baud);
}
int HAL_UART_Init(int baud, int parity, bool hwflowc, int txOverride, int rxOverride)
{
if(CFG_HasFlag(OBK_FLAG_USE_SECONDARY_UART))
if (CFG_HasFlag(OBK_FLAG_USE_SECONDARY_UART))
{
uartnum = UART_NUM_1;
esp_log_level_set("*", ESP_LOG_INFO);
@ -123,7 +115,7 @@ int HAL_UART_Init(int baud, int parity, bool hwflowc, int txOverride, int rxOver
uartnum = UART_NUM_0;
esp_log_level_set("*", ESP_LOG_NONE);
}
if(uart_is_driver_installed(uartnum))
if (uart_is_driver_installed(uartnum))
{
uart_disable_rx_intr(uartnum);
uart_driver_delete(uartnum);
@ -140,10 +132,9 @@ int HAL_UART_Init(int baud, int parity, bool hwflowc, int txOverride, int rxOver
#endif
};
uart_param_config(uartnum, &uart_config);
uart_driver_install(uartnum, 4096, 4096, 0, NULL, 0);
uart_driver_install(uartnum, 512, 0, 0, NULL, 0);
uart_enable_rx_intr(uartnum);
#if PLATFORM_ESPIDF
if (txOverride != -1) {
uart_set_pin(uartnum,
@ -152,8 +143,25 @@ int HAL_UART_Init(int baud, int parity, bool hwflowc, int txOverride, int rxOver
}
#endif
#if 0//PLATFORM_ESPIDF
if (uartnum == UART_NUM_0)
{
uart_set_pin(uartnum, UART_PIN_NO_CHANGE, UART_PIN_NO_CHANGE, UART_PIN_NO_CHANGE, UART_PIN_NO_CHANGE);
}
else
{
uart_set_pin(uartnum, TX1_PIN, RX1_PIN, UART_PIN_NO_CHANGE, UART_PIN_NO_CHANGE);
}
if (data == NULL)
{
//data = (uint8_t*)malloc(512);
xTaskCreate(uart_event_task, "uart_event_task", 2048, NULL, 16, NULL);
}
#else
//uart_isr_register(uartnum, uart_intr_handle, &uartnum);
#endif
xTaskCreate(uart_event_task, "uart_event_task", 1024, NULL, 16, NULL);
return 1;
}
#endif
#endif