Merge branch 'zhengping' into 'dev'

Zhengping

See merge request !58

Firmware/Source/Application/Data_ESpeed.h

@@ -11,10 +11,10 @@
 #define   DATA_ENGINE_RUNNING_THRESHOLD     400  //发动机运转阈值    
 #define   DATA_ENGINE_STOP_THRESHOLD        300  //发动机停止阈值
 
-#define   DATA_ESPEED_DAMPING_FACTOR        1    //阻尼系数
-#define   DATA_ESPEED_INC_STEP              10   //速度增加时慢加速速度变化步长
+#define   DATA_ESPEED_DAMPING_FACTOR        3    //阻尼系数
+#define   DATA_ESPEED_INC_STEP              30   //速度增加时慢加速速度变化步长
 #define   DATA_ESPEED_DEC_STEP              20   //方向改变时急减速速度变化步长
-#define   DATA_ESPEED_APPR_SPEED_MIN        10   //最小逼近速度
+#define   DATA_ESPEED_APPR_SPEED_MIN        20   //最小逼近速度
 #define   DATA_ESPEED_HYSTERESIS            80   //回差    
 
 /*** 控制结构 ***/

Firmware/Source/Application/Data_VSpeed.h

@@ -7,8 +7,8 @@
 #define   DATA_VEHICLE_RUNNING_THRESHOLD    25  //汽车行进阈值    
 #define   DATA_VEHICLE_STOP_THRESHOLD       20  //汽车停止阈值
 
-#define   DATA_VSPEED_DAMPING_FACTOR        1   //阻尼系数
-#define   DATA_VSPEED_INC_STEP              2   //速度增加时慢加速速度变化步长
+#define   DATA_VSPEED_DAMPING_FACTOR        3   //阻尼系数
+#define   DATA_VSPEED_INC_STEP              4   //速度增加时慢加速速度变化步长
 #define   DATA_VSPEED_DEC_STEP              6   //方向改变时急减速速度变化步长
 #define   DATA_VSPEED_APPR_SPEED_MIN        2   //最小逼近速度
 #define   DATA_VSPEED_HYSTERESIS            10  //回差 

Firmware/Source/Component/AMT630H/AMT630H_Datas.c

@@ -3904,7 +3904,7 @@ void AMT630H_GUI_BACKGRAND()
     {
         AMT630H_GUI_Trip(Get_Trip_Value(), Get_Dis_Unit());
     }
-    if(VechileSpeed_time < 4)
+    if(0)
     {
         VechileSpeed_time++;
     }
@@ -3916,7 +3916,7 @@ void AMT630H_GUI_BACKGRAND()
     }
     if (Get_VechileSpeedValid() == 1)
     {
-        AMT630H_GUI_VSpeed(Get_DispVechileSpeed() / 10, Get_Dis_Unit());
+        AMT630H_GUI_VSpeed(VechileSpeed, Get_Dis_Unit());
     }
     else    
     {