Skip to content

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

修改左右偏离独立触发

parent 1bff54df
Show whitespace changes
Inline Side-by-side
Showing with 46 additions and 38 deletions
source/Appliciation/Display/GUI.c
View file @ 245b6dce
...@@ -887,9 +887,7 @@ void GUI_PopAlarm_Display(INT16U PopupAlarmDis) ...@@ -887,9 +887,7 @@ void GUI_PopAlarm_Display(INT16U PopupAlarmDis)
Draw_Image_Local(( uint8_t * )Alarm_CN_17_X23_Y139, 23, 139); Draw_Image_Local(( uint8_t * )Alarm_CN_17_X23_Y139, 23, 139);
break; break;
} }
case POP_ALARM_LDWS_L_R: case POP_ALARM_LDWS_L:
{
if(Get_CAN_CH0_ID_10F007E8_Sig_ADAS_LDWLeftWarning() == 1)
{ {
if ( g_LED.LedBlink_2HZ ) if ( g_LED.LedBlink_2HZ )
{ {
...@@ -897,10 +895,9 @@ void GUI_PopAlarm_Display(INT16U PopupAlarmDis) ...@@ -897,10 +895,9 @@ void GUI_PopAlarm_Display(INT16U PopupAlarmDis)
} }
Draw_Image_Local(( uint8_t * )Alarm_ICON_12_2_X94_Y101, 94, 101); Draw_Image_Local(( uint8_t * )Alarm_ICON_12_2_X94_Y101, 94, 101);
Draw_Image_Local(( uint8_t * )Alarm_CN_12_X39_Y172, 39, 172); Draw_Image_Local(( uint8_t * )Alarm_CN_12_X39_Y172, 39, 172);
break;
} }
else case POP_ALARM_LDWS_R:
{
if(Get_CAN_CH0_ID_10F007E8_Sig_ADAS_LDWRightWarning() == 1)
{ {
if ( g_LED.LedBlink_2HZ ) if ( g_LED.LedBlink_2HZ )
{ {
...@@ -908,8 +905,6 @@ void GUI_PopAlarm_Display(INT16U PopupAlarmDis) ...@@ -908,8 +905,6 @@ void GUI_PopAlarm_Display(INT16U PopupAlarmDis)
} }
Draw_Image_Local(( uint8_t * )Alarm_ICON_12_3_X94_Y101, 94, 101); Draw_Image_Local(( uint8_t * )Alarm_ICON_12_3_X94_Y101, 94, 101);
Draw_Image_Local(( uint8_t * )Alarm_CN_12_X39_Y172, 39, 172); Draw_Image_Local(( uint8_t * )Alarm_CN_12_X39_Y172, 39, 172);
}
}
break; break;
} }
case POP_ALARM_HILL_HOLD_MALF: case POP_ALARM_HILL_HOLD_MALF:
......
source/Appliciation/Popup_Alarm.h
View file @ 245b6dce
...@@ -58,7 +58,8 @@ typedef enum ...@@ -58,7 +58,8 @@ typedef enum
POP_ALARM_LDWS_CLOSE, /* LDWS功能关闭 */ POP_ALARM_LDWS_CLOSE, /* LDWS功能关闭 */
POP_ALARM_LDWS_FAILURE, /* LDWS功能故障 */ POP_ALARM_LDWS_FAILURE, /* LDWS功能故障 */
POP_ALARM_LDWS_ATCIVE, /* LDWS功能激活 */ POP_ALARM_LDWS_ATCIVE, /* LDWS功能激活 */
POP_ALARM_LDWS_L_R, /* LDWS左右偏离 */ POP_ALARM_LDWS_L, /* LDWS左右偏离 */
POP_ALARM_LDWS_R, /* LDWS左右偏离 */
POP_ALARM_HILL_HOLD_MALF, /* 坡道保持故障 */ POP_ALARM_HILL_HOLD_MALF, /* 坡道保持故障 */
POP_ALARM_POSITION_LIGHT, /* 位置灯未关，请检查 */ POP_ALARM_POSITION_LIGHT, /* 位置灯未关，请检查 */
POP_ALARM_KEY, /* 车辆钥匙请随身携带 */ POP_ALARM_KEY, /* 车辆钥匙请随身携带 */
......
source/Appliciation/Popup_Alarm_Handle.c
View file @ 245b6dce
...@@ -1173,7 +1173,8 @@ void Popups_Alarm_Trigger_DOOR(void) ...@@ -1173,7 +1173,8 @@ void Popups_Alarm_Trigger_DOOR(void)
Pop_uint8_t u8PopAlarmLDWS = 0; Pop_uint8_t u8PopAlarmLDWS_L = 0;
Pop_uint8_t u8PopAlarmLDWS_R = 0;
void Popups_Alarm_Trigger_LDWS(void) void Popups_Alarm_Trigger_LDWS(void)
{ {
if (( SYS_OPR_STAT_IGN_ON )&&(Get_NodeConfig_LWDS() == 1)) if (( SYS_OPR_STAT_IGN_ON )&&(Get_NodeConfig_LWDS() == 1))
...@@ -1191,16 +1192,26 @@ void Popups_Alarm_Trigger_LDWS(void) ...@@ -1191,16 +1192,26 @@ 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);
} }
if((Get_CAN_CH0_ID_18FE5BE8_Sig_Lane_Departure_Indication_Enable_Status() == 3)&& 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_10F007E8_Sig_ADAS_LDWLeftWarning() == 1)||(Get_CAN_CH0_ID_10F007E8_Sig_ADAS_LDWRightWarning() == 1)))
{ {
Pop_Alarm_Request_Normal(POP_ALARM_LDWS_L_R); Pop_Alarm_Request_Normal(POP_ALARM_LDWS_L);
u8PopAlarmLDWS = 1;//2hz u8PopAlarmLDWS_L = 1;//2hz
} }
else else
{ {
u8PopAlarmLDWS = 0; u8PopAlarmLDWS_L = 0;
Pop_Alarm_Delete_Normal(POP_ALARM_LDWS_L_R, POP_DELAY_MIN); Pop_Alarm_Delete_Normal(POP_ALARM_LDWS_L, POP_DELAY_MIN);
}
if((Get_CAN_CH0_ID_18FE5BE8_Sig_Lane_Departure_Indication_Enable_Status() == 3)&&(Get_CAN_CH0_ID_10F007E8_Sig_ADAS_LDWRightWarning() == 1))
{
Pop_Alarm_Request_Normal(POP_ALARM_LDWS_R);
u8PopAlarmLDWS_R = 1;//2hz
}
else
{
u8PopAlarmLDWS_R = 0;
Pop_Alarm_Delete_Normal(POP_ALARM_LDWS_R, POP_DELAY_MIN);
} }
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)&&
...@@ -1227,8 +1238,10 @@ void Popups_Alarm_Trigger_LDWS(void) ...@@ -1227,8 +1238,10 @@ 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_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, POP_DELAY_MIN);
u8PopAlarmLDWS = 0; Pop_Alarm_Delete_Normal(POP_ALARM_LDWS_R, POP_DELAY_MIN);
u8PopAlarmLDWS_R = 0;
u8PopAlarmLDWS_L = 0;
} }
} }
else else
...@@ -1236,8 +1249,10 @@ void Popups_Alarm_Trigger_LDWS(void) ...@@ -1236,8 +1249,10 @@ 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_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, POP_DELAY_MIN);
u8PopAlarmLDWS = 0; Pop_Alarm_Delete_Normal(POP_ALARM_LDWS_R, POP_DELAY_MIN);
u8PopAlarmLDWS_R = 0;
u8PopAlarmLDWS_L = 0;
} }
} }
......
source/Appliciation/Popup_Alarm_Handle.h
View file @ 245b6dce
...@@ -40,8 +40,8 @@ extern Pop_uint8_t u8PopAlarmEmissionFailLimit75 ; ...@@ -40,8 +40,8 @@ extern Pop_uint8_t u8PopAlarmEmissionFailLimit75 ;
extern Pop_uint8_t u8PopAlarmLimit75Service ; extern Pop_uint8_t u8PopAlarmLimit75Service ;
extern Pop_uint8_t u8PopAlarmEmissionFailReset20 ; extern Pop_uint8_t u8PopAlarmEmissionFailReset20 ;
extern Pop_uint8_t u8PopAlarmEmissionFail20 ; extern Pop_uint8_t u8PopAlarmEmissionFail20 ;
extern Pop_uint8_t u8PopAlarmLDWS; extern Pop_uint8_t u8PopAlarmLDWS_L;
extern Pop_uint8_t u8PopAlarmLDWS_R;
......
source/Appliciation/Popup_Alarm_user.c
View file @ 245b6dce
...@@ -56,7 +56,8 @@ const Popup_Alarm_Attribute_st_t stPopAlarmAttribute [ POP_ALARM_MAX ] = { ...@@ -56,7 +56,8 @@ const Popup_Alarm_Attribute_st_t stPopAlarmAttribute [ POP_ALARM_MAX ] = {
/* 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_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_1, 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_1, 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_1, POP_ALARM_LDWS_L_R, POP_ALARM_LDWS_L_R + POP_ALARM_MAX, SOUND_ALARM_LDWS}, /* POP_ALARM_LDWS_L */ {POP_GROUP_0, POP_TYPE_1, POP_ALARM_LDWS_L, POP_ALARM_LDWS_L + POP_ALARM_MAX, SOUND_ALARM_LDWS},
/* POP_ALARM_LDWS_R */ {POP_GROUP_0, POP_TYPE_1, POP_ALARM_LDWS_R, POP_ALARM_LDWS_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 @ 245b6dce
...@@ -21,11 +21,7 @@ void Sound_Alarm_Trigger_LDWS(void) ...@@ -21,11 +21,7 @@ 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( u8PopAlarmLDWS ) if(( u8PopAlarmLDWS_L == 0)&&(u8PopAlarmLDWS_R == 0))
{
//Sound_Alarm_Request_Normal(SOUND_ALARM_LDWS);
}
else
{ {
Sound_Alarm_Delete_Normal(SOUND_ALARM_LDWS); Sound_Alarm_Delete_Normal(SOUND_ALARM_LDWS);
} }
......
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