Commit 06eb2b04 authored by 陈家乐's avatar 陈家乐

🐞 fix:燃油表取消自检时间判断条件

parent c4e7ae94
...@@ -221,58 +221,56 @@ void Fuel_Gauges_Cal(uint8_t deltaTime) ...@@ -221,58 +221,56 @@ void Fuel_Gauges_Cal(uint8_t deltaTime)
} }
} }
/*计算目标格数*/
if(Common_GetIgnOnTime() > 3005) if (FuelDir == FUEL_SEG_UP)
{ {
if (FuelDir == FUEL_SEG_UP) if (((DesFuelSetp == 4) || FuelInitFlag) && (FuelR < 130))
{ {
if (((DesFuelSetp == 4) || FuelInitFlag) && (FuelR < 130)) DesFuelSetp = 5;
{
DesFuelSetp = 5;
}
else if (((DesFuelSetp == 3) || FuelInitFlag) && (FuelR < 280))
{
DesFuelSetp = 4;
}
else if (((DesFuelSetp == 2) || FuelInitFlag) && (FuelR < 430))
{
DesFuelSetp = 3;
}
else if (((DesFuelSetp == 1) || FuelInitFlag) && (FuelR < 710))
{
DesFuelSetp = 2;
}
else if (((DesFuelSetp == 0) || FuelInitFlag) && (FuelR < 910))
{
DesFuelSetp = 1;
}
} }
else if (FuelDir == FUEL_SEG_DOWN) else if (((DesFuelSetp == 3) || FuelInitFlag) && (FuelR < 280))
{ {
if (((DesFuelSetp == 1) || FuelInitFlag) && (FuelR >= 910)) DesFuelSetp = 4;
{ }
DesFuelSetp = 0; else if (((DesFuelSetp == 2) || FuelInitFlag) && (FuelR < 430))
} {
else if (((DesFuelSetp == 2) || FuelInitFlag) && (FuelR >= 710)) DesFuelSetp = 3;
{ }
DesFuelSetp = 1; else if (((DesFuelSetp == 1) || FuelInitFlag) && (FuelR < 710))
} {
else if (((DesFuelSetp == 3) || FuelInitFlag) && (FuelR >= 430)) DesFuelSetp = 2;
{ }
DesFuelSetp = 2; else if (((DesFuelSetp == 0) || FuelInitFlag) && (FuelR < 910))
} {
else if (((DesFuelSetp == 4) || FuelInitFlag) && (FuelR >= 280)) DesFuelSetp = 1;
{ }
DesFuelSetp = 3; }
} else if (FuelDir == FUEL_SEG_DOWN)
else if (((DesFuelSetp == 5) || FuelInitFlag) && (FuelR >= 130)) {
{ if (((DesFuelSetp == 1) || FuelInitFlag) && (FuelR >= 910))
DesFuelSetp = 4; {
} DesFuelSetp = 0;
}
else if (((DesFuelSetp == 2) || FuelInitFlag) && (FuelR >= 710))
{
DesFuelSetp = 1;
}
else if (((DesFuelSetp == 3) || FuelInitFlag) && (FuelR >= 430))
{
DesFuelSetp = 2;
}
else if (((DesFuelSetp == 4) || FuelInitFlag) && (FuelR >= 280))
{
DesFuelSetp = 3;
}
else if (((DesFuelSetp == 5) || FuelInitFlag) && (FuelR >= 130))
{
DesFuelSetp = 4;
} }
} }
} }
/*IGN ON 1秒/故障恢复后,开始走格 立即指向当前格 20220704*/ /*IGN ON 1秒/故障恢复后,开始走格 立即指向当前格 20220704*/
......
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