Compare commits
2 Commits
0587cf9756
...
9d4d807cfb
| Author | SHA1 | Date | |
|---|---|---|---|
| 9d4d807cfb | |||
| 5ec806ffea |
@@ -23,6 +23,7 @@
|
|||||||
#define CANLOG_H
|
#define CANLOG_H
|
||||||
|
|
||||||
#include "main.h"
|
#include "main.h"
|
||||||
|
#include "cmsis_os.h"
|
||||||
|
|
||||||
extern osMessageQueueId_t xCAN1RxQueue;
|
extern osMessageQueueId_t xCAN1RxQueue;
|
||||||
extern osMessageQueueId_t xCAN2RxQueue;
|
extern osMessageQueueId_t xCAN2RxQueue;
|
||||||
|
|||||||
+8
-1
@@ -23,7 +23,6 @@
|
|||||||
/* Private includes ----------------------------------------------------------*/
|
/* Private includes ----------------------------------------------------------*/
|
||||||
/* USER CODE BEGIN Includes */
|
/* USER CODE BEGIN Includes */
|
||||||
#include "canlog.h"
|
#include "canlog.h"
|
||||||
#include <system_error>
|
|
||||||
/* USER CODE END Includes */
|
/* USER CODE END Includes */
|
||||||
|
|
||||||
/* Private typedef -----------------------------------------------------------*/
|
/* Private typedef -----------------------------------------------------------*/
|
||||||
@@ -160,6 +159,11 @@ int main(void)
|
|||||||
xLEDSemaphoreCAN2 = osSemaphoreNew(10, 0, NULL);
|
xLEDSemaphoreCAN2 = osSemaphoreNew(10, 0, NULL);
|
||||||
|
|
||||||
if (xLEDSemaphoreCAN1 == NULL || xLEDSemaphoreCAN2 == NULL) Error_Handler();
|
if (xLEDSemaphoreCAN1 == NULL || xLEDSemaphoreCAN2 == NULL) Error_Handler();
|
||||||
|
|
||||||
|
ledContextCAN1.led = &led_can1;
|
||||||
|
ledContextCAN1.semaphore = xLEDSemaphoreCAN1;
|
||||||
|
ledContextCAN2.led = &led_can2;
|
||||||
|
ledContextCAN2.semaphore = xLEDSemaphoreCAN2;
|
||||||
/* USER CODE END RTOS_SEMAPHORES */
|
/* USER CODE END RTOS_SEMAPHORES */
|
||||||
|
|
||||||
/* USER CODE BEGIN RTOS_TIMERS */
|
/* USER CODE BEGIN RTOS_TIMERS */
|
||||||
@@ -170,6 +174,9 @@ int main(void)
|
|||||||
osTimerStart(xHeartbeatTimerCAN2, 25U);
|
osTimerStart(xHeartbeatTimerCAN2, 25U);
|
||||||
|
|
||||||
if (xHeartbeatTimerCAN1 == NULL || xHeartbeatTimerCAN2 == NULL) Error_Handler();
|
if (xHeartbeatTimerCAN1 == NULL || xHeartbeatTimerCAN2 == NULL) Error_Handler();
|
||||||
|
|
||||||
|
ledContextCAN1.timer = xHeartbeatTimerCAN1;
|
||||||
|
ledContextCAN2.timer = xHeartbeatTimerCAN2;
|
||||||
/* USER CODE END RTOS_TIMERS */
|
/* USER CODE END RTOS_TIMERS */
|
||||||
|
|
||||||
/* USER CODE BEGIN RTOS_QUEUES */
|
/* USER CODE BEGIN RTOS_QUEUES */
|
||||||
|
|||||||
Reference in New Issue
Block a user