调整开机动画显示

source/Application/APP/GaugesMode/Gauges.c

@@ -13,7 +13,7 @@
 #include "Gauges.h"
 #include "GaugesInterface.h"
 #define   GAUGES_TOTAL_NUM  9u
-#define   GAUGES_INIT_TIME_MAX  3000u
+#define   GAUGES_INIT_TIME_MAX  2000u
 uint16_t  GaugesCurrentPos[GAUGES_TOTAL_NUM] ;
 uint16_t  BackupDestPostion[GAUGES_TOTAL_NUM];
 uint16_t  GaugesDisPos[GAUGES_TOTAL_NUM];
@@ -27,7 +27,7 @@ uint16_t  GaugesInitTimes;
 uint8_t   GaugesPowerState = 0u;
 uint16_t  GaugesFreeSetTimes = 0u;
 uint16_t  GaugesLibDataIn;
-const uint16_t  Gauages_Init_Time_Max[2] = {3000, 6000};
+const uint16_t  Gauages_Init_Time_Max[2] = {GAUGES_INIT_TIME_MAX, 6000};
 uint8_t   ModeGaugesTestFlag[GAUGES_TOTAL_NUM] = {0u};
 /*两套参数第一个是正常走行速度，第二个为快速走动8*/
 const uint16_t GaugesDisDelayMax[2u][IndicatTypeTOtal] =
@@ -578,7 +578,6 @@ void SeftTest_GaugeMoveing(uint8_t GaugesNum)
     {
         if (GaugesInitTimes > GaugesStarMoveTimeMax[GaugesNum])
         {
-
             if ((GaugesCurrentPos[GaugesNum] + MoveTypePara) < DestPostion[GaugesNum])
             {
                 GaugesCurrentPos[GaugesNum] += MoveTypePara;

source/Application/APP/GaugesMode/GaugesInterface.c

@@ -5,7 +5,7 @@
  */
 #include "Common_Interface.h"
 
-#define Self_time  1250u
+#define Self_time   900u
 
 static const uint16_t GaugesDataInInit[GaugesTotal][3][25] =
 {

source/Application/APP/SEG_LCD/SEG_DISPLAY.c

@@ -8,6 +8,8 @@
 #include "Data_VehicleSpeed.h"
 #include "GaugesInterface.h"
 #include "Menu.h"
+#include "DisplaySch_user.h"
+#include "TYW_stdint.h"
 
 #define PRI_SEG_NUM_MAX 17U
 #define SEC_SEG_NUM_MAX 17U
@@ -1028,6 +1030,8 @@ Seg_Display_Service   在 20MS任务中
 void Seg_Display_Service(void)
 {
     uint32_t Ign_Time;
+    uint16_t m16_FrameCnt;
+
     Ign_Time = Common_GetIgnOnTime();
     if (Common_Get_IG_Sts() == COMMON_POWER_ON)
     {
@@ -1049,14 +1053,22 @@ void Seg_Display_Service(void)
             Seg_Digit_1_Disp(12);
             Seg_Digit_2_Disp(12);
             Seg_Digit_3_Disp(12);
+
+            GaugesTimer = 5u;
         }
         else
         {
             SEG_A25_Disp(7u); /*左侧弧线*/
             SEG_C25_Disp(7u); /*右侧弧线*/
 
-            if (Ign_Time < 3100)
+            if (Ign_Time < StartAnimationEnd)
             {
+                m16_FrameCnt = Common_GetHMI_StartAnimationFrameCnt();
+                m16_FrameCnt = m16_FrameCnt / 4u;
+
+                if (m16_FrameCnt >= FRAMECNTFLAG)
+                {
+
                     SEG_PRI_Display         (GetGaugesCurrentPos(PRIGasGauges), GUI_DISP_MODE_NORMAL, 7u);        /*PRI气压格*/
                     SEG_SEC_Display         (GetGaugesCurrentPos(SECGasGauges), GUI_DISP_MODE_NORMAL, 7u);        /*SEC气压格*/
                     SEG_Coolant_Display     (GetGaugesCurrentPos(TempGauges),   GUI_DISP_MODE_NORMAL, 7u);        /*水温格*/
@@ -1068,6 +1080,7 @@ void Seg_Display_Service(void)
                     Seg_Digit_1_Disp(12);
                     Seg_Digit_2_Disp(12);
                     Seg_Digit_3_Disp(12);
+                }
 
                 GaugesTimer = 5u;
             }

source/Application/Graphic/GUI/GUI.c

@@ -88,17 +88,16 @@ void GUI_Display_KL15_OFF_Init(void)
 void GUI_Display_background(void)
 {
     GUI_General_Display(WET_Sprite, ditu_2, GUI_BLENDMODE_CUSTOM);
-    //GUI_General_Display(WET_Sprite, isuzu_113, GUI_BLENDMODE_SRC_OVER);
 }
 /*开机动画*/
 void GUI_Display_Animation_Frame(uint16_t frame)
 {
-    if (frame >= 113u)
+    if (frame >= 112u)
     {
-        frame = 113u;
+        frame = 112u;
     }
 
-    GUI_General_Display(WET_Sprite, isuzu_000 + frame, GUI_BLENDMODE_SRC_OVER);
+    GUI_General_Display(WET_Sprite, isuzu_001 + frame, GUI_BLENDMODE_SRC_OVER);
 }
 void GUI_Display_Value_Init(void)
 {

source/Application/Graphic/GUI/GUI.h

@@ -17,7 +17,7 @@
 
 #define SystemSupplierECUHardwareVersionNumberApp ((uint16_t)(10201)) /*硬件版本号   HV:01.02.00*/
 #define SystemSupplierECUSoftwareInformationApp ((uint16_t)(10101))   /*软件版本号   SV:01.01.00*/
-#define systemSupplierECUFlashInformationApp ((uint16_t)(11))         /*FLASH版本号 FV:00.11*/
+#define systemSupplierECUFlashInformationApp ((uint16_t)(12))         /*FLASH版本号 FV:00.11*/
 
 typedef struct
 {

source/Application/Graphic/UE/DisplaySch_user.c

@@ -23,7 +23,7 @@ UE_CtrlInfo_Struct_t UE_CtrlInfo;
 uint8_t BG_display_flag;
 #pragma ghs section bss = default
 
-uint32_t HMI_StartAnimationFrameCnt;
+uint16_t HMI_StartAnimationFrameCnt;
 
 static void switch_branch(void);
 
@@ -242,11 +242,10 @@ void Display_StartAnimationService(void)
 
     HMI_StartAnimationFrameCnt++;
     m16_FrameCnt = HMI_StartAnimationFrameCnt;
-    if ((m16_FrameCnt % 3) == 0)
+
+    if ((m16_FrameCnt % 4) == 0u)
     {
-        //loc_Disable_Window_App();
-        GUI_Display_Animation_Frame(m16_FrameCnt / 3u);
-        //GUI_Display_background();
+        GUI_Display_Animation_Frame(m16_FrameCnt / 4u);
     }
 }
 void Display_StartAnimationExit(void)
@@ -261,6 +260,11 @@ void Display_StartAnimationExit(void)
     GUI_Display_background();
 }
 
+uint16_t Common_GetHMI_StartAnimationFrameCnt(void)
+{
+    return HMI_StartAnimationFrameCnt;
+}
+
 /*----菜单----*/
 void Display_MenuEnter (void)
 {

source/Application/Graphic/UE/DisplaySch_user.h

@@ -19,6 +19,8 @@
 #define FUNC_ENABLE          1u
 #define FUNC_DISABLE         0u
 
+#define FRAMECNTFLAG         64u
+
 typedef struct
 {
     uint8_t u8KEY_UP;
@@ -88,6 +90,6 @@ void HMI_Clear_KEY_MENU(void);
 void HMI_Clear_KEY_ODOTRIP(void);
 void Meter_Mode_conversion(void);
 
-
+uint16_t Common_GetHMI_StartAnimationFrameCnt(void);
 
 #endif

source/System/tasks.c

@@ -122,11 +122,19 @@ void Sys_Run_Mode_Pseudo_Real_Time_Tasks(void)
 ------------------------------------------------------------------------------*/
 void Sys_Run_Mode_2ms_Tasks(void)
 {
+    uint16_t m16_FrameCnt;
+
     UDS_KL15_init();
     Analog_Signal_Conv_Service();
     Sys_Status_Update_Service();
     Common_Input_Para();
+    m16_FrameCnt = Common_GetHMI_StartAnimationFrameCnt();
+    m16_FrameCnt = m16_FrameCnt / 4u;
+
+    if (m16_FrameCnt >= FRAMECNTFLAG)
+    {
         Gauges_Time_Xms_Count(2);
+    }
     UDS_10ms_Service();
 }
 /*============================================================================*/