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

Refactor: implement data relay from vCANLoggerListen to xUARTQueue

Browse Source 
- No RTOS event, just queue put and get: cleaner way to send data and
  more clear separation of concerns
This commit is contained in:
Erick
2026-06-16 22:09:49 +02:00
parent 5f11cf5213
commit 59b0aca092
5 changed files with 25 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Core/Src/cansend.c
+9 -29
View File
@@ -17,7 +17,9 @@
#include "cansend.h"
/* Private includes ----------------------------------------------------------*/
/* USER CODE BEGIN Includes */
#include "main.h"
#include "cmsis_os.h"
#include "canlog.h"
/* USER CODE END Includes */
/* BEGIN format_can_message */
@@ -80,7 +82,7 @@ void HAL_UART_TxCpltCallback(UART_HandleTypeDef *huart)
if (huart->Instance == USART1)
{
BaseType_t xHigherPriorityTaskWoken = pdFALSE;
osSemaphoreReleaseFromISR(xUartDmaSem, &xHigherPriorityTaskWoken);
osSemaphoreReleaseFromISR(xUARTDMASemaphore, &xHigherPriorityTaskWoken);
portYIELD_FROM_ISR(xHigherPriorityTaskWoken);
}
}
@@ -94,39 +96,17 @@ void HAL_UART_TxCpltCallback(UART_HandleTypeDef *huart)
*/
void vUARTLogger(void *argument)
{
CanMessage_t message;
char tx_buffer[45]; // converted extended frame
bool queues_empty;
CanMessage_t msg;
char tx_buffer[45];
for (;;)
{
osEventFlagsWait(xCanEventFlags, 0x03, osFlagsWaitAny, osWaitForever);
do
for (;;)
{
queues_empty = true;
if (osMessageQueueGet(xCAN1RxQueue, &message, NULL, 0U) == osOK)
if (osMessageQueueGet(xUARTQueue, &msg, NULL, osWaitForever) == osOK)
{
format_can_message(tx_buffer, 1, &message);
format_can_message(tx_buffer, msg.source, &msg); // Assuming you add 'source' to the struct
HAL_UART_Transmit_DMA(&huart1, (uint8_t*)tx_buffer, 44);
osSemaphoreAcquire(xUartDmaSem, osWaitForever);
quesues_empty = false;
osSemaphoreAcquire(xUARTDMASemaphore, osWaitForever);
}
if (osMessageQueueGet(xCAN2RxQueue, &message, NULL, 0U) == osOK)
{
format_can_message(tx_buffer, 2, &message);
HAL_UART_Transmit_DMA(&huart1, (uint8_t*)tx_buffer, 44);
osSemaphoreAcquire(xUartDmaSem, osWaitForever);
queues_empty = false;
}
}
while (!queues_empty);
}
}
/* END vUARTLoggerListen */