Skip to content

I
IVECO_NS216
Commit a8a5b7c5 authored by 时昊's avatar 时昊
Browse files
Options

1.优化ldws指示灯,声音,弹窗报警功能

parent 57408f17
Show whitespace changes
Inline Side-by-side
Showing with 51 additions and 199 deletions
source/Appliciation/DataProcess.h
View file @ a8a5b7c5
...@@ -426,12 +426,13 @@ typedef struct ...@@ -426,12 +426,13 @@ typedef struct
uint8_t Can_0A18A006: 1; uint8_t Can_0A18A006: 1;
uint8_t Can_0CF00400: 1; uint8_t Can_0CF00400: 1;
uint8_t Can_18FF2100: 1; uint8_t Can_18FF2100: 1;
uint8_t Can_18FEEE00: 1; uint8_t Can_18FEEE00: 1;
uint8_t Can_18FEF100: 1; uint8_t Can_18FEF100: 1;
uint8_t Can_18FD0700: 1; uint8_t Can_18FD0700: 1;
uint8_t Can_18FEFF00: 1; uint8_t Can_18FEFF00: 1;
uint8_t Can_18FEE400: 1; uint8_t Can_18FEE400: 1;
uint8_t Can_18FECA00: 1; uint8_t Can_18FECA00: 1;
uint8_t Can_18FD7C00: 1; uint8_t Can_18FD7C00: 1;
uint8_t Can_18FF4C00: 1; uint8_t Can_18FF4C00: 1;
...@@ -439,14 +440,17 @@ typedef struct ...@@ -439,14 +440,17 @@ typedef struct
//uint8_t Can_18FEFC17: 1; //uint8_t Can_18FEFC17: 1;
//uint8_t Can_18FEC1EE: 1; //uint8_t Can_18FEC1EE: 1;
uint8_t Can_10FF1021: 1; uint8_t Can_10FF1021: 1;
uint8_t Can_10FF7521: 1; uint8_t Can_10FF7521: 1;
uint8_t Can_18FEF433: 1; uint8_t Can_18FEF433: 1;
uint8_t Can_18FF9CF1: 1; uint8_t Can_18FF9CF1: 1;
uint8_t Can_18FECA03: 1; uint8_t Can_18FECA03: 1;
uint8_t Can_18FF4453: 1; uint8_t Can_18FF4453: 1;
uint8_t Can_18FFA8EE: 1; uint8_t Can_18FFA8EE: 1;
uint8_t Can_18FFB078: 1; uint8_t Can_18FFB078: 1;
uint8_t Can_18FE4A03: 1; uint8_t Can_18FE4A03: 1;
uint8_t Can_18F00503: 1; uint8_t Can_18F00503: 1;
uint8_t Can_18FF9DF1: 1; uint8_t Can_18FF9DF1: 1;
uint8_t Can_18FE5BE8: 1; uint8_t Can_18FE5BE8: 1;
......
source/Appliciation/Popup_Alarm.h
View file @ a8a5b7c5
...@@ -78,6 +78,7 @@ typedef enum ...@@ -78,6 +78,7 @@ typedef enum
typedef enum typedef enum
{ {
POP_TYPE_0 = 0U, POP_TYPE_0 = 0U,
POP_TYPE_1,
POP_TYPE_MAX, /*最大值*/ POP_TYPE_MAX, /*最大值*/
} Pop_Alarm_Type_en_t; } Pop_Alarm_Type_en_t;
/*可查询的报警隐藏队列枚举,需根据不同项目而修改*/ /*可查询的报警隐藏队列枚举,需根据不同项目而修改*/
......
source/Appliciation/Popup_Alarm_Handle.c
View file @ a8a5b7c5
...@@ -1171,11 +1171,8 @@ void Popups_Alarm_Trigger_DOOR(void) ...@@ -1171,11 +1171,8 @@ void Popups_Alarm_Trigger_DOOR(void)
} }
} }
#define POP_LDWS_TIME_3S 30U
uint16_t u16PopLDWSTimeCount_3s_Failure = 0;
uint16_t u16PopLDWSTimeCount_3s_L_R = 0;
uint16_t u16PopLDWSTimeCount_3s_Close = 0;
uint16_t u16PopLDWSTimeCount_3s_Atcive = 0;
Pop_uint8_t u8PopAlarmLDWS = 0; Pop_uint8_t u8PopAlarmLDWS = 0;
void Popups_Alarm_Trigger_LDWS(void) void Popups_Alarm_Trigger_LDWS(void)
{ {
...@@ -1185,10 +1182,7 @@ void Popups_Alarm_Trigger_LDWS(void) ...@@ -1185,10 +1182,7 @@ void Popups_Alarm_Trigger_LDWS(void)
( CAN_MSG_Status(&CAN_CH0_CanMsgOp, CAN_CH0_ID_can10F007E8_Msg_Count) == CAN_SIG_NORMAL )&& ( CAN_MSG_Status(&CAN_CH0_CanMsgOp, CAN_CH0_ID_can10F007E8_Msg_Count) == CAN_SIG_NORMAL )&&
(CanReceive.Can_18FE5BE8 == 1)&&(CanReceive.Can_10F007E8 == 1)) (CanReceive.Can_18FE5BE8 == 1)&&(CanReceive.Can_10F007E8 == 1))
{ {
if((Get_CAN_CH0_ID_18FE5BE8_Sig_Lane_Departure_Indication_Enable_Status() == 4)&&(Common_GetIgnOnTime( ) >= 10000)) if((Get_CAN_CH0_ID_18FE5BE8_Sig_Lane_Departure_Indication_Enable_Status() == 4)&&(Common_GetIgnOnTime( ) >= 10000))
{
if(u16PopLDWSTimeCount_3s_Failure < POP_LDWS_TIME_3S)
{ {
Pop_Alarm_Request_Normal(POP_ALARM_LDWS_FAILURE); Pop_Alarm_Request_Normal(POP_ALARM_LDWS_FAILURE);
} }
...@@ -1196,51 +1190,21 @@ void Popups_Alarm_Trigger_LDWS(void) ...@@ -1196,51 +1190,21 @@ void Popups_Alarm_Trigger_LDWS(void)
{ {
Pop_Alarm_Delete_Normal(POP_ALARM_LDWS_FAILURE, POP_DELAY_MIN); Pop_Alarm_Delete_Normal(POP_ALARM_LDWS_FAILURE, POP_DELAY_MIN);
} }
Pop_Alarm_Delete_Normal(POP_ALARM_LDWS_ATCIVE, POP_DELAY_MIN);
Pop_Alarm_Delete_Normal(POP_ALARM_LDWS_L_R, POP_DELAY_MIN); if((Get_CAN_CH0_ID_18FE5BE8_Sig_Lane_Departure_Indication_Enable_Status() == 3)&&
Pop_Alarm_Delete_Normal(POP_ALARM_LDWS_CLOSE, POP_DELAY_MIN); ((Get_CAN_CH0_ID_10F007E8_Sig_ADAS_LDWLeftWarning() == 1)||(Get_CAN_CH0_ID_10F007E8_Sig_ADAS_LDWRightWarning() == 1)))
u8PopAlarmLDWS = 0;
}
else
{
if((Get_CAN_CH0_ID_18FE5BE8_Sig_Lane_Departure_Indication_Enable_Status() == 3)&&(Get_CAN_CH0_ID_10F007E8_Sig_ADAS_LDWLeftWarning() == 1))
{
if(u16PopLDWSTimeCount_3s_L_R < POP_LDWS_TIME_3S)
{ {
Pop_Alarm_Request_Normal(POP_ALARM_LDWS_L_R); Pop_Alarm_Request_Normal(POP_ALARM_LDWS_L_R);
}
else
{
Pop_Alarm_Delete_Normal(POP_ALARM_LDWS_L_R, POP_DELAY_MIN);
}
Pop_Alarm_Delete_Normal(POP_ALARM_LDWS_CLOSE, POP_DELAY_MIN);
Pop_Alarm_Delete_Normal(POP_ALARM_LDWS_FAILURE, POP_DELAY_MIN);
Pop_Alarm_Delete_Normal(POP_ALARM_LDWS_ATCIVE, POP_DELAY_MIN);
u8PopAlarmLDWS = 1;//2hz u8PopAlarmLDWS = 1;//2hz
} }
else else
{ {
if((Get_CAN_CH0_ID_18FE5BE8_Sig_Lane_Departure_Indication_Enable_Status() == 3)&&(Get_CAN_CH0_ID_10F007E8_Sig_ADAS_LDWRightWarning() == 1)) u8PopAlarmLDWS = 0;
{
if(u16PopLDWSTimeCount_3s_L_R < POP_LDWS_TIME_3S)
{
Pop_Alarm_Request_Normal(POP_ALARM_LDWS_L_R);
}
else
{
Pop_Alarm_Delete_Normal(POP_ALARM_LDWS_L_R, POP_DELAY_MIN); Pop_Alarm_Delete_Normal(POP_ALARM_LDWS_L_R, POP_DELAY_MIN);
} }
Pop_Alarm_Delete_Normal(POP_ALARM_LDWS_CLOSE, POP_DELAY_MIN);
Pop_Alarm_Delete_Normal(POP_ALARM_LDWS_FAILURE, POP_DELAY_MIN);
Pop_Alarm_Delete_Normal(POP_ALARM_LDWS_ATCIVE, POP_DELAY_MIN);
u8PopAlarmLDWS = 1;//2hz
}
else
{
if((Get_CAN_CH0_ID_18FE5BE8_Sig_Lane_Departure_Indication_Enable_Status() == 2)&& if((Get_CAN_CH0_ID_18FE5BE8_Sig_Lane_Departure_Indication_Enable_Status() == 2)&&
(Get_CAN_CH0_ID_10F007E8_Sig_ADAS_LDWLeftWarning() == 0)&&(Get_CAN_CH0_ID_10F007E8_Sig_ADAS_LDWRightWarning() == 0)) (Get_CAN_CH0_ID_10F007E8_Sig_ADAS_LDWLeftWarning() == 0)&&(Get_CAN_CH0_ID_10F007E8_Sig_ADAS_LDWRightWarning() == 0))
{
if(u16PopLDWSTimeCount_3s_Atcive < POP_LDWS_TIME_3S)
{ {
Pop_Alarm_Request_Normal(POP_ALARM_LDWS_ATCIVE); Pop_Alarm_Request_Normal(POP_ALARM_LDWS_ATCIVE);
} }
...@@ -1248,16 +1212,8 @@ void Popups_Alarm_Trigger_LDWS(void) ...@@ -1248,16 +1212,8 @@ void Popups_Alarm_Trigger_LDWS(void)
{ {
Pop_Alarm_Delete_Normal(POP_ALARM_LDWS_ATCIVE, POP_DELAY_MIN); Pop_Alarm_Delete_Normal(POP_ALARM_LDWS_ATCIVE, POP_DELAY_MIN);
} }
Pop_Alarm_Delete_Normal(POP_ALARM_LDWS_CLOSE, POP_DELAY_MIN);
Pop_Alarm_Delete_Normal(POP_ALARM_LDWS_FAILURE, POP_DELAY_MIN);
Pop_Alarm_Delete_Normal(POP_ALARM_LDWS_L_R, POP_DELAY_MIN);
u8PopAlarmLDWS = 0;
}
else
{
if(Get_CAN_CH0_ID_18FE5BE8_Sig_Lane_Departure_Indication_Enable_Status() == 0) if(Get_CAN_CH0_ID_18FE5BE8_Sig_Lane_Departure_Indication_Enable_Status() == 0)
{
if(u16PopLDWSTimeCount_3s_Close < POP_LDWS_TIME_3S)
{ {
Pop_Alarm_Request_Normal(POP_ALARM_LDWS_CLOSE); Pop_Alarm_Request_Normal(POP_ALARM_LDWS_CLOSE);
} }
...@@ -1265,37 +1221,14 @@ void Popups_Alarm_Trigger_LDWS(void) ...@@ -1265,37 +1221,14 @@ void Popups_Alarm_Trigger_LDWS(void)
{ {
Pop_Alarm_Delete_Normal(POP_ALARM_LDWS_CLOSE, POP_DELAY_MIN); Pop_Alarm_Delete_Normal(POP_ALARM_LDWS_CLOSE, POP_DELAY_MIN);
} }
Pop_Alarm_Delete_Normal(POP_ALARM_LDWS_FAILURE, POP_DELAY_MIN);
Pop_Alarm_Delete_Normal(POP_ALARM_LDWS_ATCIVE, POP_DELAY_MIN);
Pop_Alarm_Delete_Normal(POP_ALARM_LDWS_L_R, POP_DELAY_MIN);
u8PopAlarmLDWS = 0;
} }
else else
{ {
Pop_Alarm_Delete_Normal(POP_ALARM_LDWS_FAILURE, POP_DELAY_MIN);
Pop_Alarm_Delete_Normal(POP_ALARM_LDWS_ATCIVE, POP_DELAY_MIN);
Pop_Alarm_Delete_Normal(POP_ALARM_LDWS_L_R, POP_DELAY_MIN);
Pop_Alarm_Delete_Normal(POP_ALARM_LDWS_CLOSE, POP_DELAY_MIN);
u8PopAlarmLDWS = 0;
}
}
}
}
}
}
else
{
CanReceive.Can_18FE5BE8 = 0;
CanReceive.Can_10F007E8 = 0;
Pop_Alarm_Delete_Normal(POP_ALARM_LDWS_CLOSE, POP_DELAY_MIN); Pop_Alarm_Delete_Normal(POP_ALARM_LDWS_CLOSE, POP_DELAY_MIN);
Pop_Alarm_Delete_Normal(POP_ALARM_LDWS_FAILURE, POP_DELAY_MIN); Pop_Alarm_Delete_Normal(POP_ALARM_LDWS_FAILURE, POP_DELAY_MIN);
Pop_Alarm_Delete_Normal(POP_ALARM_LDWS_ATCIVE, POP_DELAY_MIN); Pop_Alarm_Delete_Normal(POP_ALARM_LDWS_ATCIVE, POP_DELAY_MIN);
Pop_Alarm_Delete_Normal(POP_ALARM_LDWS_L_R, POP_DELAY_MIN); Pop_Alarm_Delete_Normal(POP_ALARM_LDWS_L_R, POP_DELAY_MIN);
u8PopAlarmLDWS = 0; u8PopAlarmLDWS = 0;
u16PopLDWSTimeCount_3s_Failure = 0U;
u16PopLDWSTimeCount_3s_L_R = 0;
u16PopLDWSTimeCount_3s_Close = 0;
u16PopLDWSTimeCount_3s_Atcive = 0;
} }
} }
else else
...@@ -1436,91 +1369,9 @@ void Popups_Alarm_Trigger_Time(void) ...@@ -1436,91 +1369,9 @@ void Popups_Alarm_Trigger_Time(void)
u16SafeBeltTime = 0U; u16SafeBeltTime = 0U;
u16SafeBeltMileage = 0U; u16SafeBeltMileage = 0U;
} }
if (Get_NodeConfig_LWDS() == 1)
{
if ( ((Common_GetIgnOnTime( ) <= SELF_CHECK_TIME) && (SYS_OPR_STAT_IGN_ON)) )
{
return;
}
if(Get_CAN_CH0_ID_18FE5BE8_Sig_Lane_Departure_Indication_Enable_Status() == 4)
{
if ( u16PopLDWSTimeCount_3s_Failure < POP_LDWS_TIME_3S )
{
u16PopLDWSTimeCount_3s_Failure++;
}
u16PopLDWSTimeCount_3s_L_R = 0;
u16PopLDWSTimeCount_3s_Close = 0;
u16PopLDWSTimeCount_3s_Atcive = 0;
}
else
{
u16PopLDWSTimeCount_3s_Failure = 0U;
}
if(((Get_CAN_CH0_ID_18FE5BE8_Sig_Lane_Departure_Indication_Enable_Status() == 3)&&(Get_CAN_CH0_ID_10F007E8_Sig_ADAS_LDWLeftWarning() == 1))||
((Get_CAN_CH0_ID_18FE5BE8_Sig_Lane_Departure_Indication_Enable_Status() == 3)&&(Get_CAN_CH0_ID_10F007E8_Sig_ADAS_LDWRightWarning() == 1)))
{
if ( u16PopLDWSTimeCount_3s_L_R < POP_LDWS_TIME_3S )
{
u16PopLDWSTimeCount_3s_L_R++;
}
u16PopLDWSTimeCount_3s_Failure = 0U;
u16PopLDWSTimeCount_3s_Close = 0;
u16PopLDWSTimeCount_3s_Atcive = 0;
}
else
{
u16PopLDWSTimeCount_3s_L_R = 0U;
}
if((Get_CAN_CH0_ID_18FE5BE8_Sig_Lane_Departure_Indication_Enable_Status() == 2)&&
(Get_CAN_CH0_ID_10F007E8_Sig_ADAS_LDWLeftWarning() == 0)&&(Get_CAN_CH0_ID_10F007E8_Sig_ADAS_LDWRightWarning() == 0))
{
if ( u16PopLDWSTimeCount_3s_Atcive < POP_LDWS_TIME_3S )
{
u16PopLDWSTimeCount_3s_Atcive++;
}
u16PopLDWSTimeCount_3s_Failure = 0U;
u16PopLDWSTimeCount_3s_L_R = 0;
u16PopLDWSTimeCount_3s_Close = 0;
} }
else else
{ {
u16PopLDWSTimeCount_3s_Atcive = 0U;
}
if(Get_CAN_CH0_ID_18FE5BE8_Sig_Lane_Departure_Indication_Enable_Status() == 0)
{
if ( u16PopLDWSTimeCount_3s_Close < POP_LDWS_TIME_3S )
{
u16PopLDWSTimeCount_3s_Close++;
}
u16PopLDWSTimeCount_3s_Failure = 0U;
u16PopLDWSTimeCount_3s_L_R = 0;
u16PopLDWSTimeCount_3s_Atcive = 0;
}
else
{
u16PopLDWSTimeCount_3s_Close = 0U;
}
}
else
{
u16PopLDWSTimeCount_3s_Failure = 0U;
u16PopLDWSTimeCount_3s_L_R = 0;
u16PopLDWSTimeCount_3s_Close = 0;
u16PopLDWSTimeCount_3s_Atcive = 0;
}
}
else
{
u16PopLDWSTimeCount_3s_Failure = 0U;
u16PopLDWSTimeCount_3s_L_R = 0;
u16PopLDWSTimeCount_3s_Atcive = 0;
u16PopLDWSTimeCount_3s_Close = 0U;
u16PopDPFTimeCount = 0U; u16PopDPFTimeCount = 0U;
u16PopEngLubriTimeCount = 0U; u16PopEngLubriTimeCount = 0U;
u16PopTPMSConfigTimeCount_0x12U = 0U; u16PopTPMSConfigTimeCount_0x12U = 0U;
......
source/Appliciation/Popup_Alarm_user.c
View file @ a8a5b7c5
...@@ -10,6 +10,7 @@ const Popup_Alarm_Group_Attribute_st_t stPopAlarmGroupAttribute [ POP_GROUP_MAX ...@@ -10,6 +10,7 @@ const Popup_Alarm_Group_Attribute_st_t stPopAlarmGroupAttribute [ POP_GROUP_MAX
#pragma alignvar(8) #pragma alignvar(8)
const Popup_Alarm_Type_Attribute_st_t stPopAlarmTypeAttribute [ POP_TYPE_MAX ] = { const Popup_Alarm_Type_Attribute_st_t stPopAlarmTypeAttribute [ POP_TYPE_MAX ] = {
{POPUP_DISPLAY_CYCLY, POPUP_DISPLAY_FIX, POP_DELAY_MIN, POP_RECOVER_CYCLE, POP_SORTORD_FIRST, 10, 30, 30, 0, POP_ALLOW_HIDE_FIRST_CYCLE}, {POPUP_DISPLAY_CYCLY, POPUP_DISPLAY_FIX, POP_DELAY_MIN, POP_RECOVER_CYCLE, POP_SORTORD_FIRST, 10, 30, 30, 0, POP_ALLOW_HIDE_FIRST_CYCLE},
{POPUP_DISPLAY_CYCLY, POPUP_DISPLAY_FIX, POP_DELAY_MIN, POP_RECOVER_CYCLE, POP_SORTORD_FIRST, 10, 30, 0, 0, POP_ALLOW_HIDE_FIRST_CYCLE},
}; };
#pragma alignvar(8) #pragma alignvar(8)
...@@ -52,10 +53,10 @@ const Popup_Alarm_Attribute_st_t stPopAlarmAttribute [ POP_ALARM_MAX ] = { ...@@ -52,10 +53,10 @@ const Popup_Alarm_Attribute_st_t stPopAlarmAttribute [ POP_ALARM_MAX ] = {
/* POP_ALARM_RADAR_FAILURE */ {POP_GROUP_0, POP_TYPE_0, POP_ALARM_RADAR_FAILURE, POP_ALARM_RADAR_FAILURE + POP_ALARM_MAX, 0xFFU}, /* POP_ALARM_RADAR_FAILURE */ {POP_GROUP_0, POP_TYPE_0, POP_ALARM_RADAR_FAILURE, POP_ALARM_RADAR_FAILURE + POP_ALARM_MAX, 0xFFU},
/* POP_ALARM_GEARBOX_CAUTION */ {POP_GROUP_0, POP_TYPE_0, POP_ALARM_GEARBOX_CAUTION, POP_ALARM_GEARBOX_CAUTION + POP_ALARM_MAX, SOUND_ALARM_GEARBOX_CAUTION}, /* POP_ALARM_GEARBOX_CAUTION */ {POP_GROUP_0, POP_TYPE_0, POP_ALARM_GEARBOX_CAUTION, POP_ALARM_GEARBOX_CAUTION + POP_ALARM_MAX, SOUND_ALARM_GEARBOX_CAUTION},
/* POP_ALARM_GEARBOX_HIGH_TEMP */ {POP_GROUP_0, POP_TYPE_0, POP_ALARM_GEARBOX_HIGH_TEMP, POP_ALARM_GEARBOX_HIGH_TEMP + POP_ALARM_MAX, 0xFFU}, /* POP_ALARM_GEARBOX_HIGH_TEMP */ {POP_GROUP_0, POP_TYPE_0, POP_ALARM_GEARBOX_HIGH_TEMP, POP_ALARM_GEARBOX_HIGH_TEMP + POP_ALARM_MAX, 0xFFU},
/* POP_ALARM_LDWS_CLOSE */ {POP_GROUP_0, POP_TYPE_0, POP_ALARM_LDWS_CLOSE, POP_ALARM_LDWS_CLOSE + POP_ALARM_MAX, 0xFFU}, /* POP_ALARM_LDWS_CLOSE */ {POP_GROUP_0, POP_TYPE_1, POP_ALARM_LDWS_CLOSE, POP_ALARM_LDWS_CLOSE + POP_ALARM_MAX, 0xFFU},
/* POP_ALARM_LDWS_FAILURE */ {POP_GROUP_0, POP_TYPE_0, POP_ALARM_LDWS_FAILURE, POP_ALARM_LDWS_FAILURE + POP_ALARM_MAX, 0xFFU}, /* POP_ALARM_LDWS_FAILURE */ {POP_GROUP_0, POP_TYPE_1, POP_ALARM_LDWS_FAILURE, POP_ALARM_LDWS_FAILURE + POP_ALARM_MAX, 0xFFU},
/* POP_ALARM_LDWS_ATCIVE */ {POP_GROUP_0, POP_TYPE_0, POP_ALARM_LDWS_ATCIVE, POP_ALARM_LDWS_ATCIVE + POP_ALARM_MAX, 0xFFU}, /* POP_ALARM_LDWS_ATCIVE */ {POP_GROUP_0, POP_TYPE_1, POP_ALARM_LDWS_ATCIVE, POP_ALARM_LDWS_ATCIVE + POP_ALARM_MAX, 0xFFU},
/* POP_ALARM_LDWS_L_R */ {POP_GROUP_0, POP_TYPE_0, POP_ALARM_LDWS_L_R, POP_ALARM_LDWS_L_R + POP_ALARM_MAX, SOUND_ALARM_LDWS}, /* POP_ALARM_LDWS_L_R */ {POP_GROUP_0, POP_TYPE_1, POP_ALARM_LDWS_L_R, POP_ALARM_LDWS_L_R + POP_ALARM_MAX, SOUND_ALARM_LDWS},
/* POP_ALARM_HILL_HOLD_MALF */ {POP_GROUP_0, POP_TYPE_0, POP_ALARM_HILL_HOLD_MALF, POP_ALARM_HILL_HOLD_MALF + POP_ALARM_MAX, SOUND_ALARM_HILL_HOLD_MALF}, /* POP_ALARM_HILL_HOLD_MALF */ {POP_GROUP_0, POP_TYPE_0, POP_ALARM_HILL_HOLD_MALF, POP_ALARM_HILL_HOLD_MALF + POP_ALARM_MAX, SOUND_ALARM_HILL_HOLD_MALF},
/* POP_ALARM_POSITION_LIGHT */ {POP_GROUP_0, POP_TYPE_0, POP_ALARM_POSITION_LIGHT, POP_ALARM_POSITION_LIGHT + POP_ALARM_MAX, 0xFFU}, /* POP_ALARM_POSITION_LIGHT */ {POP_GROUP_0, POP_TYPE_0, POP_ALARM_POSITION_LIGHT, POP_ALARM_POSITION_LIGHT + POP_ALARM_MAX, 0xFFU},
/* POP_ALARM_KEY */ {POP_GROUP_0, POP_TYPE_0, POP_ALARM_KEY, POP_ALARM_KEY + POP_ALARM_MAX, 0xFFU}, /* POP_ALARM_KEY */ {POP_GROUP_0, POP_TYPE_0, POP_ALARM_KEY, POP_ALARM_KEY + POP_ALARM_MAX, 0xFFU},
......
source/Appliciation/Sound_Alarm_handle.c
View file @ a8a5b7c5
...@@ -20,19 +20,10 @@ void Sound_Alarm_Trigger_DOOR(void) ...@@ -20,19 +20,10 @@ void Sound_Alarm_Trigger_DOOR(void)
void Sound_Alarm_Trigger_LDWS(void) void Sound_Alarm_Trigger_LDWS(void)
{ {
if (( SYS_OPR_STAT_IGN_ON )&&(Get_NodeConfig_LWDS() == 1)) if (( SYS_OPR_STAT_IGN_ON )&&(Get_NodeConfig_LWDS() == 1))
{
if(( CAN_MSG_Status(&CAN_CH0_CanMsgOp, CAN_CH0_ID_can18FE5BE8_Msg_Count) == CAN_SIG_NORMAL )&&
( CAN_MSG_Status(&CAN_CH0_CanMsgOp, CAN_CH0_ID_can10F007E8_Msg_Count) == CAN_SIG_NORMAL )&&
(CanReceive.Can_18FE5BE8 == 1)&&(CanReceive.Can_10F007E8 == 1))
{ {
if( u8PopAlarmLDWS ) if( u8PopAlarmLDWS )
{ {
Sound_Alarm_Request_Normal(SOUND_ALARM_LDWS); //Sound_Alarm_Request_Normal(SOUND_ALARM_LDWS);
}
else
{
Sound_Alarm_Delete_Normal(SOUND_ALARM_LDWS);
}
} }
else else
{ {
......
source/Appliciation/Telltales_user.c
View file @ a8a5b7c5
...@@ -1803,6 +1803,10 @@ Tellib_uint16_t LED_LDWS_Lamp_Judge(void) ...@@ -1803,6 +1803,10 @@ Tellib_uint16_t LED_LDWS_Lamp_Judge(void)
{ {
res = 0u; res = 0u;
} }
else
{
res = 0u;
}
} }
} }
} }
......
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