eeeck/CANdigger
1
0
Fork 1
Code Issues 7 Pull Requests 1 Actions Projects 1 Releases 6 Wiki Activity

Add error callback to recover from UART deadlock, use async UART

Browse Source 
transmit
This commit is contained in:
Erick
2026-06-24 17:26:37 +02:00
parent b55bd9468f
commit 27b7a2665c
1 changed files with 27 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Core/Src/cansend.c
+27 -13
View File
@@ -52,11 +52,14 @@ void uart_printf(const char *fmt, ...)
{ {
if (osSemaphoreAcquire(xUARTDMASemaphore, osWaitForever) == osOK) if (osSemaphoreAcquire(xUARTDMASemaphore, osWaitForever) == osOK)
{ {
if (HAL_UART_Transmit_DMA(&huart1, (uint8_t*)buf, len) != HAL_OK) osSemaphoreRelease(xUARTDMASemaphore); HAL_UART_Transmit(&huart1, (uint8_t*)buf, len, HAL_MAX_DELAY);
else osSemaphoreAcquire(xUARTDMASemaphore, osWaitForever); osSemaphoreRelease(xUARTDMASemaphore);
} }
} }
else HAL_UART_Transmit(&huart1, (uint8_t*)buf, len, HAL_MAX_DELAY); else
{
HAL_UART_Transmit(&huart1, (uint8_t*)buf, len, HAL_MAX_DELAY);
}
} }
} }
/* END uart_printf */ /* END uart_printf */
@@ -128,7 +131,19 @@ void HAL_UART_TxCpltCallback(UART_HandleTypeDef *huart)
} }
/* END HAL_UART_TxCpltCallback */ /* END HAL_UART_TxCpltCallback */
/* BEGIN vUARTLoggerListen */ /* BEGIN HAL_UART_ErrorCallback */
/**
* @brief Safely release UART semaphore inside ISR and yield task if possible.
* @param argument: UART handle
* @retval None
*/
void HAL_UART_ErrorCallback(UART_HandleTypeDef *huart)
{
if (huart->Instance == USART1) osSemaphoreRelease(xUARTDMASemaphore);
}
/* END HAL_UART_ErrorCallback */
/* BEGIN vUARTLogger */
/** /**
* @brief Send CAN bus traffic saved in FIFO buffer to USART1 * @brief Send CAN bus traffic saved in FIFO buffer to USART1
* @param argument: Not used * @param argument: Not used
@@ -155,13 +170,10 @@ void vUARTLogger(void *argument)
#ifdef DEBUG_DUMMY_FRAME #ifdef DEBUG_DUMMY_FRAME
uint32_t queue_timeout = 1000U; uint32_t queue_timeout = 1000U;
#else
uint32_t queue_timeout = osWaitForever;
#endif
#ifdef DEBUG_DUMMY_FRAME
osMessageQueuePut(xUARTQueue, &dummy_frame, 0U, 0U); osMessageQueuePut(xUARTQueue, &dummy_frame, 0U, 0U);
osDelay(1000); osDelay(1000);
#else
uint32_t queue_timeout = osWaitForever;
#endif #endif
if (osMessageQueueGet(xUARTQueue, &message, NULL, queue_timeout) == osOK) if (osMessageQueueGet(xUARTQueue, &message, NULL, queue_timeout) == osOK)
@@ -170,12 +182,14 @@ void vUARTLogger(void *argument)
{ {
int len = format_can_message(tx_buffer, message.source, &message); int len = format_can_message(tx_buffer, message.source, &message);
if (HAL_UART_Transmit_DMA(&huart1, (uint8_t*)tx_buffer, len) != HAL_OK) Error_Handler(); if (HAL_UART_Transmit_DMA(&huart1, (uint8_t*)tx_buffer, len) != HAL_OK)
else DEBUG_PRINT("[E] HAL error, CAN frame NOT sent!\r\n"); {
osSemaphoreRelease(xUARTDMASemaphore); osSemaphoreRelease(xUARTDMASemaphore);
DEBUG_PRINT("[E] HAL error, CAN frame NOT sent!\r\n");
}
} }
else DEBUG_PRINT("[E] Semaphore timeout! UART might be stuck in BUSY state.\r\n"); else DEBUG_PRINT("[E] Semaphore timeout! UART might be stuck in BUSY state.\r\n");
} }
} }
} }
/* END vUARTLoggerListen */ /* END vUARTLogger */