Commit 2c07b822 authored by hu's avatar hu

Merge branch 'development' into menutest

parents 19cf9fd5 26dce023
......@@ -130,6 +130,7 @@ static uint8_t CalCoolant_CurSeg(uint8_t Valid, uint8_t Temp)
else
{
//范围外/CAN中断
SetGaugesPara(TempGauges, Temp);
u8Result = 0 ;
}
......
......@@ -424,23 +424,13 @@ void GaugeMoveing(uint8_t GaugesNum)
else
{
/*水温表上升最后一格需要调整时间*/
if (
(GaugesNum == TempGauges) && (DirecSign[TempGauges] == 1u) &&
((GaugesCurrentPos[TempGauges] / 10u + 1u) >= (DestPostion[TempGauges] / 10u))
)
if ((GaugesNum == TempGauges) && (DirecSign[TempGauges] == 1u) && (GaugesCurrentPos[TempGauges] == (DestPostion[TempGauges] - 10u)))
{
if (DestPostion[TempGauges] - GaugesCurrentPos[TempGauges] == 1u)
{
GaugesMoveTimesTmp = (4000u - (GaugesDisDelayMax[DisplayModeTmp[GaugesNum]][GaugesModuleType[GaugesNum]] * (DestPostion[TempGauges] - GaugesCurrentPos[TempGauges] - 1u)));
}
else
{
GaugesMoveTimesTmp = GaugesDisDelayMax[DisplayModeTmp[GaugesNum]][GaugesModuleType[GaugesNum]];
}
GaugesMoveTimesTmp = 4000u;
}
else
{
GaugesMoveTimesTmp = GaugesDisDelayMax[DisplayModeTmp[GaugesNum]][GaugesModuleType[GaugesNum]];
GaugesMoveTimesTmp = GaugesDisDelayMax[DisplayModeTmp[GaugesNum]][GaugesModuleType [GaugesNum]];
}
}
}
......
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