From 81e9a8eced4aa3d38dcab8b7fffccad4b3e95c17 Mon Sep 17 00:00:00 2001 From: Alx-Lai Date: Sun, 14 Jul 2024 01:49:57 +0800 Subject: [PATCH] fix merge error --- fw/Core/Hitcon/Service/DisplayService.cc | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/fw/Core/Hitcon/Service/DisplayService.cc b/fw/Core/Hitcon/Service/DisplayService.cc index 357b11aa..474aba21 100644 --- a/fw/Core/Hitcon/Service/DisplayService.cc +++ b/fw/Core/Hitcon/Service/DisplayService.cc @@ -28,21 +28,21 @@ DisplayService::DisplayService() RequestCBParam tmp_request_cb_param; void DisplayTransferHalfComplete(DMA_HandleTypeDef* hdma) { - tmp.callback = g_display_service.request_frame_callback_arg1; - tmp.buf_index = 0; - scheduler.Queue(&(g_display_service.task), &tmp); + tmp_request_cb_param.callback = g_display_service.request_frame_callback_arg1; + tmp_request_cb_param.buf_index = 0; + scheduler.Queue(&(g_display_service.task), &tmp_request_cb_param); } void DisplayTransferComplete(DMA_HandleTypeDef* hdma) { - tmp.callback = g_display_service.request_frame_callback_arg1; - tmp.buf_index = 1; - scheduler.Queue(&(g_display_service.task), &tmp); + tmp_request_cb_param.callback = g_display_service.request_frame_callback_arg1; + tmp_request_cb_param.buf_index = 1; + scheduler.Queue(&(g_display_service.task), &tmp_request_cb_param); } void DisplayService::Init() { - tmp.callback = request_frame_callback_arg1; - tmp.buf_index = 0; - scheduler.Queue(&task, &tmp); + tmp_request_cb_param.callback = request_frame_callback_arg1; + tmp_request_cb_param.buf_index = 0; + scheduler.Queue(&task, &tmp_request_cb_param); HAL_TIM_PWM_Start(&htim3, TIM_CHANNEL_2); // decoder enable to control brightness __HAL_TIM_ENABLE_DMA(&htim1, TIM_DMA_UPDATE);