Skip to content

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

增加自检模式准备功能

parent ab68c18a
Hide whitespace changes
Inline Side-by-side
Showing with 38 additions and 28 deletions
source/Application/APP/Data_VehicleSpeed/Data_VehicleSpeed.c
View file @ 76ee60a1
......@@ -112,7 +112,7 @@ void Speed_Processing_Service(void)
Fre_SortShort(VehFreBuf, VehFreNum);
i = 0u;
}
VehValCup = (uint16_t) VehFreBuf[3u];
VehValCup = (uint16_t) VehFreBuf[1u];
if (VehValCup > 2250)
{
......
source/Application/APP/SEG_LCD/SEG_DISPLAY.c
View file @ 76ee60a1
......@@ -1018,7 +1018,7 @@ static void Seg_General_Digit_Display(uint32_t Digit, uint8_t Len, uint8_t Blank
static uint8_t wbyTestSeg = 0;
static uint16_t wbyTestNum;
static uint8_t WBY_SET = 0;
static uint8_t IC_TEST = 0;
/******************************************************************************
Seg_Display_Service 在 20MS任务中
信号接口：
......@@ -1031,34 +1031,34 @@ void Seg_Display_Service(void)
Ign_Time = Common_GetIgnOnTime();
if (Common_Get_IG_Sts() == COMMON_POWER_ON)
{
if (WBY_SET == 1)/*测试用点亮全部断码*/
if (IC_TEST == 1)/*测试用点亮全部断码*/
{
Seg_Display_ON();
}
else
{
SEG_A25_Disp(7u); //左侧弧线
SEG_C25_Disp(7u); //右侧弧线
SEG_A25_Disp(7u); /*左侧弧线*/
SEG_C25_Disp(7u); /*右侧弧线*/
if (Ign_Time < 3100)
{
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); // 水温格
SEG_Fuel_Display (GetGaugesCurrentPos(TempGauges), GUI_DISP_MODE_NORMAL, 7u); // 燃油格
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_Coolant_Display (GetGaugesCurrentPos(TempGauges), GUI_DISP_MODE_NORMAL, 7u); /*水温格*/
SEG_Fuel_Display (GetGaugesCurrentPos(TempGauges), GUI_DISP_MODE_NORMAL, 7u); /*燃油格*/
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 = 15u;
GaugesTimer = 5u;
}
else if (GaugesTimer == 0u)
{
GaugesTimer = 15u;
GaugesTimer = 5u;
if (Common_Get_Air1_Valid())
{
......@@ -1068,6 +1068,7 @@ void Seg_Display_Service(void)
{
SEG_PRI_Display(GetGaugesCurrentPos(PRIGasGauges), GUI_DISP_MODE_INVALID, 7u); // PRI气压格
}
if (Common_Get_Air2_Valid())
{
SEG_SEC_Display(GetGaugesCurrentPos(SECGasGauges), GUI_DISP_MODE_NORMAL, 7u); // SEC气压格
......@@ -1108,14 +1109,14 @@ void Seg_Display_Service(void)
GaugesTimer--;
/*此处为测试水温走格速度用*/
if (Coolant_Get_Valid())
{
SEG_Coolant_Display(Coolant_Get_CurSeg(), GUI_DISP_MODE_NORMAL, 7u); //水温格
}
else
{
SEG_Coolant_Display(Coolant_Get_CurSeg(), GUI_DISP_MODE_INVALID, 7u); //水温格
}
//if (Coolant_Get_Valid())
//{
// SEG_Coolant_Display(Coolant_Get_CurSeg(), GUI_DISP_MODE_NORMAL, 7u); //水温格
//}
//else
//{
// SEG_Coolant_Display(Coolant_Get_CurSeg(), GUI_DISP_MODE_INVALID, 7u); //水温格
//}
}
}
}
......
source/Application/APP/Telltales/Telltales.h
View file @ 76ee60a1
......@@ -150,6 +150,7 @@ uint8_t LED_Temp_Judgement(void);
uint8_t LED_Fuel_Judgement(void);
/*LED执行函数*/
void LED_Left_Right_Execution(void);
void LED_INTER_DIFF_LOCK_T_Execution(uint8_t led_status);
void LED_FOUR_MUL_FOUR_T_Execution(uint8_t led_status);
void LED_EXH_BRAKE_T_Execution(uint8_t led_status);
......
source/Application/APP/Telltales/Telltales_user.c
View file @ 76ee60a1
......@@ -159,7 +159,14 @@ void Telltales_Left_Right_Management_Service(void) /*10ms*/
}
}
#if 0
void LED_Left_Right_Execution(void)
{
SEG_LED_TURN_LEFT(7);/*左转向断码屏开*/
IS31_CHIP0_CHANNEL36 = 0x3Fu;
SEG_LED_TURN_RIGHT(7);/*右转向断码屏开*/
IS31_CHIP0_CHANNEL24 = 0x3Fu;
}
/*************************************
测试用
......@@ -167,6 +174,7 @@ void Telltales_Left_Right_Management_Service(void) /*10ms*/
**************************************/
void Test_LED_AllLight(void)
{
LED_Left_Right_Execution();
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);
......@@ -175,7 +183,7 @@ void Test_LED_AllLight(void)
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_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);
......@@ -204,10 +212,10 @@ void Test_LED_AllLight(void)
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);
}
#endif
/*---------------------------------------------------------------------------*/
#define XXXX 0u
#define LED_BRIGHTNESS 0xff
......
source/System/tasks.c
View file @ 76ee60a1
......@@ -140,8 +140,9 @@ void Sys_Run_Mode_10ms_Tasks(void)
Data_Mileage_Write_EEPROM();
Line_In_Debounce_Service();
Popup_Alone_Sound_Server();
Telltales_Left_Right_Management_Service();
Telltales_Management();
// Test_LED_AllLight();
//Test_LED_AllLight();
Key_Service();
CAN_BUSOFF_Recover();
......@@ -165,12 +166,11 @@ void Sys_Run_Mode_20ms_Tasks(void)
Coolant_Processing_Service();
Tacho_Processing_Service();
Speed_Processing_Service();
Telltales_Left_Right_Management_Service();
AirPressure_Processing_Service();
Voltmeter_Processing_Service();
Sound_Management_Service();
CD4051B_Debounce_Service();
Seg_Display_Service();
Seg_Display_Service();/*段码显示逻辑*/
Seg_Buffer_Commit();
BU98R10_Update_Request();
Buzzer_Track_Play_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