🐞 fix:【54797】更换图片格式仪表背景图显示正常【56855】修改自检时间

Firmware/Source/Component/AMT630H/AMT630H_Datas.c

@@ -12,9 +12,9 @@ uint8_t g_u8UnitSetting = Metric ;
 uint8_t g_u8SelfCheck = 0;/*自检*/
 uint16_t g_u16fuelnumberup = 0;
 uint16_t g_u16vspeednumberup = 0;
-uint16_t g_u16vspeednumberdown = 600;
+uint16_t g_u16vspeednumberdown = 300;
 uint16_t g_u16espeednumberup = 0;
-uint16_t g_u16espeednumberdown = 600;
+uint16_t g_u16espeednumberdown = 300;
 
 //自检函数
 void AMT630H_GUI_BACKGRAND_SelfCheck(void);
@@ -3222,11 +3222,11 @@ static void AMT630H_GUI_Voltage(uint16_t Voltage)
         uint16_t Front;
         if ((VoltageNumber <= 120) || (VoltageNumber > 150))
         {
-            SetPagePic(GRAPHICS_PAGE_0, Pic_0563_923_407); /*电压图标*/
+            SetPagePic(GRAPHICS_PAGE_0, Pic_0563_923_407); /*红色电压图标*/
         }
         else
         {
-            ;
+            SetPagePic(GRAPHICS_PAGE_0, Pic_0865_923_407);/*绿色电压图标显示*/
         }
         /*数据处理*/
         Voltage_Hundred = VoltageNumber / 100;
@@ -3286,11 +3286,11 @@ static void AMT630H_GUI_Voltage(uint16_t Voltage)
         uint16_t Front;
         if ((VoltageNumber <= 120) || (VoltageNumber > 150))
         {
-            SetPagePic(GRAPHICS_PAGE_0, Pic_0563_923_407); /*电压图标*/
+            SetPagePic(GRAPHICS_PAGE_0, Pic_0563_923_407); /*红色电压图标*/
         }
         else
         {
-            ;
+            SetPagePic(GRAPHICS_PAGE_0, Pic_0865_923_407);/*绿色电压图标显示*/
         }
         /*数据处理*/
         Voltage_Hundred = VoltageNumber / 100;
@@ -3971,7 +3971,7 @@ void AMT630H_GUI_BACKGRAND()
     {
         AMT630H_GUI_VSpeed(Get_DispVechileSpeed() / 10, Get_Dis_Unit());
     }
-    else
+    else    
     {
         AMT630H_GUI_VSpeed(0,0);
     }
@@ -4017,8 +4017,6 @@ void AMT630H_GUI_BACKGRAND_SelfCheck()
             SetPagePic(GRAPHICS_PAGE_0, Pic_0754_109_347);
         }
     }
-
-
     /*指示灯显示*/
     SetPagePic(GRAPHICS_PAGE_0, Pic_0752_28_13);/*左转向*/
     SetPagePic(GRAPHICS_PAGE_0, Pic_0736_941_13);/*右转向*/
@@ -4034,9 +4032,9 @@ void AMT630H_GUI_BACKGRAND_SelfCheck()
     SetPagePic(GRAPHICS_PAGE_0, Pic_0737_875_23);/*WIFI*/
     SetPagePic(GRAPHICS_PAGE_0, Pic_0740_682_21);/*蓝牙*/
     SetPagePic(GRAPHICS_PAGE_0, Pic_0748_194_26);/*E*/
-    //SetPagePic(GRAPHICS_PAGE_0, Pic_0749_192_26);/*S*/
     
-
+    // AMT630H_GUI_Telephone(Telephone);
+    AMT630H_GUI_Voltage(KL30_VOLTAGE_Value);
     AMT630H_GUI_TIME(Get_Dis_Hour_Time(), Get_Dis_Minute_Time());
     if(KL30_VOLTAGE_time < 10)
     {
@@ -4046,12 +4044,8 @@ void AMT630H_GUI_BACKGRAND_SelfCheck()
     {
         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);
-
-    /*里程 无自检*/
+    /*里程无自检*/
     if(Get_Dis_OdoAndTrip() == 0)
     {
         AMT630H_GUI_ODO(Get_ODO_Value() / 10, Get_Dis_Unit());
@@ -4061,27 +4055,27 @@ void AMT630H_GUI_BACKGRAND_SelfCheck()
         AMT630H_GUI_Trip(Get_Trip_Value(), Get_Dis_Unit());
     }
     /*燃油自检*/
-    if(g_u16fuelnumberup < 1200)
+    if(g_u16fuelnumberup < 600)
     {
         g_u16fuelnumberup += 6;
-        AMT630H_GUI_Fuel_SelfCheck(g_u16fuelnumberup/150);/*初始化g_u16fuelnumberup = 0*/
+        AMT630H_GUI_Fuel_SelfCheck(g_u16fuelnumberup/75);/*初始化g_u16fuelnumberup = 0*/
     }
     else
     {
         ;
     }
     /*车速自检*/
-    if(g_u16vspeednumberup < 600)
+    if(g_u16vspeednumberup < 300)
     {
-        AMT630H_GUI_VSpeed(g_u16vspeednumberup/3,Get_Dis_Unit());/*初始化g_u16vspeednumberup = 0*/
-        g_u16vspeednumberup+=6;
+        AMT630H_GUI_VSpeed(g_u16vspeednumberup,Get_Dis_Unit());/*初始化g_u16vspeednumberup = 0*/
+        g_u16vspeednumberup += 6;
     }
     else
     {
         if(g_u16vspeednumberdown >0)
         {
-            g_u16vspeednumberdown-=6;/*初始化g_u16vspeednumberup=1200*/
-            AMT630H_GUI_VSpeed(g_u16vspeednumberdown/3,Get_Dis_Unit());/*if g_u16vspeednumberup=0 车速自检结束*/
+            g_u16vspeednumberdown -= 6;/*初始化g_u16vspeednumberup=1200*/
+            AMT630H_GUI_VSpeed(g_u16vspeednumberdown,Get_Dis_Unit());/*if g_u16vspeednumberup=0 车速自检结束*/
         }
         else
         {
@@ -4089,21 +4083,21 @@ void AMT630H_GUI_BACKGRAND_SelfCheck()
         }
     }
     /*转速自检*/
-    if(g_u16espeednumberup <= 600)
+    if(g_u16espeednumberup <= 300)
     {
-        AMT630H_GUI_ESpeed(g_u16espeednumberup*20);/*初始化g_u16espeednumberup = 0*/
-        g_u16espeednumberup+=6;
+        AMT630H_GUI_ESpeed(g_u16espeednumberup*40);/*初始化g_u16espeednumberup = 0*/
+        g_u16espeednumberup += 6;
     }
     else
     {
         if(g_u16espeednumberdown > 0)
         {
-            AMT630H_GUI_ESpeed(g_u16espeednumberdown*20);/*初始化g_u16espeednumberdown = 600*/
-            g_u16espeednumberdown-=6;/*g_u16espeednumberdown = 0 转速自检结束*/
+            AMT630H_GUI_ESpeed(g_u16espeednumberdown*40);/*初始化g_u16espeednumberdown = 600*/
+            g_u16espeednumberdown -= 6;/*g_u16espeednumberdown = 0 转速自检结束*/
         }
     }
     /*结束状态*/
-    if(g_u16fuelnumberup == 1200)
+    if(g_u16fuelnumberup == 600)
     {
         AMT630H_GUI_Fuel_SelfCheck(8);
     }
@@ -4116,7 +4110,7 @@ void AMT630H_GUI_BACKGRAND_SelfCheck()
         AMT630H_GUI_ESpeed(g_u16espeednumberdown);
     }
     /*结束自检*/
-    if((g_u16fuelnumberup == 1200)&&(g_u16vspeednumberdown == 0)&&(g_u16espeednumberdown == 0))
+    if((g_u16fuelnumberup == 600)&&(g_u16vspeednumberdown == 0)&&(g_u16espeednumberdown == 0))
     {
         g_u8SelfCheck = 1;/*自检结束标志*/
     }

Firmware/Source/Component/AMT630H/PicBin.h

 #ifndef PICBIN_H
 #define PICBIN_H
 
-/* Flash Bin Version:20240817 2024-08-17 11:18:35 Compression ratio:70.00% */
+/* Flash Bin Version:20240821 2024-08-21 09:09:13 Compression ratio:70.00% */
 #define Pic_0001 1
 #define Pic_0002 2
 #define Pic_0003 3