Skip to content

V
VC66_7C
Commit 411f87f0 authored by hu's avatar hu
Browse files
Options

调整报警逻辑，显示状态

parent bc1ecddc
Hide whitespace changes
Inline Side-by-side
Showing with 221 additions and 121 deletions
source/Application/Alarm/Popups.c
View file @ 411f87f0
......@@ -24,15 +24,18 @@ void Popups_Management_Service(void)
Popups_Polling( );
}
uint16_t hyq = 0u;
void Popups_Polling(void)
{
uint16_t i = 0u;
uint32_t u32IG_OFF_Timer = 0u;
uint32_t u32IG_ON_Timer = 0u;
uint16_t i = 0x00u;
uint32_t u32IG_OFF_Timer = 0x00u;
uint32_t u32IG_ON_Timer = 0x00u;
COMMON_PowerStatus_t u8IG_st;
uint8_t Can_BusOFF = 0u;
uint8_t Can_BusOFF = 0x00u;
uint8_t variable_1 = 0x00u;
uint8_t variable_2 = 0x00u;
uint8_t variable_3 = 0x00u;
u32IG_ON_Timer = Common_GetIgnOnTime( );
u32IG_OFF_Timer = Common_GetIgnOffTime( );
......@@ -58,127 +61,210 @@ void Popups_Polling(void)
if ( u8IG_st == COMMON_POWER_ON )
{
/*----第一组---------------------------------------------------------------------*/
/*0.紧急警报-刹车*/
if (hyq)
if (K_Line_Set.K_Line_LID28 == 0x01u)
{
Popup_Request(POPUP1_BRAKE_BLACK);
/*0.紧急警报-刹车*/
variable_1 = Get_ID_CF02F2A_Sig_Advanced_Emerg_Braking_Sys_Sta();
variable_2 = Get_ID_CF02FA0_Sig_Advanced_Emerg_Braking_Sys_Sta();
if ((variable_1 == 0x07u) || (variable_2 == 0x07u))
{
Popup_Request(POPUP1_BRAKE_BLACK);
Popup_Clear(POPUP1_BRAKE_BRAKE);
Popup_Clear(POPUP1_BRAKE_SPACING_R);
Popup_Clear(POPUP1_BRAKE_SPACING_COLLISION);
Popup_Clear(POPUP1_BRAKE_SPACING_Y);
return ;
}
else
{
Popup_Delete(POPUP1_BRAKE_BLACK);
}
/*1.紧急警报-紧急制动*/
variable_1 = Get_ID_CF02FA1_Sig_Advanced_Emerg_Braking_Sys_Sta();
if (variable_1 == 0x07u)
{
Popup_Request(POPUP1_BRAKE_BRAKE);
Popup_Clear(POPUP1_BRAKE_SPACING_R);
Popup_Clear(POPUP1_BRAKE_SPACING_COLLISION);
Popup_Clear(POPUP1_BRAKE_SPACING_Y);
return ;
}
else
{
Popup_Delete(POPUP1_BRAKE_BRAKE);
}
/*2.车间距警报-刹车(红字)*/
variable_1 = Get_ID_CF02F2A_Sig_Advanced_Emerg_Braking_Sys_Sta();
variable_2 = Get_ID_CF02FA0_Sig_Advanced_Emerg_Braking_Sys_Sta();
if ((variable_1 == 0x06u) || (variable_2 == 0x06u))
{
Popup_Request(POPUP1_BRAKE_SPACING_R);
Popup_Clear(POPUP1_BRAKE_SPACING_COLLISION);
Popup_Clear(POPUP1_BRAKE_SPACING_Y);
return ;
}
else
{
Popup_Delete(POPUP1_BRAKE_SPACING_R);
}
/*3.车间距警报-碰撞报警*/
variable_1 = Get_ID_CF02FA1_Sig_Advanced_Emerg_Braking_Sys_Sta();
if (variable_1 == 0x06u)
{
Popup_Request(POPUP1_BRAKE_SPACING_COLLISION);
Popup_Clear(POPUP1_BRAKE_SPACING_Y);
return ;
}
else
{
Popup_Delete(POPUP1_BRAKE_SPACING_COLLISION);
}
/*4.车间距警报-刹车(黄字)*/
variable_1 = Get_ID_CF02F2A_Sig_Advanced_Emerg_Braking_Sys_Sta();
variable_2 = Get_ID_CF02FA0_Sig_Advanced_Emerg_Braking_Sys_Sta();
if ((variable_1 == 0x05u) || (variable_2 == 0x05u))
{
Popup_Request(POPUP1_BRAKE_SPACING_Y);
return ;
}
else
{
Popup_Delete(POPUP1_BRAKE_SPACING_Y);
}
}
else
{
Popup_Delete(POPUP1_BRAKE_BLACK);
Popup_Clear(POPUP1_BRAKE_BLACK);
Popup_Clear(POPUP1_BRAKE_BRAKE);
Popup_Clear(POPUP1_BRAKE_SPACING_R);
Popup_Clear(POPUP1_BRAKE_SPACING_COLLISION);
Popup_Clear(POPUP1_BRAKE_SPACING_Y);
}
}
else /*ig off*/
{
Popup_Clear(POPUP1_BRAKE_BLACK);
}
}
#if 0
//0.紧急警报-刹车
variable_1 = Get_ID_CF02F2A_Sig_Advanced_Emerg_Braking_Sys_Sta();
variable_2 = Get_ID_CF02FA0_Sig_Advanced_Emerg_Braking_Sys_Sta();
if (EOL == 0x01)
{
if (variable_1 == 7 || variable_2 == 7)
{
Popup_Request(POPUP1_BRAKE_BLACK);
}
else
{
Popup_Delete(POPUP1_BRAKE_BLACK);
}
}
else
{
Popup_Delete(POPUP1_BRAKE_BLACK);
}
/*5.ASR工作*/
variable_1 = Get_ID_18F0010B_Sig_ATC_or_ASR_Lamp_State();
//1.紧急警报-紧急制动
variable_1 = Get_ID_CF02FA1_Sig_Advanced_Emerg_Braking_Sys_Sta();
if (EOL == 0x01)
{
if (variable_1 == 7)
{
Popup_Request(POPUP1_BRAKE_BRAKE);
}
else
{
Popup_Delete(POPUP1_BRAKE_BRAKE);
}
}
else
{
Popup_Delete(POPUP1_BRAKE_BRAKE);
}
//2.车间距警报-刹车(红字)
variable_1 = Get_ID_CF02F2A_Sig_Advanced_Emerg_Braking_Sys_Sta();
variable_2 = Get_ID_CF02FA0_Sig_Advanced_Emerg_Braking_Sys_Sta();
if (EOL == 0x01)
{
if (variable_1 == 6 || variable_2 == 6)
{
Popup_Request(POPUP1_BRAKE_SPACING_R);
}
else
{
Popup_Delete(POPUP1_BRAKE_SPACING_R);
}
}
else
{
Popup_Delete(POPUP1_BRAKE_SPACING_R);
}
//3.车间距警报-碰撞报警
variable_1 = Get_ID_CF02FA1_Sig_Advanced_Emerg_Braking_Sys_Sta();
if (EOL == 0x01)
{
if (variable_1 == 6)
{
Popup_Request(POPUP1_BRAKE_SPACING_COLLISION );
}
else
{
Popup_Delete(POPUP1_BRAKE_SPACING_COLLISION );
}
}
else
{
Popup_Delete(POPUP1_BRAKE_SPACING_COLLISION );
}
if (variable_1 == 0x01u)
{
Popup_Request(POPUT1_ASR_OPERATE);
}
else
{
Popup_Delete(POPUT1_ASR_OPERATE);
}
//4.车间距警报-刹车(黄字)
variable_1 = Get_ID_CF02F2A_Sig_Advanced_Emerg_Braking_Sys_Sta();
variable_2 = Get_ID_CF02FA0_Sig_Advanced_Emerg_Braking_Sys_Sta();
if (EOL == 0x01)
{
if (variable_1 == 5 || variable_2 == 5)
{
Popup_Request(POPUP1_BRAKE_SPACING_Y);
}
else
else /*ig off*/
{
Popup_Delete(POPUP1_BRAKE_SPACING_Y);
Popup_Clear(POPUP1_BRAKE_BLACK);/*00.紧急警报-刹车*/
Popup_Clear(POPUP1_BRAKE_BRAKE);/*01.紧急警报-紧急制动*/
Popup_Clear(POPUP1_BRAKE_SPACING_R);/*02.车间距警报-刹车(红字)*/
Popup_Clear(POPUP1_BRAKE_SPACING_COLLISION);/*03.车间距警报-碰撞报警*/
Popup_Clear(POPUP1_BRAKE_SPACING_Y);/*04.车间距警报-刹车(黄字)*/
Popup_Clear(POPUT1_ASR_OPERATE);/*05.ASR工作*/
/*06.PTO紧急警报-刹车*/
/*07.忘记松手刹车*/
/*08.遥控调整车辆高度(有车速)*/
/*09.自动巡航模式*/
/*10.可变SLD 模式*/
/*11.充电异常（系统检测）*/
/*12.油压（系统检测）*/
/*13.AMT初始化异常*/
/*14.尿素品质异常（系统检测）*/
/*15.尿素喷射异常（系统检测）*/
/*16.尿素水补给（系统检测）*/
/*17.AMT初始化结束*/
/*18.DPD自动再生*/
/*19.过热（过热，请在安全的场所停车）*/
/*20.过热（冷却液温度过高）*/
/*21.冷却水（冷却液不足）*/
/*22.冷却水（冷却水不足）*/
/*23.油压(机油)请在安全场所停车*/
/*24.油压异常*/
/*25.仪表故障-请在安全场所停车*/
/*26.仪表故障-请与五十铃公司联系*/
/*27.通信系统-请在安全场所停车*/
/*28.通信系统-请与五十铃公司联系*/
/*29.车速限制-图1*/
/*30.车速限制-图2*/
/*31.扭矩限制-图1*/
/*32.扭矩限制-图2*/
/*33.扭矩限制、车速限制 交互 显示-->扭矩限制*/
/*34.尿素品质异常-图1*/
/*35.尿素品质异常-图2*/
/*36.临界排放故障-图1*/
/*37.临界排放故障-图2*/
/*38.AMT异常-图1*/
/*39.AMT异常-请重启发动机*/
/*40.AMT异常(气压低下)-图1*/
/*41.AMT异常(气压低下)-图2*/
/*42.低圧警報-轮胎漏气警告*/
/*43.同——44*/
/*44.尿素补给-补充尿素溶液-图1*/
/*45.尿素补给-补充尿素溶液-图2*/
/*46.尿素余量少-有车速-图1*/
/*47.尿素余量少-无车速-图2*/
/*48.低圧警報（低下）*/
/*49.同——50*/
/*50.摄像头有污染-图1*/
/*51.摄像头有污染-请与五十铃公司联系*/
/*52.尿素喷射异常（停止）-图1*/
/*53.尿素喷射异常（停止）-图2*/
/*54.尿素喷射异常（消耗量）-图1*/
/*55.尿素喷射异常（消耗量）-图2*/
/*56.高圧警報-轮胎高压警告*/
/*57.高温警報-轮胎高温警告*/
/*58.尿素喷射异常(停止、消耗量)交互显示*/
/*59.DPD手动再生要求1-DPD需要再生*/
/*60.DPD手动再生要求1-请按下DPD开关*/
/*61.DPD手动再生要求2-DPD需要再生*/
/*62.DPD手动再生要求2-请按下DPD开关*/
/*63.TPMS故障-轮胎监控失败*/
/*64.TPMS電池低下-轮胎监控传感器电压下降*/
/*65.DPD手动再生中*/
/*66.遥控车辆高度调整中(无车速)*/
/*67.PTO(停车中)*/
/*68.充电异常-请在安全的场所停车*/
/*69.充电异常-请与五十铃公司联系*/
/*70.AMT異常-AMT异常*/
/*71.AMT異常-请联系经销商*/
/*72.补充燃料-油箱单位*/
/*73.过热-离合器过载*/
/*74.过热-选择合适的档位*/
/*75.AMT磨耗-离合器磨损*/
/*76.低电压报警*/
/*77.过电压报警*/
/*78.DPD自动再生-DPD自动再生中*/
/*79.DPD自动再生-再生将自动完成，不需要操作开关*/
/*80.气压过低-气压过低请注意*/
/*81.气压过低-请冲入空气*/
/*82.EBS故障（红）-请在安全的场所停车*/
/*83.EBS故障（红）-请与五十铃公司联系*/
/*84.省油耗建议-急加速*/
/*85.省油耗建议-急减速*/
/*86.省油耗建议-请降低发动机转速*/
/*87.省油耗建议-请降低速度*/
/*88.发动机机油＆滤清器*/
/*89.燃油滤清器*/
/*90.变速箱油*/
/*91.差速器油*/
/*92.顺畅系统离合器油*/
/*93.动力转向液*/
/*94.更换轮胎・轮胎位置*/
}
}
#if 0
//5.ASR工作
variable_1 = Get_ID_18F0010B_Sig_ASR_Brake_Control_Active();
if (variable_1 == 1)
{
Popup_Request(POPUT1_ASR_OPERATE);
}
else
{
Popup_Delete(POPUT1_ASR_OPERATE);
}
//6.PTO紧急警报-刹车
variable_1 = Get_ID_18FED900_Sig_PTO_SW();
......
source/Application/Graphic/GUI/GUI.c
View file @ 411f87f0
......@@ -5898,6 +5898,7 @@ void GUI_General_Popup(void)
PopupSnd = Popup_Get_Current_Sound();
GUI_OftenShow_Display();
GUI_Dynamic_DIsplay();
Popups_Displaying(PopupMsg);
Popups_Sound_Playing(PopupSnd);
......@@ -5913,25 +5914,39 @@ void GUI_General_Popup_Display(uint16_t PopupMsg)
{
uint16_t V_Speed = 0u;
//if (PopupMsg >= POPUP_MSG_NUMBER_TOTAL)
//{
// return;
//}
if (PopupMsg >= POPUP_MSG_NUMBER_TOTAL)
{
return;
}
V_Speed = Common_Get_Act_V_Speed();
if (V_Speed > 66u) /*有车速*/
{
GUI_General_Display(MultiPurpose_Sprite, CN_Alarm_01_image, GUI_BLENDMODE_SRC_OVER); /*红*/
//GUI_General_Display(MultiPurpose_Sprite, CN_Alarm_01_imageblack, GUI_BLENDMODE_SRC_OVER); /*黑*/
if ((PopupMsg == POPUP1_MSG_BRAKE_BLACK) || (PopupMsg == POPUP1_MSG_BRAKE_BRAKE))
{
GUI_General_Display(MultiPurpose_Sprite, CN_Alarm_01_image, GUI_BLENDMODE_SRC_OVER); /*红底*/
}
else
{
GUI_General_Display(MultiPurpose_Sprite, CN_Alarm_01_imageblack, GUI_BLENDMODE_SRC_OVER); /*黑底*/
}
GUI_General_Display(MultiPurpose_Sprite, GUIGeneralPopupTable[PopupMsg].PICIcon, GUI_BLENDMODE_CUSTOM);
GUI_General_Display(MultiPurpose_Sprite, GUIGeneralPopupTable[PopupMsg].HImageCN1, GUI_BLENDMODE_CUSTOM);
GUI_General_Display(MultiPurpose_Sprite, GUIGeneralPopupTable[PopupMsg].HImageCN2, GUI_BLENDMODE_CUSTOM);
}
else
{
GUI_General_Display(MultiPurpose_Sprite, CN_Alarm_01_image, GUI_BLENDMODE_SRC_OVER); /*红*/
//GUI_General_Display(MultiPurpose_Sprite, CN_Alarm_01_imageblack, GUI_BLENDMODE_SRC_OVER); /*黑*/
if ((PopupMsg == POPUP1_MSG_BRAKE_BLACK) || (PopupMsg == POPUP1_MSG_BRAKE_BRAKE))
{
GUI_General_Display(MultiPurpose_Sprite, CN_Alarm_01_image, GUI_BLENDMODE_SRC_OVER); /*红底*/
}
else
{
GUI_General_Display(MultiPurpose_Sprite, CN_Alarm_01_imageblack, GUI_BLENDMODE_SRC_OVER); /*黑底*/
}
GUI_General_Display(MultiPurpose_Sprite, GUIGeneralPopupTable[PopupMsg].PICIcon, GUI_BLENDMODE_CUSTOM);
GUI_General_Display(MultiPurpose_Sprite, GUIGeneralPopupTable[PopupMsg].HImageCN3, GUI_BLENDMODE_CUSTOM);
GUI_General_Display(MultiPurpose_Sprite, GUIGeneralPopupTable[PopupMsg].HImageCN4, GUI_BLENDMODE_CUSTOM);
......
source/Application/Graphic/UE/DisplaySch_user.c
View file @ 411f87f0
......@@ -222,7 +222,6 @@ void GUI_DisplayServices(void)
}
GUI_General_Popup();
GUI_Dynamic_DIsplay();
}
else
{
......
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