Merge branch 'wangyanan' into 'dev'

Wangyanan

See merge request !67

Firmware/Source/Application/CAN_CH0_CAN_Communication_Matrix.c

@@ -25,7 +25,7 @@ const st_CANMsgAttribute CAN_CH0_CAN_MSG_CONST_ARRAY[CAN_CH0_ID_TOTAL_MAX] =
         {0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u},
         {0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u},
         {0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u},
-        5000ul,
+        500ul,
         0x111ul,
         (( void * )0),
         (( void * )0),

Firmware/Source/Component/AMT630H/AMT630H_Datas.c

@@ -11,8 +11,9 @@ uint8_t g_u8UnitSetting = Metric ;
 
 uint8_t g_u8SelfCheck = 0;/*自检*/
 uint16_t g_u16fuelnumberup = 0;
+uint16_t g_u16fuelnumberdown = 320;
 uint16_t g_u16vspeednumberup = 0;
-uint16_t g_u16vspeednumberdown = 300;
+uint16_t g_u16vspeednumberdown = 200;
 uint16_t g_u16espeednumberup = 0;
 uint16_t g_u16espeednumberdown = 300;
 uint16_t g_u16voltagenumberup = 0;
@@ -2793,7 +2794,7 @@ static const uint16_t PICList_Fuel[] = {
 //     Pic_0561_623_473,
 // };
 static const uint16_t PICList_Fuel_SelfCheck[] ={
-    Pic_0554_315_473,
+    Pic_0554_315_473,/*黑*/
     Pic_0555_366_473,
     Pic_0556_426_473,
     Pic_0557_469_473,
@@ -3133,7 +3134,7 @@ static void AMT630H_GUI_Fuel_SelfCheck(uint8_t Fuel)
             }
             else if ((FuelLevel < g_u16_GUI_PerFuelLevel) && (g_u16_GUI_PerFuelLevel != 0))
             {
-                g_u16_GUI_PerFuelLevel--;
+                g_u16_GUI_PerFuelLevel--;/*fuellevel = 8 */
             }
             else
             {
@@ -4010,26 +4011,34 @@ void AMT630H_GUI_BACKGRAND_SelfCheck()
         AMT630H_GUI_Trip(Get_Trip_Value(), Get_Dis_Unit());
     }
     /*燃油自检*/
-    if(g_u16fuelnumberup < 600)
+    if(g_u16fuelnumberup < 320)
     {
-        g_u16fuelnumberup += 12;
-        AMT630H_GUI_Fuel_SelfCheck(g_u16fuelnumberup/75);/*初始化g_u16fuelnumberup = 0*/
+        AMT630H_GUI_Fuel_SelfCheck(g_u16fuelnumberup/40);
+        g_u16fuelnumberup += 8;
     }
     else
     {
-        ;
+        if(g_u16fuelnumberdown > 0)
+        {
+            g_u16fuelnumberdown -= 8;
+            AMT630H_GUI_Fuel_SelfCheck(g_u16fuelnumberdown/40);/*初始化g_u16fuelnumberdown = 320*/
+        }
+        else
+        {
+            ;
+        } 
     }
     /*车速自检*/
-    if(g_u16vspeednumberup < 300)
+    if(g_u16vspeednumberup <= 200)
     {
         AMT630H_GUI_VSpeed(g_u16vspeednumberup,Get_Dis_Unit());/*初始化g_u16vspeednumberup = 0*/
-        g_u16vspeednumberup += 12;
+        g_u16vspeednumberup += 8;
     }
     else
     {
         if(g_u16vspeednumberdown >0)
         {
-            g_u16vspeednumberdown -= 12;/*初始化g_u16vspeednumberup=600*/
+            g_u16vspeednumberdown -= 8;/*初始化g_u16vspeednumberup=200*/
             AMT630H_GUI_VSpeed(g_u16vspeednumberdown,Get_Dis_Unit());/*if g_u16vspeednumberup=0 车速自检结束*/
         }
         else
@@ -4087,10 +4096,10 @@ void AMT630H_GUI_BACKGRAND_SelfCheck()
     }
     if(g_u16voltagenumberdown == 0)
     {
-        AMT630H_GUI_Voltage(g_u16voltagenumberdown);
+        AMT630H_GUI_Voltage(0);
     }
     /*结束自检*/
-    if((g_u16fuelnumberup == 600)&&(g_u16vspeednumberdown == 0)&&(g_u16espeednumberdown == 0)&&(g_u16voltagenumberdown == 0))
+    if((g_u16fuelnumberdown == 0)&&(g_u16vspeednumberdown == 0)&&(g_u16espeednumberdown == 0)&&(g_u16voltagenumberdown == 0))
     {
         g_u8SelfCheck = 1;/*自检结束标志*/
     }
@@ -4101,12 +4110,15 @@ void AMT630H_GUI_BACKGRAND_SelfCheck()
 }
 void AMT630H_GUI_SELFCHECK_STS_INIT(void)
 {
-    g_u8SelfCheck         = 0U;
-    g_u16fuelnumberup     = 0U;
-    g_u16vspeednumberup   = 0U;
-    g_u16espeednumberup   = 0U;
-    g_u16vspeednumberdown = 300U;
-    g_u16espeednumberdown = 300U;
+    g_u8SelfCheck          = 0U;
+    g_u16fuelnumberup      = 0U;
+    g_u16fuelnumberdown    = 320U;
+    g_u16vspeednumberup    = 0U;
+    g_u16espeednumberup    = 0U;
+    g_u16vspeednumberdown  = 200U;
+    g_u16espeednumberdown  = 300U;
+    g_u16voltagenumberup   = 0U;
+    g_u16voltagenumberdown = 160U;
 }