Skip to content

V
VC66_7C
Commit bfa297ce authored by hu's avatar hu
Browse files
Options

调整开机动画显示

parent b4784644
Hide whitespace changes
Inline Side-by-side
Showing with 92 additions and 67 deletions
source/Application/APP/GaugesMode/Gauges.c
View file @ bfa297ce
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
#include "Gauges.h" #include "Gauges.h"
#include "GaugesInterface.h" #include "GaugesInterface.h"
#define GAUGES_TOTAL_NUM 9u #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 GaugesCurrentPos[GAUGES_TOTAL_NUM] ;
uint16_t BackupDestPostion[GAUGES_TOTAL_NUM]; uint16_t BackupDestPostion[GAUGES_TOTAL_NUM];
uint16_t GaugesDisPos[GAUGES_TOTAL_NUM]; uint16_t GaugesDisPos[GAUGES_TOTAL_NUM];
...@@ -27,7 +27,7 @@ uint16_t GaugesInitTimes; ...@@ -27,7 +27,7 @@ uint16_t GaugesInitTimes;
uint8_t GaugesPowerState = 0u; uint8_t GaugesPowerState = 0u;
uint16_t GaugesFreeSetTimes = 0u; uint16_t GaugesFreeSetTimes = 0u;
uint16_t GaugesLibDataIn; 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}; uint8_t ModeGaugesTestFlag[GAUGES_TOTAL_NUM] = {0u};
/*两套参数第一个是正常走行速度，第二个为快速走动8*/ /*两套参数第一个是正常走行速度，第二个为快速走动8*/
const uint16_t GaugesDisDelayMax[2u][IndicatTypeTOtal] = const uint16_t GaugesDisDelayMax[2u][IndicatTypeTOtal] =
...@@ -578,7 +578,6 @@ void SeftTest_GaugeMoveing(uint8_t GaugesNum) ...@@ -578,7 +578,6 @@ void SeftTest_GaugeMoveing(uint8_t GaugesNum)
{ {
if (GaugesInitTimes > GaugesStarMoveTimeMax[GaugesNum]) if (GaugesInitTimes > GaugesStarMoveTimeMax[GaugesNum])
{ {
if ((GaugesCurrentPos[GaugesNum] + MoveTypePara) < DestPostion[GaugesNum]) if ((GaugesCurrentPos[GaugesNum] + MoveTypePara) < DestPostion[GaugesNum])
{ {
GaugesCurrentPos[GaugesNum] += MoveTypePara; GaugesCurrentPos[GaugesNum] += MoveTypePara;
......
source/Application/APP/GaugesMode/GaugesInterface.c
View file @ bfa297ce
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
*/ */
#include "Common_Interface.h" #include "Common_Interface.h"
#define Self_time 1250u #define Self_time 900u
static const uint16_t GaugesDataInInit[GaugesTotal][3][25] = static const uint16_t GaugesDataInInit[GaugesTotal][3][25] =
{ {
......
source/Application/APP/SEG_LCD/SEG_DISPLAY.c
View file @ bfa297ce
...@@ -8,6 +8,8 @@ ...@@ -8,6 +8,8 @@
#include "Data_VehicleSpeed.h" #include "Data_VehicleSpeed.h"
#include "GaugesInterface.h" #include "GaugesInterface.h"
#include "Menu.h" #include "Menu.h"
#include "DisplaySch_user.h"
#include "TYW_stdint.h"
#define PRI_SEG_NUM_MAX 17U #define PRI_SEG_NUM_MAX 17U
#define SEC_SEG_NUM_MAX 17U #define SEC_SEG_NUM_MAX 17U
...@@ -1028,6 +1030,8 @@ Seg_Display_Service 在 20MS任务中 ...@@ -1028,6 +1030,8 @@ Seg_Display_Service 在 20MS任务中
void Seg_Display_Service(void) void Seg_Display_Service(void)
{ {
uint32_t Ign_Time; uint32_t Ign_Time;
uint16_t m16_FrameCnt;
Ign_Time = Common_GetIgnOnTime(); Ign_Time = Common_GetIgnOnTime();
if (Common_Get_IG_Sts() == COMMON_POWER_ON) if (Common_Get_IG_Sts() == COMMON_POWER_ON)
{ {
...@@ -1049,25 +1053,34 @@ void Seg_Display_Service(void) ...@@ -1049,25 +1053,34 @@ void Seg_Display_Service(void)
Seg_Digit_1_Disp(12); Seg_Digit_1_Disp(12);
Seg_Digit_2_Disp(12); Seg_Digit_2_Disp(12);
Seg_Digit_3_Disp(12); Seg_Digit_3_Disp(12);
GaugesTimer = 5u;
} }
else else
{ {
SEG_A25_Disp(7u); /*左侧弧线*/ SEG_A25_Disp(7u); /*左侧弧线*/
SEG_C25_Disp(7u); /*右侧弧线*/ SEG_C25_Disp(7u); /*右侧弧线*/
if (Ign_Time < 3100) if (Ign_Time < StartAnimationEnd)
{ {
SEG_PRI_Display (GetGaugesCurrentPos(PRIGasGauges), GUI_DISP_MODE_NORMAL, 7u); /*PRI气压格*/ m16_FrameCnt = Common_GetHMI_StartAnimationFrameCnt();
SEG_SEC_Display (GetGaugesCurrentPos(SECGasGauges), GUI_DISP_MODE_NORMAL, 7u); /*SEC气压格*/ m16_FrameCnt = m16_FrameCnt / 4u;
SEG_Coolant_Display (GetGaugesCurrentPos(TempGauges), GUI_DISP_MODE_NORMAL, 7u); /*水温格*/
SEG_Fuel_Display (GetGaugesCurrentPos(TempGauges), GUI_DISP_MODE_NORMAL, 7u); /*燃油格*/ if (m16_FrameCnt >= FRAMECNTFLAG)
SEG_Tacho_Display (GetGaugesCurrentPos(RevGauges), GUI_DISP_MODE_NORMAL, 7u); /*转速格*/ {
SEG_VehicleSpeed_Display(GetGaugesCurrentPos(VehGauges), GUI_DISP_MODE_NORMAL, 7u); /*车速格*/
SEG_PRI_Display (GetGaugesCurrentPos(PRIGasGauges), GUI_DISP_MODE_NORMAL, 7u); /*PRI气压格*/
/*车速数字 暂时没有变化，只是全部点亮*/ SEG_SEC_Display (GetGaugesCurrentPos(SECGasGauges), GUI_DISP_MODE_NORMAL, 7u); /*SEC气压格*/
Seg_Digit_1_Disp(12); SEG_Coolant_Display (GetGaugesCurrentPos(TempGauges), GUI_DISP_MODE_NORMAL, 7u); /*水温格*/
Seg_Digit_2_Disp(12); SEG_Fuel_Display (GetGaugesCurrentPos(TempGauges), GUI_DISP_MODE_NORMAL, 7u); /*燃油格*/
Seg_Digit_3_Disp(12); SEG_Tacho_Display (GetGaugesCurrentPos(RevGauges), GUI_DISP_MODE_NORMAL, 7u); /*转速格*/
SEG_VehicleSpeed_Display(GetGaugesCurrentPos(VehGauges), GUI_DISP_MODE_NORMAL, 7u); /*车速格*/
/*车速数字 暂时没有变化，只是全部点亮*/
Seg_Digit_1_Disp(12);
Seg_Digit_2_Disp(12);
Seg_Digit_3_Disp(12);
}
GaugesTimer = 5u; GaugesTimer = 5u;
} }
......
source/Application/APP/Telltales/Telltales_user.c
View file @ bfa297ce
...@@ -24,45 +24,45 @@ TelltaleLRCtrlStruct TelltaleLRCtrl; ...@@ -24,45 +24,45 @@ TelltaleLRCtrlStruct TelltaleLRCtrl;
const LED_Attribute_st LED_Attribute[LED_Max] = const LED_Attribute_st LED_Attribute[LED_Max] =
{ {
/* 指示灯索引 是否自检 外部信号自检 工作电源状态 自检开始时间 自检持续时间 指示灯点亮条件 指示灯执行函数 */ /* 指示灯索引 是否自检 外部信号自检 工作电源状态 自检开始时间 自检持续时间 指示灯点亮条件 指示灯执行函数 */
{ em_LED_INTER_DIFF_LOCK_T , NoSelfCheck , ExterNalCheck , LED_IGN_ON_OFF , 0u, 3000ul, LED_INTER_DIFF_LOCK_T_Judgement , LED_INTER_DIFF_LOCK_T_Execution }, { em_LED_INTER_DIFF_LOCK_T , NoSelfCheck , ExterNalCheck , LED_IGN_ON_OFF , 2500u, 4500ul, LED_INTER_DIFF_LOCK_T_Judgement , LED_INTER_DIFF_LOCK_T_Execution },
{ em_LED_FOUR_MUL_FOUR_T , NoSelfCheck , NoExterNalCheck , LED_IGN_ON , 0u, 3000ul, LED_FOUR_MUL_FOUR_T_Judgement , LED_FOUR_MUL_FOUR_T_Execution }, { em_LED_FOUR_MUL_FOUR_T , NoSelfCheck , NoExterNalCheck , LED_IGN_ON , 2500u, 4500ul, LED_FOUR_MUL_FOUR_T_Judgement , LED_FOUR_MUL_FOUR_T_Execution },
{ em_LED_EXH_BRAKE_T , NoSelfCheck , NoExterNalCheck , LED_IGN_ON , 0u, 3000ul, LED_EXH_BRAKE_T_Judgement , LED_EXH_BRAKE_T_Execution }, { em_LED_EXH_BRAKE_T , NoSelfCheck , NoExterNalCheck , LED_IGN_ON , 2500u, 4500ul, LED_EXH_BRAKE_T_Judgement , LED_EXH_BRAKE_T_Execution },
{ em_LED_QOS_GLOW_T , SelfCheck , NoExterNalCheck , LED_IGN_ON , 0u, 3000ul, LED_QOS_GLOW_T_Judgement , LED_QOS_GLOW_T_Execution }, { em_LED_QOS_GLOW_T , SelfCheck , NoExterNalCheck , LED_IGN_ON , 2500u, 4500ul, LED_QOS_GLOW_T_Judgement , LED_QOS_GLOW_T_Execution },
{ em_LED_HI_BEAM_T , NoSelfCheck , NoExterNalCheck , LED_IGN_ON , 0u, 3000ul, LED_HI_BEAM_T_Judgement , LED_HI_BEAM_T_Execution }, { em_LED_HI_BEAM_T , NoSelfCheck , NoExterNalCheck , LED_IGN_ON , 2500u, 4500ul, LED_HI_BEAM_T_Judgement , LED_HI_BEAM_T_Execution },
{ em_LED_Rr_FOG_LAMP_T , NoSelfCheck , NoExterNalCheck , LED_IGN_ON , 0u, 3000ul, LED_Rr_FOG_LAMP_T_Judgement , LED_Rr_FOG_LAMP_T_Execution }, { em_LED_Rr_FOG_LAMP_T , NoSelfCheck , NoExterNalCheck , LED_IGN_ON , 2500u, 4500ul, LED_Rr_FOG_LAMP_T_Judgement , LED_Rr_FOG_LAMP_T_Execution },
{ em_LED_MIL_T , SelfCheck , NoExterNalCheck , LED_IGN_ON , 0u, 3000ul, LED_MIL_T_Judgement , LED_MIL_T_Execution }, { em_LED_MIL_T , SelfCheck , NoExterNalCheck , LED_IGN_ON , 2500u, 4500ul, LED_MIL_T_Judgement , LED_MIL_T_Execution },
{ em_LED_SVS_T , SelfCheck , NoExterNalCheck , LED_IGN_ON , 0u, 3000ul, LED_SVS_T_Judgement , LED_SVS_T_Execution }, { em_LED_SVS_T , SelfCheck , NoExterNalCheck , LED_IGN_ON , 2500u, 4500ul, LED_SVS_T_Judgement , LED_SVS_T_Execution },
{ em_LED_H_S_A__T , NoSelfCheck , NoExterNalCheck , LED_IGN_ON , 0u, 3000ul, LED_H_S_A_T_Judgement , LED_H_S_A_T_Execution }, { em_LED_H_S_A__T , NoSelfCheck , NoExterNalCheck , LED_IGN_ON , 2500u, 4500ul, LED_H_S_A_T_Judgement , LED_H_S_A_T_Execution },
{ em_LED_RETARDER_T , SelfCheck , NoExterNalCheck , LED_IGN_ON , 0u, 3000ul, LED_RETARDER_T_Judgement , LED_RETARDER_T_Execution }, { em_LED_RETARDER_T , SelfCheck , NoExterNalCheck , LED_IGN_ON , 2500u, 4500ul, LED_RETARDER_T_Judgement , LED_RETARDER_T_Execution },
{ em_LED_AUTO_LEVELING_T , NoSelfCheck , NoExterNalCheck , LED_IGN_ON , 0u, 3000ul, LED_AUTO_LEVELING_T_Judgement , LED_AUTO_LEVELING_T_Execution }, { em_LED_AUTO_LEVELING_T , NoSelfCheck , NoExterNalCheck , LED_IGN_ON , 2500u, 4500ul, LED_AUTO_LEVELING_T_Judgement , LED_AUTO_LEVELING_T_Execution },
{ em_LED_ROWS_L , NoSelfCheck , NoExterNalCheck , LED_IGN_ON , 0u, 3000ul, LED_ROWS_L_Judgement , LED_ROWS_L_Execution }, { em_LED_ROWS_L , NoSelfCheck , NoExterNalCheck , LED_IGN_ON , 2500u, 4500ul, LED_ROWS_L_Judgement , LED_ROWS_L_Execution },
{ em_LED_BSM_OFF_L , NoSelfCheck , NoExterNalCheck , LED_IGN_ON , 0u, 3000ul, LED_BSM_OFF_L_Judgement , LED_BSM_OFF_L_Execution }, { em_LED_BSM_OFF_L , NoSelfCheck , NoExterNalCheck , LED_IGN_ON , 2500u, 4500ul, LED_BSM_OFF_L_Judgement , LED_BSM_OFF_L_Execution },
{ em_LED_AEBS_OFF_L , NoSelfCheck , NoExterNalCheck , LED_IGN_ON , 0u, 3000ul, LED_AEBS_OFF_L_Judgement , LED_AEBS_OFF_L_Execution }, { em_LED_AEBS_OFF_L , NoSelfCheck , NoExterNalCheck , LED_IGN_ON , 2500u, 4500ul, LED_AEBS_OFF_L_Judgement , LED_AEBS_OFF_L_Execution },
{ em_LED_LDWS_L , NoSelfCheck , NoExterNalCheck , LED_IGN_ON , 0u, 3000ul, LED_LDWS_L_Judgement , LED_LDWS_L_Execution }, { em_LED_LDWS_L , NoSelfCheck , NoExterNalCheck , LED_IGN_ON , 2500u, 4500ul, LED_LDWS_L_Judgement , LED_LDWS_L_Execution },
{ em_LED_SRS_L , NoSelfCheck , NoExterNalCheck , LED_IGN_ON , 0u, 3000ul, LED_SRS_L_Judgement , LED_SRS_L_Execution }, { em_LED_SRS_L , NoSelfCheck , NoExterNalCheck , LED_IGN_ON , 2500u, 4500ul, LED_SRS_L_Judgement , LED_SRS_L_Execution },
{ em_LED_ENG_OIL_L , SelfCheck , NoExterNalCheck , LED_IGN_ON , 0u, 3000ul, LED_ENG_OIL_L_Judgement , LED_ENG_OIL_L_Execution }, { em_LED_ENG_OIL_L , SelfCheck , NoExterNalCheck , LED_IGN_ON , 2500u, 4500ul, LED_ENG_OIL_L_Judgement , LED_ENG_OIL_L_Execution },
{ em_LED_CHARG_L , SelfCheck , NoExterNalCheck , LED_IGN_ON , 0u, 3000ul, LED_CHARG_L_Judgement , LED_CHARG_L_Execution }, { em_LED_CHARG_L , SelfCheck , NoExterNalCheck , LED_IGN_ON , 2500u, 4500ul, LED_CHARG_L_Judgement , LED_CHARG_L_Execution },
{ em_LED_SEAT_BELT_L , SelfCheck , NoExterNalCheck , LED_IGN_ON , 0u, 3000ul, LED_SEAT_BELT_L_Judgement , LED_SEAT_BELT_L_Execution }, { em_LED_SEAT_BELT_L , SelfCheck , NoExterNalCheck , LED_IGN_ON , 2500u, 4500ul, LED_SEAT_BELT_L_Judgement , LED_SEAT_BELT_L_Execution },
{ em_LED_RR_DIFF_LOCK_L , SelfCheck , NoExterNalCheck , LED_IGN_ON , 0u, 3000ul, LED_RR_DIFF_LOCK_L_Judgement , LED_RR_DIFF_LOCK_L_Execution }, { em_LED_RR_DIFF_LOCK_L , SelfCheck , NoExterNalCheck , LED_IGN_ON , 2500u, 4500ul, LED_RR_DIFF_LOCK_L_Judgement , LED_RR_DIFF_LOCK_L_Execution },
{ em_LED_TPMS_L , SelfCheck , NoExterNalCheck , LED_IGN_ON , 0u, 3000ul, LED_TPMS_L_Judgement , LED_TPMS_L_Execution }, { em_LED_TPMS_L , SelfCheck , NoExterNalCheck , LED_IGN_ON , 2500u, 4500ul, LED_TPMS_L_Judgement , LED_TPMS_L_Execution },
{ em_LED_ASR_or_EVSC_OFF_L , NoSelfCheck , NoExterNalCheck , LED_IGN_ON , 0u, 3000ul, LED_ASR_or_EVSC_OFF_L_Judgement , LED_ASR_or_EVSC_OFF_L_Execution }, { em_LED_ASR_or_EVSC_OFF_L , NoSelfCheck , NoExterNalCheck , LED_IGN_ON , 2500u, 4500ul, LED_ASR_or_EVSC_OFF_L_Judgement , LED_ASR_or_EVSC_OFF_L_Execution },
{ em_LED_EVSC_L , NoSelfCheck , NoExterNalCheck , LED_IGN_ON , 0u, 3000ul, LED_EVSC_L_Judgement , LED_EVSC_L_Execution }, { em_LED_EVSC_L , NoSelfCheck , NoExterNalCheck , LED_IGN_ON , 2500u, 4500ul, LED_EVSC_L_Judgement , LED_EVSC_L_Execution },
{ em_LED_eco_stop_OFF_L , NoSelfCheck , NoExterNalCheck , LED_IGN_ON , 0u, 3000ul, LED_eco_stop_OFF_L_Judgement , LED_eco_stop_OFF_L_Execution }, { em_LED_eco_stop_OFF_L , NoSelfCheck , NoExterNalCheck , LED_IGN_ON , 2500u, 4500ul, LED_eco_stop_OFF_L_Judgement , LED_eco_stop_OFF_L_Execution },
{ em_LED_AMT_L , NoSelfCheck , NoExterNalCheck , LED_IGN_ON , 0u, 3000ul, LED_AMT_L_Judgement , LED_AMT_L_Execution }, { em_LED_AMT_L , NoSelfCheck , NoExterNalCheck , LED_IGN_ON , 2500u, 4500ul, LED_AMT_L_Judgement , LED_AMT_L_Execution },
{ em_LED_WEAR_IND_L , NoSelfCheck , NoExterNalCheck , LED_IGN_ON , 0u, 3000ul, LED_WEAR_IND_L_Judgement , LED_WEAR_IND_L_Execution }, { em_LED_WEAR_IND_L , NoSelfCheck , NoExterNalCheck , LED_IGN_ON , 2500u, 4500ul, LED_WEAR_IND_L_Judgement , LED_WEAR_IND_L_Execution },
{ em_LED_TRAILER_BRAKE_R , SelfCheck , NoExterNalCheck , LED_IGN_ON , 0u, 3000ul, LED_TRAILER_BRAKE_R_Judgement , LED_TRAILER_BRAKE_R_Execution }, { em_LED_TRAILER_BRAKE_R , SelfCheck , NoExterNalCheck , LED_IGN_ON , 2500u, 4500ul, LED_TRAILER_BRAKE_R_Judgement , LED_TRAILER_BRAKE_R_Execution },
{ em_LED_BRAKE_AIR_or_EBS_YELLOW_R , NoSelfCheck , NoExterNalCheck , LED_IGN_ON , 0u, 3000ul, LED_BRAKE_AIR_or_EBS_YELLOW_R_Judgement , LED_BRAKE_AIR_or_EBS_YELLOW_R_Execution }, { em_LED_BRAKE_AIR_or_EBS_YELLOW_R , NoSelfCheck , NoExterNalCheck , LED_IGN_ON , 2500u, 4500ul, LED_BRAKE_AIR_or_EBS_YELLOW_R_Judgement , LED_BRAKE_AIR_or_EBS_YELLOW_R_Execution },
{ em_LED_ACC_AIR_R , NoSelfCheck , NoExterNalCheck , LED_IGN_ON , 0u, 3000ul, LED_ACC_AIR_R_Judgement , LED_ACC_AIR_R_Execution }, { em_LED_ACC_AIR_R , NoSelfCheck , NoExterNalCheck , LED_IGN_ON , 2500u, 4500ul, LED_ACC_AIR_R_Judgement , LED_ACC_AIR_R_Execution },
{ em_LED_ABS_R , SelfCheck , NoExterNalCheck , LED_IGN_ON , 0u, 3000ul, LED_ABS_R_Judgement , LED_ABS_R_Execution }, { em_LED_ABS_R , SelfCheck , NoExterNalCheck , LED_IGN_ON , 2500u, 4500ul, LED_ABS_R_Judgement , LED_ABS_R_Execution },
{ em_LED_PARK_BRAKE_R , SelfCheck , NoExterNalCheck , LED_IGN_ON , 0u, 3000ul, LED_PARK_BRAKE_R_Judgement , LED_PARK_BRAKE_R_Execution }, { em_LED_PARK_BRAKE_R , SelfCheck , NoExterNalCheck , LED_IGN_ON , 2500u, 4500ul, LED_PARK_BRAKE_R_Judgement , LED_PARK_BRAKE_R_Execution },
{ em_LED_BRAKE_AIR_or_EBS_RED_R , NoSelfCheck , NoExterNalCheck , LED_IGN_ON , 0u, 3000ul, LED_BRAKE_AIR_or_EBS_RED_R_Judgement , LED_BRAKE_AIR_or_EBS_RED_R_Execution }, { em_LED_BRAKE_AIR_or_EBS_RED_R , NoSelfCheck , NoExterNalCheck , LED_IGN_ON , 2500u, 4500ul, LED_BRAKE_AIR_or_EBS_RED_R_Judgement , LED_BRAKE_AIR_or_EBS_RED_R_Execution },
{ em_LED_BRAKE_LOCK_R , NoSelfCheck , NoExterNalCheck , LED_IGN_ON , 0u, 3000ul, LED_BRAKE_LOCK_R_Judgement , LED_BRAKE_LOCK_R_Execution }, { em_LED_BRAKE_LOCK_R , NoSelfCheck , NoExterNalCheck , LED_IGN_ON , 2500u, 4500ul, LED_BRAKE_LOCK_R_Judgement , LED_BRAKE_LOCK_R_Execution },
{ em_LED_AIR_SUS_R , SelfCheck , NoExterNalCheck , LED_IGN_ON , 0u, 3000ul, LED_AIR_SUS_R_Judgement , LED_AIR_SUS_R_Execution }, { em_LED_AIR_SUS_R , SelfCheck , NoExterNalCheck , LED_IGN_ON , 2500u, 4500ul, LED_AIR_SUS_R_Judgement , LED_AIR_SUS_R_Execution },
{ em_LED_TRAILER_ABS_U , SelfCheck , NoExterNalCheck , LED_IGN_ON , 0u, 3000ul, LED_TRAILER_ABS_U_Judgement , LED_TRAILER_ABS_U_Execution }, { em_LED_TRAILER_ABS_U , SelfCheck , NoExterNalCheck , LED_IGN_ON , 2500u, 4500ul, LED_TRAILER_ABS_U_Judgement , LED_TRAILER_ABS_U_Execution },
{ em_LED_WORKING_LAMP_U , NoSelfCheck , NoExterNalCheck , LED_IGN_ON , 0u, 3000ul, LED_WORKING_LAMP_U_Judgement , LED_WORKING_LAMP_U_Execution }, { em_LED_WORKING_LAMP_U , NoSelfCheck , NoExterNalCheck , LED_IGN_ON , 2500u, 4500ul, LED_WORKING_LAMP_U_Judgement , LED_WORKING_LAMP_U_Execution },
{ em_LED_TRAILER_ABS_INFO_U , NoSelfCheck , NoExterNalCheck , LED_IGN_ON , 0u, 3000ul, LED_TRAILER_ABS_INFO_U_Judgement , LED_TRAILER_ABS_INFO_U_Execution }, { em_LED_TRAILER_ABS_INFO_U , NoSelfCheck , NoExterNalCheck , LED_IGN_ON , 2500u, 4500ul, LED_TRAILER_ABS_INFO_U_Judgement , LED_TRAILER_ABS_INFO_U_Execution },
{ em_LED_TEMP , NoSelfCheck , NoExterNalCheck , LED_IGN_ON , 0u, 3000ul, LED_Temp_Judgement , LED_Temp_Execution }, { em_LED_TEMP , NoSelfCheck , NoExterNalCheck , LED_IGN_ON , 2500u, 4500ul, LED_Temp_Judgement , LED_Temp_Execution },
{ em_LED_FUEL , NoSelfCheck , NoExterNalCheck , LED_IGN_ON , 0u, 3000ul, LED_Fuel_Judgement , LED_Fuel_Execution }, { em_LED_FUEL , NoSelfCheck , NoExterNalCheck , LED_IGN_ON , 2500u, 4500ul, LED_Fuel_Judgement , LED_Fuel_Execution },
}; };
/*must put into 10ms task*/ /*must put into 10ms task*/
......
source/Application/Graphic/GUI/GUI.c
View file @ bfa297ce
...@@ -88,17 +88,16 @@ void GUI_Display_KL15_OFF_Init(void) ...@@ -88,17 +88,16 @@ void GUI_Display_KL15_OFF_Init(void)
void GUI_Display_background(void) void GUI_Display_background(void)
{ {
GUI_General_Display(WET_Sprite, ditu_2, GUI_BLENDMODE_CUSTOM); 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) 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) void GUI_Display_Value_Init(void)
{ {
......
source/Application/Graphic/GUI/GUI.h
View file @ bfa297ce
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
#define SystemSupplierECUHardwareVersionNumberApp ((uint16_t)(10201)) /*硬件版本号 HV:01.02.00*/ #define SystemSupplierECUHardwareVersionNumberApp ((uint16_t)(10201)) /*硬件版本号 HV:01.02.00*/
#define SystemSupplierECUSoftwareInformationApp ((uint16_t)(10101)) /*软件版本号 SV:01.01.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 typedef struct
{ {
......
source/Application/Graphic/UE/DisplaySch_user.c
View file @ bfa297ce
...@@ -23,7 +23,7 @@ UE_CtrlInfo_Struct_t UE_CtrlInfo; ...@@ -23,7 +23,7 @@ UE_CtrlInfo_Struct_t UE_CtrlInfo;
uint8_t BG_display_flag; uint8_t BG_display_flag;
#pragma ghs section bss = default #pragma ghs section bss = default
uint32_t HMI_StartAnimationFrameCnt; uint16_t HMI_StartAnimationFrameCnt;
static void switch_branch(void); static void switch_branch(void);
...@@ -242,11 +242,10 @@ void Display_StartAnimationService(void) ...@@ -242,11 +242,10 @@ void Display_StartAnimationService(void)
HMI_StartAnimationFrameCnt++; HMI_StartAnimationFrameCnt++;
m16_FrameCnt = 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 / 4u);
GUI_Display_Animation_Frame(m16_FrameCnt / 3u);
//GUI_Display_background();
} }
} }
void Display_StartAnimationExit(void) void Display_StartAnimationExit(void)
...@@ -261,6 +260,11 @@ void Display_StartAnimationExit(void) ...@@ -261,6 +260,11 @@ void Display_StartAnimationExit(void)
GUI_Display_background(); GUI_Display_background();
} }
uint16_t Common_GetHMI_StartAnimationFrameCnt(void)
{
return HMI_StartAnimationFrameCnt;
}
/*----菜单----*/ /*----菜单----*/
void Display_MenuEnter (void) void Display_MenuEnter (void)
{ {
......
source/Application/Graphic/UE/DisplaySch_user.h
View file @ bfa297ce
...@@ -19,6 +19,8 @@ ...@@ -19,6 +19,8 @@
#define FUNC_ENABLE 1u #define FUNC_ENABLE 1u
#define FUNC_DISABLE 0u #define FUNC_DISABLE 0u
#define FRAMECNTFLAG 64u
typedef struct typedef struct
{ {
uint8_t u8KEY_UP; uint8_t u8KEY_UP;
...@@ -88,6 +90,6 @@ void HMI_Clear_KEY_MENU(void); ...@@ -88,6 +90,6 @@ void HMI_Clear_KEY_MENU(void);
void HMI_Clear_KEY_ODOTRIP(void); void HMI_Clear_KEY_ODOTRIP(void);
void Meter_Mode_conversion(void); void Meter_Mode_conversion(void);
uint16_t Common_GetHMI_StartAnimationFrameCnt(void);
#endif #endif
source/System/tasks.c
View file @ bfa297ce
...@@ -122,11 +122,19 @@ void Sys_Run_Mode_Pseudo_Real_Time_Tasks(void) ...@@ -122,11 +122,19 @@ void Sys_Run_Mode_Pseudo_Real_Time_Tasks(void)
------------------------------------------------------------------------------*/ ------------------------------------------------------------------------------*/
void Sys_Run_Mode_2ms_Tasks(void) void Sys_Run_Mode_2ms_Tasks(void)
{ {
uint16_t m16_FrameCnt;
UDS_KL15_init(); UDS_KL15_init();
Analog_Signal_Conv_Service(); Analog_Signal_Conv_Service();
Sys_Status_Update_Service(); Sys_Status_Update_Service();
Common_Input_Para(); Common_Input_Para();
Gauges_Time_Xms_Count(2); m16_FrameCnt = Common_GetHMI_StartAnimationFrameCnt();
m16_FrameCnt = m16_FrameCnt / 4u;
if (m16_FrameCnt >= FRAMECNTFLAG)
{
Gauges_Time_Xms_Count(2);
}
UDS_10ms_Service(); UDS_10ms_Service();
} }
/*============================================================================*/ /*============================================================================*/
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment