Merge branch 'lgh_from_dev' into 'dev'

🐞 fix:修改六小时补偿1s一直补偿不能停止的问题

See merge request !33

Firmware/Source/Application/Driving_Information/Data_Time.c

@@ -5,6 +5,7 @@ DataTimeStruct_st_t Time;
 
 uint16_t u16EngineTimeCount;
 uint8_t g_u8ID339flag = 0U;
+uint8_t g_u8SixHoursCompensationFlag = 0U;
 
 void Data_Time_KL30_Init(void)
 {
@@ -16,6 +17,7 @@ void Data_Time_KL30_Init(void)
     Time.KeepTimeCount = 0U;
     u16EngineTimeCount = 0U;
     g_u8ID339flag = 0U;
+    g_u8SixHoursCompensationFlag = 1U;
 }
 
 void Data_Time_KL15_Init(void)
@@ -25,6 +27,7 @@ void Data_Time_KL15_Init(void)
     Time.KeepTimeCount = 0U;
     u16EngineTimeCount = 0U;
     g_u8ID339flag = 0U;
+    g_u8SixHoursCompensationFlag = 1U;
     #if (PART_NUMBER == G54_A01)
     for(uint8_t i = 0U; i < 3U; i++ )
     {
@@ -84,8 +87,16 @@ void Data_Time_Single_Working_Hours(void)
 
             /*每6小时再多补偿1s*/
             if (((Time.SingleHour % 6U) == 0U) && (Time.SingleHour != 0U))
+            {
+                if (g_u8SixHoursCompensationFlag == 1U)
                 {
                     Time.KeepTimeCount ++;
+                    g_u8SixHoursCompensationFlag = 0U;
+                }
+            }
+            else 
+            {
+                g_u8SixHoursCompensationFlag = 1U;
             }
         }
         else