Merge branch 'development' into menutest

source/Application/APP/GaugesMode/Gauges.c

@@ -424,13 +424,23 @@ void GaugeMoveing(uint8_t GaugesNum)
                 else
                 {
                     /*水温表上升最后一格需要调整时间*/
-                    if ((GaugesNum == TempGauges) && (DirecSign[TempGauges] == 1u) && (GaugesCurrentPos[TempGauges] == (DestPostion[TempGauges] - 10u)))
+                    if (
+                        (GaugesNum == TempGauges) && (DirecSign[TempGauges] == 1u) &&
+                        ((GaugesCurrentPos[TempGauges] / 10u + 1u) >= (DestPostion[TempGauges] / 10u))
+                    )
                     {
-                        GaugesMoveTimesTmp = 4000u;
+                        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]];
+                        }
                     }
                     else
                     {
-                        GaugesMoveTimesTmp = GaugesDisDelayMax[DisplayModeTmp[GaugesNum]][GaugesModuleType [GaugesNum]];
+                        GaugesMoveTimesTmp = GaugesDisDelayMax[DisplayModeTmp[GaugesNum]][GaugesModuleType[GaugesNum]];
                     }
                 }
             }