Skip to content

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

调整自检模式指示点亮BUG

parent 6caede18
Hide whitespace changes
Inline Side-by-side
Showing with 255 additions and 210 deletions
source/Application/APP/Data_Gear/Data_Gear.c
View file @ 7a8f8c34
...@@ -41,7 +41,7 @@ void Data_Gear_KL15_Init(void) ...@@ -41,7 +41,7 @@ void Data_Gear_KL15_Init(void)
******************************************************************************/ ******************************************************************************/
void Data_Service_Gear_Processing(void) void Data_Service_Gear_Processing(void)
{ {
Gear_Processing_Service(); Gear_Processing_Service();
} }
/****************************************************************************** /******************************************************************************
Function：Get_Gear_Mode_Type Function：Get_Gear_Mode_Type
...@@ -70,7 +70,7 @@ uint8_t Get_Gear_Mode_UPDOWN_Number(void) ...@@ -70,7 +70,7 @@ uint8_t Get_Gear_Mode_UPDOWN_Number(void)
******************************************************************************/ ******************************************************************************/
uint8_t Get_Gear_Mode_Up_Down(void) uint8_t Get_Gear_Mode_Up_Down(void)
{ {
} }
/****************************************************************************** /******************************************************************************
Function：Gear_Mode_Display Function：Gear_Mode_Display
...@@ -88,7 +88,7 @@ uint8_t Get_Gear_Mode_Display_Flash(void) ...@@ -88,7 +88,7 @@ uint8_t Get_Gear_Mode_Display_Flash(void)
uint8_t Get_Gear_Mode_M_A_Display(void) uint8_t Get_Gear_Mode_M_A_Display(void)
{ {
} }
uint8_t Get_Gear_Mode_P_E_Display(void) uint8_t Get_Gear_Mode_P_E_Display(void)
...@@ -98,11 +98,11 @@ uint8_t Get_Gear_Mode_P_E_Display(void) ...@@ -98,11 +98,11 @@ uint8_t Get_Gear_Mode_P_E_Display(void)
uint8_t Get_Gear_Mode_L_C_Display(void) uint8_t Get_Gear_Mode_L_C_Display(void)
{ {
} }
//------------------------------------------- //-------------------------------------------
//档位 数据处理 zhouhang //档位 数据处理
//------------------------------------------- //-------------------------------------------
//区域7显示逻辑 //区域7显示逻辑
//------------------------------------------- //-------------------------------------------
...@@ -111,13 +111,13 @@ uint8_t Get_Gear_Mode_L_C_Display(void) ...@@ -111,13 +111,13 @@ uint8_t Get_Gear_Mode_L_C_Display(void)
static struct static struct
{ {
uint8_t Number ;//档位编号 uint8_t Number ;//档位编号
en_GEAR_Sta Manual ;//是否 M A N U A L en_GEAR_Sta Manual ;//是否 M A N U A L
}GearVariable ; } GearVariable ;
/*------------------------------------------------------------------------- /*-------------------------------------------------------------------------
* Function Name : Gear_KL30_Init * Function Name : Gear_KL30_Init
* Description : * Description :
* Input : None * Input : None
* Output : None * Output : None
* Return : None * Return : None
...@@ -130,27 +130,27 @@ void Gear_KL30_Init(void) ...@@ -130,27 +130,27 @@ void Gear_KL30_Init(void)
} }
void Gear_KL15_ON_Init(void) void Gear_KL15_ON_Init(void)
{ {
GearVariable.Number = 0u; GearVariable.Number = 0u;
GearVariable.Manual = GEAR_MANUAL_OFF; GearVariable.Manual = GEAR_MANUAL_OFF;
} }
void Gear_KL15_OFF_Init(void) void Gear_KL15_OFF_Init(void)
{ {
GearVariable.Number = 0u; GearVariable.Number = 0u;
GearVariable.Manual = GEAR_MANUAL_OFF; GearVariable.Manual = GEAR_MANUAL_OFF;
} }
void Gear_Wakeup_Init(void) void Gear_Wakeup_Init(void)
{ {
GearVariable.Number = 0u; GearVariable.Number = 0u;
GearVariable.Manual = GEAR_MANUAL_OFF; GearVariable.Manual = GEAR_MANUAL_OFF;
} }
void Gear_Sleep_Init(void) void Gear_Sleep_Init(void)
{ {
GearVariable.Number = 0u; GearVariable.Number = 0u;
GearVariable.Manual = GEAR_MANUAL_OFF; GearVariable.Manual = GEAR_MANUAL_OFF;
} }
/*------------------------------------------------------------------------- /*-------------------------------------------------------------------------
* Function Name : Gear_Processing_Service * Function Name : Gear_Processing_Service
* Description : * Description :
* Input : None * Input : None
* Output : None * Output : None
* Return : None * Return : None
...@@ -158,133 +158,133 @@ void Gear_Sleep_Init(void) ...@@ -158,133 +158,133 @@ void Gear_Sleep_Init(void)
--------------------------------------------------------------------------*/ --------------------------------------------------------------------------*/
void Gear_Processing_Service(void) void Gear_Processing_Service(void)
{ {
uint8_t can1_4_1_8 = 0 ; //***************************************** 接收报文的变量 uint8_t can1_4_1_8 = 0 ; //***************************************** 接收报文的变量
uint8_t can2_1_5_2 = 0 ; //***************************************** 接收报文的变量 uint8_t can2_1_5_2 = 0 ; //***************************************** 接收报文的变量
uint8_t can3_3_7_2 = 0 ; //***************************************** 接收报文的变量 uint8_t can3_3_7_2 = 0 ; //***************************************** 接收报文的变量
uint8_t can4_5_1_8 = 0 ; //***************************************** 接收报文的变量 uint8_t can4_5_1_8 = 0 ; //***************************************** 接收报文的变量
uint8_t can5_1_7_2 = 0 ; //***************************************** 接收报文的变量 uint8_t can5_1_7_2 = 0 ; //***************************************** 接收报文的变量
uint8_t u8Number = 0 ; //************************************** 档位 编号 uint8_t u8Number = 0 ; //************************************** 档位 编号
en_GEAR_Sta u8Manual = GEAR_MANUAL_OFF ; //******************** 是否MANUAL en_GEAR_Sta u8Manual = GEAR_MANUAL_OFF ; //******************** 是否MANUAL
can1_4_1_8 = Get_ID_18F00503_Sig_Current_Gear(); //can1_4_1_8含义是: byte 4 bit 1 length 8 can1_4_1_8 = Get_ID_18F00503_Sig_Current_Gear(); //can1_4_1_8含义是: byte 4 bit 1 length 8
can2_1_5_2 = Get_ID_18FF8503_Sig_Manouvering_mode(); can2_1_5_2 = Get_ID_18FF8503_Sig_Manouvering_mode();
can3_3_7_2 = Get_ID_18FE4A03_Sig_TransmissionSiftMode1_Indicator(); can3_3_7_2 = Get_ID_18FE4A03_Sig_TransmissionSiftMode1_Indicator();
can4_5_1_8 = Get_ID_18F00503_Sig_ID18F00503_byte5(); can4_5_1_8 = Get_ID_18F00503_Sig_ID18F00503_byte5();
can5_1_7_2 = Get_ID_18FF8503_Sig_Automatic_or_Manual_Mode(); can5_1_7_2 = Get_ID_18FF8503_Sig_Automatic_or_Manual_Mode();
if(/*Get_CanFirstRecv_Event(ID_CanMsg18F00503_Msg_Count) == 0*/ 0u) if (/*Get_CanFirstRecv_Event(ID_CanMsg18F00503_Msg_Count) == 0*/ 0u)
{ {
u8Number = 0u; u8Number = 0u;
u8Manual = GEAR_MANUAL_OFF; u8Manual = GEAR_MANUAL_OFF;
} }
else if (CAN_MSG_Status(ID_CanMsg18F00503_Msg_Count) == CAN_SIG_LOST) else if (CAN_MSG_Status(ID_CanMsg18F00503_Msg_Count) == CAN_SIG_LOST)
{ {
u8Number = 20u; u8Number = 20u;
u8Manual = GEAR_MANUAL_OFF; u8Manual = GEAR_MANUAL_OFF;
} }
else else
{ {
if((can1_4_1_8 == 0x7E) && (can2_1_5_2 != 0x01))//档位1 if ((can1_4_1_8 == 0x7E) && (can2_1_5_2 != 0x01)) //档位1
{ {
u8Number = 1u; u8Number = 1u;
} }
else if(can1_4_1_8 == 0x7F)//档位2 else if (can1_4_1_8 == 0x7F) //档位2
{ {
u8Number = 2u; u8Number = 2u;
} }
else if(can1_4_1_8 == 0x80)//档位3 else if (can1_4_1_8 == 0x80) //档位3
{ {
u8Number = 3u; u8Number = 3u;
} }
else if(can1_4_1_8 == 0x81)//档位4 else if (can1_4_1_8 == 0x81) //档位4
{ {
u8Number = 4u; u8Number = 4u;
} }
else if(can1_4_1_8 == 0x82)//档位5 else if (can1_4_1_8 == 0x82) //档位5
{ {
u8Number = 5u; u8Number = 5u;
} }
else if(can1_4_1_8 == 0x83)//档位6 else if (can1_4_1_8 == 0x83) //档位6
{ {
u8Number = 6u; u8Number = 6u;
} }
else if(can1_4_1_8 == 0x84)//档位7 else if (can1_4_1_8 == 0x84) //档位7
{ {
u8Number = 7u; u8Number = 7u;
} }
else if(can1_4_1_8 == 0x85)//档位8 else if (can1_4_1_8 == 0x85) //档位8
{ {
u8Number = 8u; u8Number = 8u;
} }
else if(can1_4_1_8 == 0x86)//档位9 else if (can1_4_1_8 == 0x86) //档位9
{ {
u8Number = 9u; u8Number = 9u;
} }
else if(can1_4_1_8 == 0x87)//档位10 else if (can1_4_1_8 == 0x87) //档位10
{ {
u8Number = 10u; u8Number = 10u;
} }
else if(can1_4_1_8 == 0x88)//档位11 else if (can1_4_1_8 == 0x88) //档位11
{ {
u8Number = 11u; u8Number = 11u;
} }
else if(can1_4_1_8 == 0x89)//档位12 else if (can1_4_1_8 == 0x89) //档位12
{ {
u8Number = 12u; u8Number = 12u;
} }
else if(can1_4_1_8 == 0x7B)//档位R2 else if (can1_4_1_8 == 0x7B) //档位R2
{ {
u8Number = 13u; u8Number = 13u;
} }
else if((can1_4_1_8 == 0x7C) && (can2_1_5_2 != 0x01))//档位R1 else if ((can1_4_1_8 == 0x7C) && (can2_1_5_2 != 0x01)) //档位R1
{ {
u8Number = 14u; u8Number = 14u;
} }
else if((can1_4_1_8 == 0x7D) && (can3_3_7_2 != 0x01))//档位N else if ((can1_4_1_8 == 0x7D) && (can3_3_7_2 != 0x01)) //档位N
{ {
u8Number = 15u; u8Number = 15u;
} }
else if((can1_4_1_8 == 0x7C) && (can2_1_5_2 == 0x01))//档位RM else if ((can1_4_1_8 == 0x7C) && (can2_1_5_2 == 0x01)) //档位RM
{ {
u8Number = 16u; u8Number = 16u;
} }
else if((can1_4_1_8 == 0x7E) && (can2_1_5_2 == 0x01))//档位DM else if ((can1_4_1_8 == 0x7E) && (can2_1_5_2 == 0x01)) //档位DM
{ {
u8Number = 17u; u8Number = 17u;
} }
else if((can1_4_1_8 == 0x7D) && (can3_3_7_2 == 0x01))//档位E else if ((can1_4_1_8 == 0x7D) && (can3_3_7_2 == 0x01)) //档位E
{ {
u8Number = 18u; u8Number = 18u;
} }
else if((can4_5_1_8 == 0x7D) && (can3_3_7_2 == 0x01))//档位NE else if ((can4_5_1_8 == 0x7D) && (can3_3_7_2 == 0x01)) //档位NE
{ {
u8Number = 19u; u8Number = 19u;
} }
else//档位—— else//档位——
{ {
u8Number = 20u; u8Number = 20u;
} }
if (CAN_MSG_Status(ID_CanMsg18FF8503_Msg_Count) == CAN_SIG_LOST) if (CAN_MSG_Status(ID_CanMsg18FF8503_Msg_Count) == CAN_SIG_LOST)
{ {
u8Manual = GEAR_MANUAL_OFF; u8Manual = GEAR_MANUAL_OFF;
} }
else if(can5_1_7_2 == 0x00) else if (can5_1_7_2 == 0x00)
{ {
u8Manual = GEAR_MANUAL_ON; u8Manual = GEAR_MANUAL_ON;
} }
else else
{ {
u8Manual = GEAR_MANUAL_OFF; u8Manual = GEAR_MANUAL_OFF;
} }
} }
GearVariable.Number = u8Number ; GearVariable.Number = u8Number ;
GearVariable.Manual = u8Manual ; GearVariable.Manual = u8Manual ;
} }
/*------------------------------------------------------------------------- /*-------------------------------------------------------------------------
......
source/Application/APP/LINE_IN/Line_In.h
View file @ 7a8f8c34
...@@ -9,7 +9,6 @@ ...@@ -9,7 +9,6 @@
/*所有硬线输入的索引*/ /*所有硬线输入的索引*/
typedef enum typedef enum
{ {
/*ZH修改：2021.6.25*/
/*指示灯相关*/ /*指示灯相关*/
LINE_IN_ABS = 0U, /*A22 ABS*/ LINE_IN_ABS = 0U, /*A22 ABS*/
LINE_IN_PARK_BRAKE, /*A23 PARK BRAKE*/ LINE_IN_PARK_BRAKE, /*A23 PARK BRAKE*/
...@@ -28,7 +27,6 @@ typedef enum ...@@ -28,7 +27,6 @@ typedef enum
LINE_IN_RR_DIFF_LOCK, /*B36 RR DIFF LOCK*/ LINE_IN_RR_DIFF_LOCK, /*B36 RR DIFF LOCK*/
LINE_IN_WEAR_IND, /*B38 WEAR IND*/ LINE_IN_WEAR_IND, /*B38 WEAR IND*/
/*ZH新增：2021.6.29*/
/*非指示灯相关*/ /*非指示灯相关*/
LINE_IN_ILLUMINATION, /*A06 ILLUMINATION*/ LINE_IN_ILLUMINATION, /*A06 ILLUMINATION*/
LINE_IN_RET_BLENDING, /*A10 RET_BLENDING*/ LINE_IN_RET_BLENDING, /*A10 RET_BLENDING*/
......
source/Application/APP/LINE_IN/Line_In_user.c
View file @ 7a8f8c34
// ZH修改2021年8月26日16:23:59
#include "Line_in.h" #include "Line_in.h"
#include "GPIO.h" #include "GPIO.h"
#include "dr7f701441.dvf.h" #include "dr7f701441.dvf.h"
#include "CD4051.h" #include "CD4051.h"
/*ZH修改：2021.6.25 08:35*/
/*指示灯 相关的 硬线*/ /*指示灯 相关的 硬线*/
LINE_IN_TriggerLevel_en_t LINE_IN_Get_ABS(void); /*A22 ABS*/ LINE_IN_TriggerLevel_en_t LINE_IN_Get_ABS(void); /*A22 ABS*/
LINE_IN_TriggerLevel_en_t LINE_IN_Get_PARK_BRAKE(void); /*A23 PARK BRAKE*/ LINE_IN_TriggerLevel_en_t LINE_IN_Get_PARK_BRAKE(void); /*A23 PARK BRAKE*/
...@@ -23,7 +22,6 @@ LINE_IN_TriggerLevel_en_t LINE_IN_Get_TRAILER_ABS(void); /*B33 TRAILER ABS ...@@ -23,7 +22,6 @@ LINE_IN_TriggerLevel_en_t LINE_IN_Get_TRAILER_ABS(void); /*B33 TRAILER ABS
LINE_IN_TriggerLevel_en_t LINE_IN_Get_RR_DIFF_LOCK(void); /*B36 RR DIFF LOCK*/ LINE_IN_TriggerLevel_en_t LINE_IN_Get_RR_DIFF_LOCK(void); /*B36 RR DIFF LOCK*/
LINE_IN_TriggerLevel_en_t LINE_IN_Get_WEAR_IND(void); /*B38 WEAR IND*/ LINE_IN_TriggerLevel_en_t LINE_IN_Get_WEAR_IND(void); /*B38 WEAR IND*/
/*ZH新增：2021.6.28 18:38*/
/*非指示灯 相关的 硬线*/ /*非指示灯 相关的 硬线*/
LINE_IN_TriggerLevel_en_t LINE_IN_Get_ILLUMINATION(void); /*A06 ILLUMINATION*/ LINE_IN_TriggerLevel_en_t LINE_IN_Get_ILLUMINATION(void); /*A06 ILLUMINATION*/
LINE_IN_TriggerLevel_en_t LINE_IN_Get_RET_BLENDING(void); /*A10 RET_BLENDING*/ LINE_IN_TriggerLevel_en_t LINE_IN_Get_RET_BLENDING(void); /*A10 RET_BLENDING*/
...@@ -41,7 +39,6 @@ LINE_IN_TriggerLevel_en_t LINE_IN_Get_WEAR2(void); /*B40 WEAR2*/ ...@@ -41,7 +39,6 @@ LINE_IN_TriggerLevel_en_t LINE_IN_Get_WEAR2(void); /*B40 WEAR2*/
/*属性表与硬线索引号Line_In_Channel_en_t一一对应*/ /*属性表与硬线索引号Line_In_Channel_en_t一一对应*/
const Line_In_Attribute_st_t g_stLineInAttribute[LINE_IN_MAX] = const Line_In_Attribute_st_t g_stLineInAttribute[LINE_IN_MAX] =
{ {
/*ZH修改：2021.6.24 19:47*/
/*指示灯信号 硬线输入*/ /*指示灯信号 硬线输入*/
{ LINE_IN_LEVEL_LOW, 200U, 0U, LINE_IN_IG_ON, LINE_IN_Get_ABS,}, /*A22 ABS*/ { LINE_IN_LEVEL_LOW, 200U, 0U, LINE_IN_IG_ON, LINE_IN_Get_ABS,}, /*A22 ABS*/
{ LINE_IN_LEVEL_LOW, 200U, 0U, LINE_IN_IG_ON, LINE_IN_Get_PARK_BRAKE,}, /*A23 PARK BRAKE*/ { LINE_IN_LEVEL_LOW, 200U, 0U, LINE_IN_IG_ON, LINE_IN_Get_PARK_BRAKE,}, /*A23 PARK BRAKE*/
...@@ -60,7 +57,6 @@ const Line_In_Attribute_st_t g_stLineInAttribute[LINE_IN_MAX] = ...@@ -60,7 +57,6 @@ const Line_In_Attribute_st_t g_stLineInAttribute[LINE_IN_MAX] =
{ LINE_IN_LEVEL_HIGH, 200U, 0U, LINE_IN_IG_ON, LINE_IN_Get_RR_DIFF_LOCK,}, /*B36 RR DIFF LOCK*/ { LINE_IN_LEVEL_HIGH, 200U, 0U, LINE_IN_IG_ON, LINE_IN_Get_RR_DIFF_LOCK,}, /*B36 RR DIFF LOCK*/
{ LINE_IN_LEVEL_LOW, 200U, 0U, LINE_IN_IG_ON, LINE_IN_Get_WEAR_IND,}, /*B38 WEAR IND*/ { LINE_IN_LEVEL_LOW, 200U, 0U, LINE_IN_IG_ON, LINE_IN_Get_WEAR_IND,}, /*B38 WEAR IND*/
/*ZH新增：2021.6.28 18:38*/
/*非指示灯信号 硬线输入*/ /*非指示灯信号 硬线输入*/
{ LINE_IN_LEVEL_HIGH, 200U, 0U, LINE_IN_IG_ON, LINE_IN_Get_ILLUMINATION,}, /*A06 ILLUMINATION 背光有效*/ { LINE_IN_LEVEL_HIGH, 200U, 0U, LINE_IN_IG_ON, LINE_IN_Get_ILLUMINATION,}, /*A06 ILLUMINATION 背光有效*/
{ LINE_IN_LEVEL_LOW, 200U, 0U, LINE_IN_IG_ON, LINE_IN_Get_RET_BLENDING,}, /*A10 RET_BLENDING*/ { LINE_IN_LEVEL_LOW, 200U, 0U, LINE_IN_IG_ON, LINE_IN_Get_RET_BLENDING,}, /*A10 RET_BLENDING*/
...@@ -76,8 +72,6 @@ const Line_In_Attribute_st_t g_stLineInAttribute[LINE_IN_MAX] = ...@@ -76,8 +72,6 @@ const Line_In_Attribute_st_t g_stLineInAttribute[LINE_IN_MAX] =
{ LINE_IN_LEVEL_LOW, 200U, 0U, LINE_IN_IG_ON, LINE_IN_Get_WEAR2,}, /*B40 WEAR2*/ { LINE_IN_LEVEL_LOW, 200U, 0U, LINE_IN_IG_ON, LINE_IN_Get_WEAR2,}, /*B40 WEAR2*/
}; };
/*ZH修改：2021.6.25 08:46*/
/*A22 ABS*/ /*A22 ABS*/
LINE_IN_TriggerLevel_en_t LINE_IN_Get_ABS(void) LINE_IN_TriggerLevel_en_t LINE_IN_Get_ABS(void)
{ {
...@@ -206,8 +200,6 @@ LINE_IN_TriggerLevel_en_t LINE_IN_Get_WEAR_IND(void) ...@@ -206,8 +200,6 @@ LINE_IN_TriggerLevel_en_t LINE_IN_Get_WEAR_IND(void)
return Res; return Res;
} }
/*ZH新增：2021.6.29*/
/*A06 ILLUMINATION 背光有效*/ /*A06 ILLUMINATION 背光有效*/
LINE_IN_TriggerLevel_en_t LINE_IN_Get_ILLUMINATION(void) LINE_IN_TriggerLevel_en_t LINE_IN_Get_ILLUMINATION(void)
{ {
......
source/Application/APP/SEG_LCD/SEG_DISPLAY.c
View file @ 7a8f8c34
...@@ -303,7 +303,6 @@ void SEG_LED_TURN_LEFT(uint8_t seg_status) ...@@ -303,7 +303,6 @@ void SEG_LED_TURN_LEFT(uint8_t seg_status)
{ {
SEG_BUFF_Set(BU98_CHIP1, SEG_REDEFINE_37, seg_status); SEG_BUFF_Set(BU98_CHIP1, SEG_REDEFINE_37, seg_status);
} }
/*:ZH*/
/***************************************************************************** /*****************************************************************************
常显示 常显示
......
source/Application/APP/SEG_LCD/SEG_DISPLAY.h
View file @ 7a8f8c34
...@@ -3,9 +3,6 @@ ...@@ -3,9 +3,6 @@
#include "Seg_Ref.h" #include "Seg_Ref.h"
/*ZH:*/
void SEG_LED_INTER_DIFF_LOCK_T(uint8_t seg_status); void SEG_LED_INTER_DIFF_LOCK_T(uint8_t seg_status);
void SEG_LED_FOUR_MUL_FOUR_T(uint8_t seg_status); void SEG_LED_FOUR_MUL_FOUR_T(uint8_t seg_status);
void SEG_LED_EXH_BRAKE_T(uint8_t seg_status); void SEG_LED_EXH_BRAKE_T(uint8_t seg_status);
...@@ -47,8 +44,6 @@ void SEG_LED_TRAILER_ABS_INFO_U(uint8_t seg_status); ...@@ -47,8 +44,6 @@ void SEG_LED_TRAILER_ABS_INFO_U(uint8_t seg_status);
void SEG_LED_TURN_RIGHT(uint8_t seg_status); void SEG_LED_TURN_RIGHT(uint8_t seg_status);
void SEG_LED_TURN_LEFT(uint8_t seg_status); void SEG_LED_TURN_LEFT(uint8_t seg_status);
/*:ZH*/
extern void Seg_Display_Service(void); extern void Seg_Display_Service(void);
extern void Seg_Display_ON(void); extern void Seg_Display_ON(void);
extern void Seg_Display_OFF(void); extern void Seg_Display_OFF(void);
......
source/Application/APP/Telltales/Telltales.h
View file @ 7a8f8c34
...@@ -107,7 +107,6 @@ uint8_t GET_LED_POSITION_G(void); ...@@ -107,7 +107,6 @@ uint8_t GET_LED_POSITION_G(void);
void Write_LED_READY_G_Execution(uint8_t led_status); void Write_LED_READY_G_Execution(uint8_t led_status);
uint8_t GET_LED_READY_G_Execution(void); uint8_t GET_LED_READY_G_Execution(void);
/*ZH:*/
/*LED点灯条件判别函数*/ /*LED点灯条件判别函数*/
uint8_t LED_INTER_DIFF_LOCK_T_Judgement(void); uint8_t LED_INTER_DIFF_LOCK_T_Judgement(void);
uint8_t LED_FOUR_MUL_FOUR_T_Judgement(void); uint8_t LED_FOUR_MUL_FOUR_T_Judgement(void);
...@@ -150,7 +149,7 @@ uint8_t LED_Temp_Judgement(void); ...@@ -150,7 +149,7 @@ uint8_t LED_Temp_Judgement(void);
uint8_t LED_Fuel_Judgement(void); uint8_t LED_Fuel_Judgement(void);
/*LED执行函数*/ /*LED执行函数*/
void LED_Left_Right_Execution(void); void LED_Left_Right_Execution(uint8_t led_status);
void LED_INTER_DIFF_LOCK_T_Execution(uint8_t led_status); void LED_INTER_DIFF_LOCK_T_Execution(uint8_t led_status);
void LED_FOUR_MUL_FOUR_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); void LED_EXH_BRAKE_T_Execution(uint8_t led_status);
...@@ -190,6 +189,5 @@ void LED_WORKING_LAMP_U_Execution(uint8_t led_status); ...@@ -190,6 +189,5 @@ void LED_WORKING_LAMP_U_Execution(uint8_t led_status);
void LED_TRAILER_ABS_INFO_U_Execution(uint8_t led_status); void LED_TRAILER_ABS_INFO_U_Execution(uint8_t led_status);
void LED_Temp_Execution(uint8_t led_status); void LED_Temp_Execution(uint8_t led_status);
void LED_Fuel_Execution(uint8_t led_status); void LED_Fuel_Execution(uint8_t led_status);
/*:ZH*/
#endif #endif
source/Application/APP/Telltales/Telltales_user.c
View file @ 7a8f8c34
...@@ -84,46 +84,96 @@ void Telltales_Left_Right_KL30_Init(void) ...@@ -84,46 +84,96 @@ void Telltales_Left_Right_KL30_Init(void)
**************************************/ **************************************/
void Test_LED_AllLight(void) void Test_LED_AllLight(void)
{ {
LED_Left_Right_Execution(); COMMON_PowerStatus_t u8IG_st;
LED_INTER_DIFF_LOCK_T_Execution(LED_ON_State);
LED_FOUR_MUL_FOUR_T_Execution(LED_ON_State); u8IG_st = Common_Get_IG_Sts();
LED_EXH_BRAKE_T_Execution(LED_ON_State);
LED_QOS_GLOW_T_Execution(LED_ON_State); if (u8IG_st == COMMON_POWER_ON)
LED_HI_BEAM_T_Execution(LED_ON_State); {
LED_Rr_FOG_LAMP_T_Execution(LED_ON_State); LED_Left_Right_Execution(LED_ON_State);
LED_MIL_T_Execution(LED_ON_State); LED_INTER_DIFF_LOCK_T_Execution(LED_ON_State);
LED_SVS_T_Execution(LED_ON_State); LED_FOUR_MUL_FOUR_T_Execution(LED_ON_State);
LED_H_S_A_T_Execution(LED_ON_State); LED_EXH_BRAKE_T_Execution(LED_ON_State);
LED_RETARDER_T_Execution(LED_ON_State); LED_QOS_GLOW_T_Execution(LED_ON_State);
LED_AUTO_LEVELING_T_Execution(LED_ON_State); LED_HI_BEAM_T_Execution(LED_ON_State);
LED_ROWS_L_Execution(LED_ON_State); LED_Rr_FOG_LAMP_T_Execution(LED_ON_State);
LED_BSM_OFF_L_Execution(LED_ON_State); LED_MIL_T_Execution(LED_ON_State);
LED_AEBS_OFF_L_Execution(LED_ON_State); LED_SVS_T_Execution(LED_ON_State);
LED_LDWS_L_Execution(LED_ON_State); LED_H_S_A_T_Execution(LED_ON_State);
LED_SRS_L_Execution(LED_ON_State); LED_RETARDER_T_Execution(LED_ON_State);
LED_ENG_OIL_L_Execution(LED_ON_State); LED_AUTO_LEVELING_T_Execution(LED_ON_State);
LED_CHARG_L_Execution(LED_ON_State); LED_ROWS_L_Execution(LED_ON_State);
LED_SEAT_BELT_L_Execution(LED_ON_State); LED_BSM_OFF_L_Execution(LED_ON_State);
LED_RR_DIFF_LOCK_L_Execution(LED_ON_State); LED_AEBS_OFF_L_Execution(LED_ON_State);
LED_TPMS_L_Execution(LED_ON_State); LED_LDWS_L_Execution(LED_ON_State);
LED_ASR_or_EVSC_OFF_L_Execution(LED_ON_State); LED_SRS_L_Execution(LED_ON_State);
LED_EVSC_L_Execution(LED_ON_State); LED_ENG_OIL_L_Execution(LED_ON_State);
LED_eco_stop_OFF_L_Execution(LED_ON_State); LED_CHARG_L_Execution(LED_ON_State);
LED_AMT_L_Execution(LED_ON_State); LED_SEAT_BELT_L_Execution(LED_ON_State);
LED_WEAR_IND_L_Execution(LED_ON_State); LED_RR_DIFF_LOCK_L_Execution(LED_ON_State);
LED_TRAILER_BRAKE_R_Execution(LED_ON_State); LED_TPMS_L_Execution(LED_ON_State);
LED_BRAKE_AIR_or_EBS_YELLOW_R_Execution(LED_ON_State); LED_ASR_or_EVSC_OFF_L_Execution(LED_ON_State);
LED_ACC_AIR_R_Execution(LED_ON_State); LED_EVSC_L_Execution(LED_ON_State);
LED_ABS_R_Execution(LED_ON_State); LED_eco_stop_OFF_L_Execution(LED_ON_State);
LED_PARK_BRAKE_R_Execution(LED_ON_State); LED_AMT_L_Execution(LED_ON_State);
LED_BRAKE_AIR_or_EBS_RED_R_Execution(LED_ON_State); LED_WEAR_IND_L_Execution(LED_ON_State);
LED_BRAKE_LOCK_R_Execution(LED_ON_State); LED_TRAILER_BRAKE_R_Execution(LED_ON_State);
LED_AIR_SUS_R_Execution(LED_ON_State); LED_BRAKE_AIR_or_EBS_YELLOW_R_Execution(LED_ON_State);
LED_TRAILER_ABS_U_Execution(LED_ON_State); LED_ACC_AIR_R_Execution(LED_ON_State);
LED_WORKING_LAMP_U_Execution(LED_ON_State); LED_ABS_R_Execution(LED_ON_State);
LED_TRAILER_ABS_INFO_U_Execution(LED_ON_State); LED_PARK_BRAKE_R_Execution(LED_ON_State);
LED_Temp_Execution(LED_ON_State); LED_BRAKE_AIR_or_EBS_RED_R_Execution(LED_ON_State);
LED_Fuel_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);
}
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
...@@ -218,13 +268,24 @@ void Telltales_Left_Right_Management_Service(void) /*10ms*/ ...@@ -218,13 +268,24 @@ void Telltales_Left_Right_Management_Service(void) /*10ms*/
} }
} }
void LED_Left_Right_Execution(void) void LED_Left_Right_Execution(uint8_t led_status)
{ {
SEG_LED_TURN_LEFT(7);/*左转向断码屏开*/ if (led_status == 1u)
IS31_CHIP0_CHANNEL36 = LED_BRIGHTNESSG; {
SEG_LED_TURN_LEFT(7);/*左转向断码屏开*/
IS31_CHIP0_CHANNEL36 = LED_BRIGHTNESSG;
SEG_LED_TURN_RIGHT(7);/*右转向断码屏开*/
IS31_CHIP0_CHANNEL24 = LED_BRIGHTNESSG;
}
else
{
SEG_LED_TURN_LEFT(0);/*左转向断码屏开*/
IS31_CHIP0_CHANNEL36 = 0u;
SEG_LED_TURN_RIGHT(7);/*右转向断码屏开*/ SEG_LED_TURN_RIGHT(0);/*右转向断码屏开*/
IS31_CHIP0_CHANNEL24 = LED_BRIGHTNESSG; IS31_CHIP0_CHANNEL24 = 0u;
}
} }
/****************************************************************************** /******************************************************************************
......
source/Application/Graphic/GUI/GUI.c
View file @ 7a8f8c34
...@@ -133,8 +133,8 @@ void GUI_Display_Value_Init(void) ...@@ -133,8 +133,8 @@ void GUI_Display_Value_Init(void)
/*应用*/ /*应用*/
User_App.User_Language = 1u ; User_App.User_Language = 1u ;
User_App.User_Company = 1u ; User_App.User_Company = 1u ;
User_App.User_Light1 = 10u ; /*背光初始化*/ User_App.User_Light1 = K_Line_Set.ReservedB ;
User_App.User_Light2 = 10u ; User_App.User_Light2 = K_Line_Set.ReservedB ;
/*保养状态标识*/ /*保养状态标识*/
if (K_Line_Set.K_Line_LID4F) if (K_Line_Set.K_Line_LID4F)
......
source/Application/RTE/Common_Interface.c
View file @ 7a8f8c34
...@@ -50,10 +50,9 @@ static void Common_Set_Disp_V_Speed_Valid(DataValid_t Val); ...@@ -50,10 +50,9 @@ static void Common_Set_Disp_V_Speed_Valid(DataValid_t Val);
static void Common_Set_Disp_E_Speed_Valid(DataValid_t Val); static void Common_Set_Disp_E_Speed_Valid(DataValid_t Val);
static uint16_t SysRollingCounter; static uint16_t SysRollingCounter;
// wangboyu - begin
static uint8_t CanFirstEvent[ID_TOTAL_MAX]; static uint8_t CanFirstEvent[ID_TOTAL_MAX];
static void Individual_ECU_Communication(void); static void Individual_ECU_Communication(void);
// wangboyu - end
_EOL_K_LINE_SET K_Line_Set; _EOL_K_LINE_SET K_Line_Set;
...@@ -876,4 +875,7 @@ void K_LINE_EOL_InitVal(void) ...@@ -876,4 +875,7 @@ void K_LINE_EOL_InitVal(void)
K_Line_Set.K_Line_LID50 = 0x00u; /* -- 预留 */ K_Line_Set.K_Line_LID50 = 0x00u; /* -- 预留 */
K_Line_Set.K_Line_LID51 = 0x01u; /* 01 工作模式 */ K_Line_Set.K_Line_LID51 = 0x01u; /* 01 工作模式 */
K_Line_Set.K_Line_LID52 = 0x00u; /* 00 电子部件设定 */ K_Line_Set.K_Line_LID52 = 0x00u; /* 00 电子部件设定 */
K_Line_Set.ReservedB = 0x0A;
K_Line_Set.ReservedC = 0x0A;
} }
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