Merge branch 'zhengping' into 'dev'

Zhengping

See merge request !43

Firmware/Source/Application/Data_VSpeed.c

@@ -321,17 +321,7 @@ void Data_Vehicle_Speed_Processing_Service(void)
     }
 
     // 第3步：生成显示车速
-     if ( (DataVSPeedDamping.Speed >= DataVSpeedHysteresis) || (DataVSPeedDamping.Speed < DATA_VSPEED_HYSTERESIS) )
-    {
-        DataVSpeedHysteresis = DataVSPeedDamping.Speed;
-    }
-    else
-    {
-        if ( DataVSpeedHysteresis - DataVSPeedDamping.Speed >= DATA_VSPEED_HYSTERESIS )
-        {
-            DataVSpeedHysteresis = DataVSPeedDamping.Speed;
-        }
-    } 
+    DataVSpeedHysteresis = DataVSPeedDamping.Speed;
 
     VSpeedCal = ( uint32_t )DataVSpeedHysteresis;
 

Firmware/Source/Component/AMT630H/AMT630H_Datas.c

@@ -3855,7 +3855,17 @@ void AMT630H_GUI_BACKGRAND_SelfCheck()
     
 
     AMT630H_GUI_TIME(Get_Dis_Hour_Time(), Get_Dis_Minute_Time());
-    AMT630H_GUI_Voltage((ADC_Read_Signal(ADC_CH_KL30_VOLTAGE)) / 10);
+    if(KL30_VOLTAGE_time < 10)
+    {
+        KL30_VOLTAGE_time++;
+    }
+    else
+    {
+        KL30_VOLTAGE_time = 0;
+        KL30_VOLTAGE_Value = (ADC_Read_Signal(ADC_CH_KL30_VOLTAGE)) / 10;
+        
+    }
+    AMT630H_GUI_Voltage(KL30_VOLTAGE_Value);
     // AMT630H_GUI_Telephone(Telephone);
 
     /*里程 无自检*/

Firmware/Source/Component/Key/Key_user.c

@@ -21,6 +21,10 @@ void Key_Operation_Left(Key_Event_en_t enKeyEvent)//选择
 	case KEY_EVENT_SHORT_PRESS_2:	
 		break;
 	case KEY_EVENT_LONG_PRESS_1:	//2
+	if(Get_Dis_OdoAndTrip() == 1)
+	{
+		Data_Clear_Trip(1);
+	}
 		break;
 	case KEY_EVENT_LONG_PRESS_2:	//3
 		break;

Firmware/Source/Component/Mileage/Services_Mileage_User.c

@@ -218,15 +218,15 @@ uint32_t Get_Trip_Value(void)
     uint32_t Trip = 0;
     if (Get_Dis_Unit() == 0) /* 公制 */
     {
-        Trip = Data_Read_Trip(EM_TRIP_A);
+        Trip = Data_Read_Trip(EM_TRIP_B);
     }
     else if (Get_Dis_Unit() == 1) /* 英制 */
     {
-        Trip = Data_Km_To_Mile(Data_Read_Trip(EM_TRIP_A));
+        Trip = Data_Km_To_Mile(Data_Read_Trip(EM_TRIP_B));
     }
     else /* 无效值，按照公里处理，理论上不会执行到这 */
     {
-        Trip = Data_Read_Trip(EM_TRIP_A);
+        Trip = Data_Read_Trip(EM_TRIP_B);
     }
     return Trip;
 }
@@ -239,7 +239,7 @@ void Trip_Clear_Km_Service(void)
 {
     if (Get_Dis_Unit() == 0) /* 公制 */
     {
-        if (Data_Read_Trip(EM_TRIP_A) > 9999) /* 当前单位在KM时，里程大于999.9KM进行清零 */
+        if (Data_Read_Trip(EM_TRIP_B) > 9999) /* 当前单位在KM时，里程大于999.9KM进行清零 */
         {
             Data_Clear_Trip_All();
         }

Firmware/Source/UDS/UDS_ISO14229_Services.h

@@ -29,7 +29,7 @@
 /******************************************************************************
     program version
 *******************************************************************************/
-#define SWV 0x100 // 0x100 = 1.00 software version 软件版本号
+#define SWV 0x102 // 0x100 = 1.00 software version 软件版本号
 #define HWV 0x100 // 0x100 = 1.00 hardware version 硬件版本号
 #define BTV 0x100 // 0x100 = 1.00 bootloader version boot程序版本号