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

Remove LED contexts

Browse Source 
- Are now unnecessary with the move to task notification
This commit is contained in:
Erick
2026-06-16 17:59:57 +02:00
parent 266efdfa7c
commit 34df5e51b7
3 changed files with 7 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Core/Inc/canlog.h
-6
View File
@@ -24,8 +24,6 @@
extern osMessageQueueId_t xCAN1RxQueue; extern osMessageQueueId_t xCAN1RxQueue;
extern osMessageQueueId_t xCAN2RxQueue; extern osMessageQueueId_t xCAN2RxQueue;
extern osSemaphoreId_t xSemaphoreCAN1;
extern osSemaphoreId_t xSemaphoreCAN2;
/* USER CODE BEGIN PTD */ /* USER CODE BEGIN PTD */
typedef struct { typedef struct {
@@ -41,10 +39,6 @@ typedef struct {
//uint32_t timestamp; //Enable TIM2: 42 MHz / (41+1) = 1 MHz → 1 µs tick; 32bit autoreload freerunning //uint32_t timestamp; //Enable TIM2: 42 MHz / (41+1) = 1 MHz → 1 µs tick; 32bit autoreload freerunning
// this is for getting timestamps on can messages // this is for getting timestamps on can messages
} CanMessage_t; } CanMessage_t;
typedef struct {
LED_Config *led;
} LEDContext;
/* USER CODE END PTD */ /* USER CODE END PTD */
/** /**
Core/Src/canlog.c
+3 -3
View File
@@ -130,14 +130,14 @@ void vCANLoggerListen(void *argument)
void vLEDHeartbeat(void *argument) void vLEDHeartbeat(void *argument)
{ {
/* CODE BEGIN */ /* CODE BEGIN */
LEDContext *context = (LEDContext*)argument; LED_Config *led = (LED_Config*)argument;
for (;;) for (;;)
{ {
uint32_t ret = osThreadFlagsWait(0x01, osFlagsWaitAny, 25U); uint32_t ret = osThreadFlagsWait(0x01, osFlagsWaitAny, 25U);
if (ret & 0x01) HAL_GPIO_WritePin(context->led->port, context->led->pin, GPIO_PIN_SET); if (ret & 0x01) HAL_GPIO_WritePin(led->port, led->pin, GPIO_PIN_SET);
else HAL_GPIO_WritePin(context->led->port, context->led->pin, GPIO_PIN_RESET); else HAL_GPIO_WritePin(led->port, led->pin, GPIO_PIN_RESET);
} }
/* CODE END */ /* CODE END */
} }
Core/Src/main.c
+4 -10
View File
@@ -51,9 +51,6 @@ LED_Config led_can1 = {GPIOB, GPIO_PIN_2};
LED_Config led_can2 = {GPIOB, GPIO_PIN_5}; LED_Config led_can2 = {GPIOB, GPIO_PIN_5};
LED_Config led_error = {GPIOB, GPIO_PIN_3}; LED_Config led_error = {GPIOB, GPIO_PIN_3};
LEDContext ledContextCAN1;
LEDContext ledContextCAN2;
osMessageQueueId_t xCAN1RxQueue; osMessageQueueId_t xCAN1RxQueue;
osMessageQueueId_t xCAN2RxQueue; osMessageQueueId_t xCAN2RxQueue;
/* USER CODE END PV */ /* USER CODE END PV */
@@ -167,11 +164,8 @@ int main(void)
/* USER CODE BEGIN RTOS_THREADS */ /* USER CODE BEGIN RTOS_THREADS */
xCAN1rx = osThreadNew(vCANLoggerListen, &hcan1, &CAN1rxAttributes); xCAN1rx = osThreadNew(vCANLoggerListen, &hcan1, &CAN1rxAttributes);
xCAN2rx = osThreadNew(vCANLoggerListen, &hcan2, &CAN2rxAttributes); xCAN2rx = osThreadNew(vCANLoggerListen, &hcan2, &CAN2rxAttributes);
xLedTaskCAN1 = osThreadNew(vLEDHeartbeat, &ledContextCAN1, &LEDHeartbeatCAN1Attributes); xLedTaskCAN1 = osThreadNew(vLEDHeartbeat, &led_can1, &LEDHeartbeatCAN1Attributes);
xLedTaskCAN2 = osThreadNew(vLEDHeartbeat, &ledContextCAN2, &LEDHeartbeatCAN2Attributes); xLedTaskCAN2 = osThreadNew(vLEDHeartbeat, &led_can2, &LEDHeartbeatCAN2Attributes);
ledContextCAN1.led = &led_can1;
ledContextCAN2.led = &led_can2;
/* USER CODE END RTOS_THREADS */ /* USER CODE END RTOS_THREADS */
/* USER CODE BEGIN RTOS_EVENTS */ /* USER CODE BEGIN RTOS_EVENTS */
@@ -190,7 +184,8 @@ int main(void)
/* USER CODE END WHILE */ /* USER CODE END WHILE */
/* USER CODE BEGIN 3 */ /* USER CODE BEGIN 3 */
/* USER CODE END 3 */ /* USER CODE END 3 */
}
} }
/** /**
@@ -476,7 +471,6 @@ static void MX_GPIO_Init(void)
/* USER CODE BEGIN 4 */ /* USER CODE BEGIN 4 */
/* USER CODE END 4 */ /* USER CODE END 4 */
/** /**
* @brief Period elapsed callback in non blocking mode * @brief Period elapsed callback in non blocking mode
* @note This function is called when TIM6 interrupt took place, inside * @note This function is called when TIM6 interrupt took place, inside