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

Merge pull request 'Implement CAN bus reading with CMSIS-RTOS-V2' (#14) from j1939 into main #14

Manually merged
eeeck merged 71 commits from j1939 into main 2026-06-15 10:30:45 +02:00
Conversation 0 Commits 71 Files Changed 104
+11 -2
2 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 34553af0a7 - Show all commits
Core/Inc/canlog.h
+4
View File
@@ -24,6 +24,10 @@
#include "main.h"
/* Decladerations for queues */
extern osMessageQueueId_t xCAN1RxQueue;
extern osMessageQueueId_t xCAN2RxQueue;
/* Decladerations for thread handles and attributes */
extern osThreadId_t vCAN1_rx;
extern osThreadId_t vCAN2_rx;
Core/Src/main.c
+7 -2
View File
@@ -159,8 +159,13 @@ int main(void)
/* USER CODE END RTOS_TIMERS */
/* USER CODE BEGIN RTOS_QUEUES */
QueueHandle_t xCAN1rxQueue;
QueueHandle_t xCAN2rxQueue;
osMessageQueueId_t xCAN1RxQueue;
xCAN1RxQueue = osMessageQueueNew(32, sizeof(CanMessage_t), NULL);
osMessageQueueId_t xCAN2RxQueue;
xCAN2RxQueue = osMessageQueueNew(32, sizeof(CanMessage_t), NULL);
if (xCAN1RxQueue == NULL || xCAN2RxQueue == NULL) Error_Handler();
/* USER CODE END RTOS_QUEUES */
/* USER CODE BEGIN RTOS_THREADS */