Commit f945a84d authored by 郑萍's avatar 郑萍

🐞 fix:54867 【豪进750TFT】【里程】发送车速,里程不累计 里程累积并储存

parent b311fae0
......@@ -194,18 +194,18 @@ void Services_Mileage_Callback(void)
uint32_t Get_ODO_Value(void)
{
uint32_t ODO = 0;
// if (Get_Dis_Unit() == 0) /* 公制 */
// {
// ODO = Data_ODO_Read();
// }
// else if (Get_Dis_Unit() == 1) /* 英制 */
// {
// ODO = Data_Km_To_Mile(Data_ODO_Read());
// }
// else /* 无效值,按照公里处理,理论上不会执行到这 */
// {
// ODO = Data_ODO_Read();
// }
if (Get_Dis_Unit() == 0) /* 公制 */
{
ODO = Data_ODO_Read();
}
else if (Get_Dis_Unit() == 1) /* 英制 */
{
ODO = Data_Km_To_Mile(Data_ODO_Read());
}
else /* 无效值,按照公里处理,理论上不会执行到这 */
{
ODO = Data_ODO_Read();
}
return ODO;
}
......@@ -216,18 +216,18 @@ uint32_t Get_ODO_Value(void)
uint32_t Get_Trip_Value(void)
{
uint32_t Trip = 0;
// if (Get_Dis_Unit() == 0) /* 公制 */
// {
// Trip = Data_Read_Trip(EM_TRIP_A);
// }
// else if (Get_Dis_Unit() == 1) /* 英制 */
// {
// Trip = Data_Km_To_Mile(Data_Read_Trip(EM_TRIP_A));
// }
// else /* 无效值,按照公里处理,理论上不会执行到这 */
// {
// Trip = Data_Read_Trip(EM_TRIP_A);
// }
if (Get_Dis_Unit() == 0) /* 公制 */
{
Trip = Data_Read_Trip(EM_TRIP_A);
}
else if (Get_Dis_Unit() == 1) /* 英制 */
{
Trip = Data_Km_To_Mile(Data_Read_Trip(EM_TRIP_A));
}
else /* 无效值,按照公里处理,理论上不会执行到这 */
{
Trip = Data_Read_Trip(EM_TRIP_A);
}
return Trip;
}
......
......@@ -70,14 +70,12 @@ uint32_t aaa = 0;
void Sys_100ms_Tasks(void)
{
ODOtest = Data_ODO_Read();
Triptest = Data_Read_Trip(0);
S3_ServerCNTT();
Get_DisTime_Service();
Fuel_Cal_Sevice(100u);
Coolant_Cal_Sevice(100u);
Services_Mileage_Callback();
//Data_Mileage_Clear();
// Data_Mileage_Clear();
RTE_GPIO_Config(RTE_GPIO_PORT05_PIN04, GpioOut_High);
......
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