Commit 34e20e5d authored by 崔立宝's avatar 崔立宝

变更项5,增加“车道偏离预警开启”弹出报警

parent f084c604
......@@ -52,6 +52,8 @@ void Popups_Management_Service(void)
IO_Popups_Display_Release();
}
uint8_t POPUP_LDW_Time;
void Popups_Polling(void)
{
if ((IO_DISPLAY_MODE == IO_DISP_MODE_IGN_ON) &&(IO_DISP_TEST_OFF_TIME >= 10) )
......@@ -177,6 +179,32 @@ void Popups_Polling(void)
Popup_Request(POPUP_LowPress_ReleaseLimit);
else
Popup_Delete(POPUP_LowPress_ReleaseLimit); //低压释放限制状态
if ((AEBS_LaneDepartureWarningSystemState == 0x3) || (AEBS_LaneDepartureWarningSystemState == 0x5))
{
if (POPUP_LDW_Time < 50)
{
Popup_Request(POPUP_LDW_WarningSystem);
}
else
{
Popup_Delete(POPUP_LDW_WarningSystem); //车道偏离预警开启
}
if (Popup_Get_Current_Message() == POPUP_MSG_LDW_WarningSystem)
{
if (POPUP_LDW_Time < 50)
{
POPUP_LDW_Time++;
}
}
}
else
{
Popup_Delete(POPUP_LDW_WarningSystem); //车道偏离预警开启
POPUP_LDW_Time = 0;
}
#if 0
if (IO_DISP_TEST_OFF_TIME > 102)
{
......@@ -331,6 +359,8 @@ void Popups_Polling(void)
Popup_Clear(POPUP_LowPress_ReleaseLimit); // 低压释放限制状态
Sound_Delete(SND_noKeyInCar);
Sound_Delete(SND_POffWithoutN);
Popup_Delete(POPUP_LDW_WarningSystem); //车道偏离预警开启
POPUP_LDW_Time = 0;
if (SYS_IGN_OFF_DISP_MODE)
{
......
......@@ -41,6 +41,7 @@ enum PopupName
POPUP_LowPRESSURE_Right, // Tire pressure low
POPUP_TireIDStudy_Left, // 左轮ID未学习
POPUP_TireIDStudy_Right, // 右轮ID未学习
POPUP_LDW_WarningSystem, // 车道偏离预警开启
};
#define POPUP_NONE 0xFF //无报警
......@@ -140,6 +141,7 @@ static const PopupAttributeStruct PopupAttributeTable[] =
{/* POPUP_LowPRESSURE_Right, */ POPUP_TYPE_WARNING, 0, POPUP_LowPRESSURE_Right, NULL, 1, POPUP_MSG_LowPRESSURE_Right, POPUP_MODE_MULTI, SND_NONE , POPUP_MODE_SINGLE,},
{/* POPUP_TireIDStudy_Left, */ POPUP_TYPE_WARNING, 0, POPUP_TireIDStudy_Left, NULL, 1, POPUP_MSG_TireIDStudy_Left, POPUP_MODE_MULTI, SND_NONE , POPUP_MODE_SINGLE,},
{/* POPUP_TireIDStudy_Right, */ POPUP_TYPE_WARNING, 0, POPUP_TireIDStudy_Right, NULL, 1, POPUP_MSG_TireIDStudy_Right, POPUP_MODE_MULTI, SND_NONE , POPUP_MODE_SINGLE,},
{/* POPUP_LDW_WarningSystem, */ POPUP_TYPE_WARNING, 2, POPUP_LDW_WarningSystem, NULL, 1, POPUP_MSG_LDW_WarningSystem, POPUP_MODE_MULTI, SND_NONE , POPUP_MODE_SINGLE,},
/*=============================================================================================================================================================================================================================================================================*/
};
......@@ -150,7 +152,7 @@ static const PopupAttributeStruct PopupAttributeTable[] =
#define POPUP_NUMBER_TOTAL (sizeof(PopupAttributeTable) / sizeof(PopupAttributeStruct))
#define POPUP_NUMBER_FATAL 1
#define POPUP_NUMBER_HINT 1
#define POPUP_NUMBER_WARNING 25
#define POPUP_NUMBER_WARNING 26
#define POPUP_PRIORITY_NUMBER_FATAL 1
#define POPUP_PRIORITY_NUMBER_HINT 1
......
......@@ -34,7 +34,7 @@ enum PopupMessageName
POPUP_MSG_LowPRESSURE_Right,
POPUP_MSG_TireIDStudy_Left,
POPUP_MSG_TireIDStudy_Right,
POPUP_MSG_LDW_WarningSystem,
};
/******************************************************************************
......@@ -105,7 +105,8 @@ static const PopupMsgAttributeStruct PopupMsgAttributeTable[] =
{ /* POPUP_MSG_HighPRESSURE_Right, */ POPUP_TYPE_TPMS,}, //
{ /* POPUP_MSG_LowPRESSURE_Right, */ POPUP_TYPE_TPMS,}, //
{ /* POPUP_MSG_TireIDStudy_Left, */ POPUP_TYPE_TPMS,}, //
{ /* POPUP_MSG_TireIDStudy_Right, */ POPUP_TYPE_TPMS,}, //
{ /* POPUP_MSG_TireIDStudy_Right, */ POPUP_TYPE_TPMS,}, //
{ /* POPUP_MSG_LDW_WarningSystem, */ POPUP_TYPE_GENERAL,}, //
/*===========================================================*/
};
......
......@@ -359,9 +359,10 @@ void GUI_General_Popup_Display(uint8_t PopupID)
// TFT_LCD_Display_Sprite(LAYER_MENU01, GUIGeneralPopupTable[PopupID].HImage, 266, 162, 64);
TFT_LCD_Clear_Multi_Layer(LAYER_MENU01, LAYER_MENU12);
if (PopupID == POPUP_MSG_POWEROFF_WithoutN)
if (PopupID == POPUP_MSG_LDW_WarningSystem)
TFT_LCD_Display_Sprite(LAYER_MENU13, SN_zz_ALARM_88_png, 285, 179, 64); //故障文字
else if (PopupID == POPUP_MSG_POWEROFF_WithoutN)
TFT_LCD_Display_Sprite(LAYER_MENU13, GUIGeneralPopupTable[PopupID].HImage, 266, 162, 64);
else if ((PopupID == POPUP_MSG_Press_Brake_Start) || (PopupID == POPUP_MSG_Press_clutch_Start)
|| (PopupID == POPUP_MSG_N_Level_Start) || (PopupID == POPUP_MSG_Key_Battery_Low) || (PopupID == POPUP_MSG_Key_Not_Found))
TFT_LCD_Display_Sprite(LAYER_MENU13, GUIGeneralPopupTable[PopupID].HImage, 265, 140, 64);
......
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