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
+10 -6
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit f0d2990b8d - Show all commits
Core/Src/main.c
+10 -6
View File
@@ -118,13 +118,7 @@ int main(void)
HAL_Init();
/* USER CODE BEGIN Init */
ledCtxCAN1.led = &led_can1;
ledCtxCAN1.sem = xLEDSemaphoreCAN1;
ledCtxCAN1.timer = xHeartbeatTimerCAN1;
ledCtxCAN2.led = &led_can2;
ledCtxCAN2.sem = xLEDSemaphoreCAN2;
ledCtxCAN2.timer = xHeartbeatTimerCAN2;
/* USER CODE END Init */
/* Configure the system clock */
@@ -200,6 +194,16 @@ int main(void)
/* add events, ... */
/* USER CODE END RTOS_EVENTS */
/* USER CODE BEGIN 3 */
ledContextCAN1.led = &led_can1;
ledContextCAN1.semaphore = xLEDSemaphoreCAN1;
ledContextCAN1.timer = xHeartbeatTimerCAN1;
ledContextCAN2.led = &led_can2;
ledContextCAN2.semaphore = xLEDSemaphoreCAN2;
ledContextCAN2.timer = xHeartbeatTimerCAN2;
/* USER CODE END 3 */
/* Start scheduler */
osKernelStart();