Compare commits
2 Commits
59b0aca092
...
c540ff7800
| Author | SHA1 | Date | |
|---|---|---|---|
| c540ff7800 | |||
| dfc116b2e9 |
@@ -71,7 +71,6 @@ void HAL_CAN_RxFifo0MsgPendingCallback(CAN_HandleTypeDef *hcan)
|
||||
uint8_t data[8];
|
||||
|
||||
osMessageQueueId_t queue;
|
||||
uint32_t flag;
|
||||
osThreadId_t led_task;
|
||||
|
||||
// TODO: manage the case of FIFO overflow
|
||||
@@ -86,13 +85,11 @@ void HAL_CAN_RxFifo0MsgPendingCallback(CAN_HandleTypeDef *hcan)
|
||||
if (hcan->Instance == CAN1)
|
||||
{
|
||||
queue = xCAN1RxQueue;
|
||||
flag = 0x01;
|
||||
led_task = xCAN1LedTask;
|
||||
}
|
||||
else
|
||||
{
|
||||
queue = xCAN2RxQueue;
|
||||
flag = 0x02;
|
||||
led_task = xCAN2LedTask;
|
||||
}
|
||||
|
||||
|
||||
+6
-4
@@ -52,6 +52,11 @@ LED_Config led_can1 = {GPIOB, GPIO_PIN_2};
|
||||
LED_Config led_can2 = {GPIOB, GPIO_PIN_5};
|
||||
LED_Config led_error = {GPIOB, GPIO_PIN_3};
|
||||
|
||||
osThreadId_t xCAN1rxTask;
|
||||
osThreadId_t xCAN2rxTask;
|
||||
osThreadId_t xCAN1LedTask;
|
||||
osThreadId_t xCAN2LedTask;
|
||||
|
||||
osMessageQueueId_t xCAN1RxQueue;
|
||||
osMessageQueueId_t xCAN2RxQueue;
|
||||
osMessageQueueId_t xUARTQueue;
|
||||
@@ -120,14 +125,13 @@ int main(void)
|
||||
osKernelInitialize();
|
||||
|
||||
/* USER CODE BEGIN RTOS_TASKS */
|
||||
osThreadId_t xCAN1rxTask;
|
||||
|
||||
const osThreadAttr_t CAN1rxAttributes = {
|
||||
.name = "CAN1rx",
|
||||
.stack_size = 128 * 4,
|
||||
.priority = (osPriority_t) osPriorityRealtime1,
|
||||
};
|
||||
|
||||
osThreadId_t xCAN2rxTask;
|
||||
const osThreadAttr_t CAN2rxAttributes = {
|
||||
.name = "CAN2rx",
|
||||
.stack_size = 128 * 4,
|
||||
@@ -140,14 +144,12 @@ int main(void)
|
||||
.priority = (osPriority_t) osPriorityVeryHigh,
|
||||
};
|
||||
|
||||
osThreadId_t xCAN1LedTask;
|
||||
const osThreadAttr_t LEDHeartbeatCAN1Attributes = {
|
||||
.name = "LED_HB_CAN1",
|
||||
.stack_size = 128 * 4,
|
||||
.priority = (osPriority_t) osPriorityVeryLow1,
|
||||
};
|
||||
|
||||
osThreadId_t xCAN2LedTask;
|
||||
const osThreadAttr_t LEDHeartbeatCAN2Attributes = {
|
||||
.name = "LED_HB_CAN2",
|
||||
.stack_size = 128 * 4,
|
||||
|
||||
Reference in New Issue
Block a user