Skip to content

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

调整值为位置

parent 3d26f834
Show whitespace changes
Inline Side-by-side
Showing with 161 additions and 34 deletions
source/Application/APP/Data_ODO/Services_ODO_user.c
View file @ 3b638d27
...@@ -153,7 +153,7 @@ void TYW_Data_ODO_Clear(void) ...@@ -153,7 +153,7 @@ void TYW_Data_ODO_Clear(void)
Get_Data_Rev_value = GetGaugesCurrentPos(RevGauges) ; Get_Data_Rev_value = GetGaugesCurrentPos(RevGauges) ;
Get_Data_Rev_valueMax = GetGaugesMaxOutVal(RevGauges) ; Get_Data_Rev_valueMax = GetGaugesMaxOutVal(RevGauges) ;
//if (( Get_Data_Veh_value >= Get_Data_Veh_valueMax ) && ( Get_Data_Rev_value >= Get_Data_Rev_valueMax )) if (( Get_Data_Veh_value >= Get_Data_Veh_valueMax ) && ( Get_Data_Rev_value >= Get_Data_Rev_valueMax ))
{ {
Data_Mileage_Clear(); Data_Mileage_Clear();
} }
......
source/Application/APP/SEG_LCD/SEG_DISPLAY.c
View file @ 3b638d27
...@@ -1223,7 +1223,7 @@ void Gui_Display_Test(void) ...@@ -1223,7 +1223,7 @@ void Gui_Display_Test(void)
Get_Data_Rev_value = GetGaugesCurrentPos(RevGauges) ; Get_Data_Rev_value = GetGaugesCurrentPos(RevGauges) ;
Get_Data_Rev_valueMax = GetGaugesMaxOutVal(RevGauges) ; Get_Data_Rev_valueMax = GetGaugesMaxOutVal(RevGauges) ;
//if (( Get_Data_Veh_value >= Get_Data_Veh_valueMax ) && ( Get_Data_Rev_value >= Get_Data_Rev_valueMax )) if (( Get_Data_Veh_value >= Get_Data_Veh_valueMax ) && ( Get_Data_Rev_value >= Get_Data_Rev_valueMax ))
{ {
while (1) while (1)
{ {
...@@ -1295,6 +1295,10 @@ void Gui_Display_Test(void) ...@@ -1295,6 +1295,10 @@ void Gui_Display_Test(void)
} }
} }
} }
else
{
BackOdoFlagSta = 0;
}
} }
uint8_t aaa = 0; uint8_t aaa = 0;
...@@ -1302,7 +1306,21 @@ extern uint8_t BackOdoFlagSta ; ...@@ -1302,7 +1306,21 @@ extern uint8_t BackOdoFlagSta ;
void Gui_9810_Test(void) void Gui_9810_Test(void)
{ {
static uint8_t Time = 0; static uint8_t Time = 0;
uint16_t Get_Data_Veh_value = 0u ;
uint16_t Get_Data_Rev_value = 0u ;
uint16_t Get_Data_Veh_valueMax = 0u;
uint16_t Get_Data_Rev_valueMax = 0u;
uint32_t TmpRet = 0;
/*获取的是步数，与当前步数*/
Get_Data_Veh_value = GetGaugesCurrentPos(VehGauges) ;
Get_Data_Veh_valueMax = GetGaugesMaxOutVal(VehGauges) ;
Get_Data_Rev_value = GetGaugesCurrentPos(RevGauges) ;
Get_Data_Rev_valueMax = GetGaugesMaxOutVal(RevGauges) ;
if (( Get_Data_Veh_value >= Get_Data_Veh_valueMax ) && ( Get_Data_Rev_value >= Get_Data_Rev_valueMax ))
{
if (Time == 0) if (Time == 0)
{ {
Time = 100; Time = 100;
...@@ -1339,4 +1357,5 @@ void Gui_9810_Test(void) ...@@ -1339,4 +1357,5 @@ void Gui_9810_Test(void)
{ {
Time --; Time --;
} }
}
} }
\ No newline at end of file
source/Application/APP/Telltales/Telltales.h
View file @ 3b638d27
...@@ -91,6 +91,7 @@ void Telltales_Left_Right_Management_Service(void); /*must put into 10ms task*/ ...@@ -91,6 +91,7 @@ void Telltales_Left_Right_Management_Service(void); /*must put into 10ms task*/
void Telltales_IG_ON_Work(void); void Telltales_IG_ON_Work(void);
void Telltales_IGOFF_Work(void); void Telltales_IGOFF_Work(void);
void Test_LED_AllLight(void); void Test_LED_AllLight(void);
void Test_LED_AllLightALL(void);
void Telltales_Wakeup_Init(void); void Telltales_Wakeup_Init(void);
void Telltales_KL30_Init(void); void Telltales_KL30_Init(void);
......
source/Application/APP/Telltales/Telltales_user.c
View file @ 3b638d27
...@@ -180,6 +180,111 @@ void Test_LED_AllLight(void) ...@@ -180,6 +180,111 @@ void Test_LED_AllLight(void)
} }
} }
void Test_LED_AllLightALL(void)
{
uint16_t Get_Data_Veh_value = 0u ;
uint16_t Get_Data_Rev_value = 0u ;
uint16_t Get_Data_Veh_valueMax = 0u;
uint16_t Get_Data_Rev_valueMax = 0u;
COMMON_PowerStatus_t u8IG_st;
u8IG_st = Common_Get_IG_Sts();
Get_Data_Veh_value = GetGaugesCurrentPos(VehGauges) ;
Get_Data_Veh_valueMax = GetGaugesMaxOutVal(VehGauges) ;
Get_Data_Rev_value = GetGaugesCurrentPos(RevGauges) ;
Get_Data_Rev_valueMax = GetGaugesMaxOutVal(RevGauges) ;
if (( Get_Data_Veh_value >= Get_Data_Veh_valueMax ) && ( Get_Data_Rev_value >= Get_Data_Rev_valueMax ))
{
if (u8IG_st == COMMON_POWER_ON)
{
LED_Left_Right_Execution(LED_ON_State);
LED_INTER_DIFF_LOCK_T_Execution(LED_ON_State);
LED_FOUR_MUL_FOUR_T_Execution(LED_ON_State);
LED_EXH_BRAKE_T_Execution(LED_ON_State);
LED_QOS_GLOW_T_Execution(LED_ON_State);
LED_HI_BEAM_T_Execution(LED_ON_State);
LED_Rr_FOG_LAMP_T_Execution(LED_ON_State);
LED_MIL_T_Execution(LED_ON_State);
LED_SVS_T_Execution(LED_ON_State);
LED_H_S_A_T_Execution(LED_ON_State);
LED_RETARDER_T_Execution(LED_ON_State);
LED_AUTO_LEVELING_T_Execution(LED_ON_State);
LED_ROWS_L_Execution(LED_ON_State);
LED_BSM_OFF_L_Execution(LED_ON_State);
LED_AEBS_OFF_L_Execution(LED_ON_State);
LED_LDWS_L_Execution(LED_ON_State);
LED_SRS_L_Execution(LED_ON_State);
LED_ENG_OIL_L_Execution(LED_ON_State);
LED_CHARG_L_Execution(LED_ON_State);
LED_SEAT_BELT_L_Execution(LED_ON_State);
//LED_RR_DIFF_LOCK_L_Execution(LED_ON_State);
LED_TPMS_L_Execution(LED_ON_State);
LED_ASR_or_EVSC_OFF_L_Execution(LED_ON_State);
LED_EVSC_L_Execution(LED_ON_State);
LED_eco_stop_OFF_L_Execution(LED_ON_State);
LED_AMT_L_Execution(LED_ON_State);
LED_WEAR_IND_L_Execution(LED_ON_State);
LED_TRAILER_BRAKE_R_Execution(LED_ON_State);
LED_BRAKE_AIR_or_EBS_YELLOW_R_Execution(LED_ON_State);
LED_ACC_AIR_R_Execution(LED_ON_State);
LED_ABS_R_Execution(LED_ON_State);
LED_PARK_BRAKE_R_Execution(LED_ON_State);
LED_BRAKE_AIR_or_EBS_RED_R_Execution(LED_ON_State);
LED_BRAKE_LOCK_R_Execution(LED_ON_State);
LED_AIR_SUS_R_Execution(LED_ON_State);
LED_TRAILER_ABS_U_Execution(LED_ON_State);
LED_WORKING_LAMP_U_Execution(LED_ON_State);
LED_TRAILER_ABS_INFO_U_Execution(LED_ON_State);
LED_Temp_Execution(LED_ON_State);
LED_Fuel_Execution(LED_ON_State);
}
else
{
LED_Left_Right_Execution(LED_OFF_State);
LED_INTER_DIFF_LOCK_T_Execution(LED_OFF_State);
LED_FOUR_MUL_FOUR_T_Execution(LED_OFF_State);
LED_EXH_BRAKE_T_Execution(LED_OFF_State);
LED_QOS_GLOW_T_Execution(LED_OFF_State);
LED_HI_BEAM_T_Execution(LED_OFF_State);
LED_Rr_FOG_LAMP_T_Execution(LED_OFF_State);
LED_MIL_T_Execution(LED_OFF_State);
LED_SVS_T_Execution(LED_OFF_State);
LED_H_S_A_T_Execution(LED_OFF_State);
LED_RETARDER_T_Execution(LED_OFF_State);
LED_AUTO_LEVELING_T_Execution(LED_OFF_State);
LED_ROWS_L_Execution(LED_OFF_State);
LED_BSM_OFF_L_Execution(LED_OFF_State);
LED_AEBS_OFF_L_Execution(LED_OFF_State);
LED_LDWS_L_Execution(LED_OFF_State);
LED_SRS_L_Execution(LED_OFF_State);
LED_ENG_OIL_L_Execution(LED_OFF_State);
LED_CHARG_L_Execution(LED_OFF_State);
LED_SEAT_BELT_L_Execution(LED_OFF_State);
LED_RR_DIFF_LOCK_L_Execution(LED_OFF_State);
LED_TPMS_L_Execution(LED_OFF_State);
LED_ASR_or_EVSC_OFF_L_Execution(LED_OFF_State);
LED_EVSC_L_Execution(LED_OFF_State);
LED_eco_stop_OFF_L_Execution(LED_OFF_State);
LED_AMT_L_Execution(LED_OFF_State);
LED_WEAR_IND_L_Execution(LED_OFF_State);
LED_TRAILER_BRAKE_R_Execution(LED_OFF_State);
LED_BRAKE_AIR_or_EBS_YELLOW_R_Execution(LED_OFF_State);
LED_ACC_AIR_R_Execution(LED_OFF_State);
LED_ABS_R_Execution(LED_OFF_State);
LED_PARK_BRAKE_R_Execution(LED_OFF_State);
LED_BRAKE_AIR_or_EBS_RED_R_Execution(LED_OFF_State);
LED_BRAKE_LOCK_R_Execution(LED_OFF_State);
LED_AIR_SUS_R_Execution(LED_OFF_State);
LED_TRAILER_ABS_U_Execution(LED_OFF_State);
LED_WORKING_LAMP_U_Execution(LED_OFF_State);
LED_TRAILER_ABS_INFO_U_Execution(LED_OFF_State);
LED_Temp_Execution(LED_OFF_State);
LED_Fuel_Execution(LED_OFF_State);
}
}
}
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
#define XXXX 0u #define XXXX 0u
#define LED_BRIGHTNESSR 0x3Fu #define LED_BRIGHTNESSR 0x3Fu
......
source/Application/Graphic/UE/DisplaySch_user.c
View file @ 3b638d27
...@@ -191,11 +191,9 @@ void DisplayServices(void) ...@@ -191,11 +191,9 @@ void DisplayServices(void)
if (BackOdoFlagSta == 0) if (BackOdoFlagSta == 0)
{ {
HMI_Clear_KEY_CONFIRM(); HMI_Clear_KEY_CONFIRM();
BackOdoFlagSta = 1 ;
Gui_Display_Test(); Gui_Display_Test();
/*TYW总计清零*/ /*TYW总计清零*/
BackOdoFlagSta = 1 ;
TYW_Data_ODO_Clear(); TYW_Data_ODO_Clear();
} }
} }
......
source/System/tasks.c
View file @ 3b638d27
...@@ -174,10 +174,14 @@ void Sys_Run_Mode_10ms_Tasks(void) ...@@ -174,10 +174,14 @@ void Sys_Run_Mode_10ms_Tasks(void)
Line_In_Debounce_Service(); Line_In_Debounce_Service();
Telltales_Left_Right_Management_Service(); Telltales_Left_Right_Management_Service();
if ((MenuFlag.Menu_Popup_Flag == 4u) || (BackOdoFlagSta == 1)) if (MenuFlag.Menu_Popup_Flag == 4u)
{ {
Test_LED_AllLight(); Test_LED_AllLight();
} }
else if (BackOdoFlagSta == 1)
{
Test_LED_AllLightALL();
}
else else
{ {
Telltales_Management(); Telltales_Management();
......
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