fix merge error

john0312 · Jul 13, 2024 · 81e9a8e · 81e9a8e
1 parent 7c22966
commit 81e9a8e
Showing 1 changed file with 9 additions and 9 deletions.
diff --git 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);