Commit 1095238b authored by 郑萍's avatar 郑萍

🐞 fix:56272 【豪进7500TFT】【小计】小计里程不能清零&54865 【豪进750TFT】【按键】通过按键无法切换大小计里程

parent a99874fa
...@@ -21,6 +21,10 @@ void Key_Operation_Left(Key_Event_en_t enKeyEvent)//选择 ...@@ -21,6 +21,10 @@ void Key_Operation_Left(Key_Event_en_t enKeyEvent)//选择
case KEY_EVENT_SHORT_PRESS_2: case KEY_EVENT_SHORT_PRESS_2:
break; break;
case KEY_EVENT_LONG_PRESS_1: //2 case KEY_EVENT_LONG_PRESS_1: //2
if(Get_Dis_OdoAndTrip() == 1)
{
Data_Clear_Trip(1);
}
break; break;
case KEY_EVENT_LONG_PRESS_2: //3 case KEY_EVENT_LONG_PRESS_2: //3
break; break;
......
...@@ -218,15 +218,15 @@ uint32_t Get_Trip_Value(void) ...@@ -218,15 +218,15 @@ uint32_t Get_Trip_Value(void)
uint32_t Trip = 0; uint32_t Trip = 0;
if (Get_Dis_Unit() == 0) /* 公制 */ if (Get_Dis_Unit() == 0) /* 公制 */
{ {
Trip = Data_Read_Trip(EM_TRIP_A); Trip = Data_Read_Trip(EM_TRIP_B);
} }
else if (Get_Dis_Unit() == 1) /* 英制 */ else if (Get_Dis_Unit() == 1) /* 英制 */
{ {
Trip = Data_Km_To_Mile(Data_Read_Trip(EM_TRIP_A)); Trip = Data_Km_To_Mile(Data_Read_Trip(EM_TRIP_B));
} }
else /* 无效值,按照公里处理,理论上不会执行到这 */ else /* 无效值,按照公里处理,理论上不会执行到这 */
{ {
Trip = Data_Read_Trip(EM_TRIP_A); Trip = Data_Read_Trip(EM_TRIP_B);
} }
return Trip; return Trip;
} }
...@@ -239,7 +239,7 @@ void Trip_Clear_Km_Service(void) ...@@ -239,7 +239,7 @@ void Trip_Clear_Km_Service(void)
{ {
if (Get_Dis_Unit() == 0) /* 公制 */ if (Get_Dis_Unit() == 0) /* 公制 */
{ {
if (Data_Read_Trip(EM_TRIP_A) > 9999) /* 当前单位在KM时,里程大于999.9KM进行清零 */ if (Data_Read_Trip(EM_TRIP_B) > 9999) /* 当前单位在KM时,里程大于999.9KM进行清零 */
{ {
Data_Clear_Trip_All(); Data_Clear_Trip_All();
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment