Skip to content

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

增加报警

parent 47fb0f5d
Show whitespace changes
Inline Side-by-side
Showing with 356 additions and 362 deletions
source/Application/Alarm/Popup_List.c
View file @ ac0758a6
......@@ -47,8 +47,8 @@ const Popup_Attribute_t PopupAttributeTable[POPUP_MAX] =
{/*32 POPUP5_ADBLUE_LEVEL_LOW */ POPUP_TYPE_WARNING , 3u, 13u, POPUP_IGN_ON, POPUP5_ADBLUE_LEVEL_LOW , NULL, 1u, POPUP5_MSG_ADBLUE_LEVEL_LOW , POPUP_MODE_MULTI, POPUP_NONE , POPUP_MODE_MULTI,},
{/*33 POPUP5_LOW_FAILURE */ POPUP_TYPE_WARNING , 3u, 14u, POPUP_IGN_ON, POPUP5_LOW_FAILURE , NULL, 1u, POPUP5_MSG_LOW_FAILURE , POPUP_MODE_MULTI, POPUP_NONE , POPUP_MODE_MULTI,},
{/*34 POPUP5_CAMERA_POLLUTION */ POPUP_TYPE_WARNING , 3u, 15u, POPUP_IGN_ON, POPUP5_CAMERA_POLLUTION , NULL, 1u, POPUP5_MSG_CAMERA_POLLUTION , POPUP_MODE_MULTI, POPUP_NONE , POPUP_MODE_MULTI,},
{/*35 POPUP5_AdBlue_LEVEL_LOW */ POPUP_TYPE_WARNING , 3u, 16u, POPUP_IGN_ON, POPUP5_AdBlue_LEVEL_LOW , NULL, 1u, POPUP5_MSG_AdBlue_LEVEL_LOW , POPUP_MODE_MULTI, POPUP_NONE , POPUP_MODE_MULTI,},
{/*36 POPUP5_AdBlue_INJ_SYSTEM */ POPUP_TYPE_WARNING , 3u, 17u, POPUP_IGN_ON, POPUP5_AdBlue_INJ_SYSTEM , NULL, 1u, POPUP5_MSG_AdBlue_INJ_SYSTEM , POPUP_MODE_MULTI, POPUP_NONE , POPUP_MODE_MULTI,},
{/*35 POPUP5_AdBlue_INJ_SYSTEM */ POPUP_TYPE_WARNING , 3u, 16u, POPUP_IGN_ON, POPUP5_AdBlue_INJ_SYSTEM , NULL, 1u, POPUP5_MSG_AdBlue_INJ_SYSTEM , POPUP_MODE_MULTI, POPUP_NONE , POPUP_MODE_MULTI,},
{/*36 POPUP5_AdBlue_DOS_MALFUNC */ POPUP_TYPE_WARNING , 3u, 17u, POPUP_IGN_ON, POPUP5_AdBlue_DOS_MALFUNC , NULL, 1u, POPUP5_MSG_AdBlue_DOS_MALFUNC , POPUP_MODE_MULTI, POPUP_NONE , POPUP_MODE_MULTI,},
{/*37 POPUP5_TPMS_HIGH_AIR */ POPUP_TYPE_WARNING , 3u, 18u, POPUP_IGN_ON, POPUP5_TPMS_HIGH_AIR , NULL, 1u, POPUP5_MSG_TPMS_HIGH_AIR , POPUP_MODE_MULTI, POPUP_NONE , POPUP_MODE_MULTI,},
{/*38 POPUP5_TPMS_HIGH_TEMP */ POPUP_TYPE_WARNING , 3u, 19u, POPUP_IGN_ON, POPUP5_TPMS_HIGH_TEMP , NULL, 1u, POPUP5_MSG_TPMS_HIGH_TEMP , POPUP_MODE_MULTI, POPUP_NONE , POPUP_MODE_MULTI,},
{/*39 POPUP5_PUSH_DPD_SWITCH1 */ POPUP_TYPE_WARNING , 3u, 20u, POPUP_IGN_ON, POPUP5_PUSH_DPD_SWITCH1 , NULL, 1u, POPUP5_MSG_PUSH_DPD_SWITCH1 , POPUP_MODE_MULTI, POPUP_NONE , POPUP_MODE_MULTI,},
......
source/Application/Alarm/Popup_List.h
View file @ ac0758a6
......@@ -50,8 +50,8 @@ enum PopupName
POPUP5_ADBLUE_LEVEL_LOW ,/*32.尿素余量少-无车速*/
POPUP5_LOW_FAILURE ,/*33.胎压报警-气压低*/
POPUP5_CAMERA_POLLUTION ,/*34.摄像头有污染-请与五十铃公司联系*/
POPUP5_AdBlue_LEVEL_LOW ,/*35.尿素喷射异常（停止）*/
POPUP5_AdBlue_INJ_SYSTEM ,/*36.尿素喷射异常（消耗量）*/
POPUP5_AdBlue_INJ_SYSTEM ,/*35.尿素喷射异常（停止）*/
POPUP5_AdBlue_DOS_MALFUNC ,/*36.尿素喷射异常（消耗量）*/
POPUP5_TPMS_HIGH_AIR ,/*37.高圧警報-轮胎高压警告*/
POPUP5_TPMS_HIGH_TEMP ,/*38.高温警報-轮胎高温警告*/
POPUP5_PUSH_DPD_SWITCH1 ,/*39.DPD手动再生要求1-请按下DPD开关*/
......
source/Application/Alarm/Popup_Message_List.h
View file @ ac0758a6
......@@ -44,8 +44,8 @@ enum PopupMessageName
POPUP5_MSG_ADBLUE_LEVEL_LOW , /*32.尿素余量少-无车速*/
POPUP5_MSG_LOW_FAILURE , /*33.胎压报警-气压低*/
POPUP5_MSG_CAMERA_POLLUTION , /*34.摄像头有污染-请与五十铃公司联系*/
POPUP5_MSG_AdBlue_LEVEL_LOW , /*35.尿素喷射异常（停止）*/
POPUP5_MSG_AdBlue_INJ_SYSTEM , /*36.尿素喷射异常（消耗量）*/
POPUP5_MSG_AdBlue_INJ_SYSTEM , /*35.尿素喷射异常（停止）*/
POPUP5_MSG_AdBlue_DOS_MALFUNC , /*36.尿素喷射异常（消耗量）*/
POPUP5_MSG_TPMS_HIGH_AIR , /*37.高圧警報-轮胎高压警告*/
POPUP5_MSG_TPMS_HIGH_TEMP , /*38.高温警報-轮胎高温警告*/
POPUP5_MSG_PUSH_DPD_SWITCH1 , /*39.DPD手动再生要求1-请按下DPD开关*/
......@@ -144,8 +144,8 @@ static const PopupMsgAttributeStruct PopupMsgAttributeTable[] =
{ /* POPUP5_MSG_ADBLUE_LEVEL_LOW */ POPUP_TYPE_GENERAL,}, /*32.尿素余量少-无车速*/
{ /* POPUP5_MSG_LOW_FAILURE */ POPUP_TYPE_GENERAL,}, /*33.胎压报警-气压低*/
{ /* POPUP5_MSG_CAMERA_POLLUTION */ POPUP_TYPE_GENERAL,}, /*34.摄像头有污染-请与五十铃公司联系*/
{ /* POPUP5_MSG_AdBlue_LEVEL_LOW */ POPUP_TYPE_GENERAL,}, /*35.尿素喷射异常（停止）*/
{ /* POPUP5_MSG_AdBlue_INJ_SYSTEM */ POPUP_TYPE_GENERAL,}, /*36.尿素喷射异常（消耗量）*/
{ /* POPUP5_MSG_AdBlue_INJ_SYSTEM */ POPUP_TYPE_GENERAL,}, /*35.尿素喷射异常（停止）*/
{ /* POPUP5_MSG_AdBlue_DOS_MALFUNC */ POPUP_TYPE_GENERAL,}, /*36.尿素喷射异常（消耗量）*/
{ /* POPUP5_MSG_TPMS_HIGH_AIR */ POPUP_TYPE_GENERAL,}, /*37.高圧警報-轮胎高压警告*/
{ /* POPUP5_MSG_TPMS_HIGH_TEMP */ POPUP_TYPE_GENERAL,}, /*38.高温警報-轮胎高温警告*/
{ /* POPUP5_MSG_PUSH_DPD_SWITCH1 */ POPUP_TYPE_GENERAL,}, /*39.DPD手动再生要求1-请按下DPD开关*/
......
source/Application/Alarm/Popups.c
View file @ ac0758a6
......@@ -19,6 +19,8 @@
#include "Data_Voltmeter.h"
#include "Data_Fuel_User.h"
#include "Service_TPMS.h"
void Popups_Management_Service(void)
{
Popups_Polling();
......@@ -64,7 +66,7 @@ void Popups_Polling(void)
/*----第一组---------------------------------------------------------------------*/
if (K_Line_Set.K_Line_LID28 == 0x01u)
{
/*0.紧急警报-刹车*/
/*0.--1--紧急警报-刹车*/
variable_1 = Get_ID_CF02F2A_Sig_Advanced_Emerg_Braking_Sys_Sta();
variable_2 = Get_ID_CF02FA0_Sig_Advanced_Emerg_Braking_Sys_Sta();
......@@ -83,7 +85,7 @@ void Popups_Polling(void)
Popup_Delete(POPUP1_BRAKE_BLACK);
}
/*1.紧急警报-紧急制动*/
/*1.--1--紧急警报-紧急制动*/
variable_1 = Get_ID_CF02FA1_Sig_Advanced_Emerg_Braking_Sys_Sta();
if (variable_1 == 0x07u)
......@@ -100,7 +102,7 @@ void Popups_Polling(void)
Popup_Delete(POPUP1_BRAKE_BRAKE);
}
/*2.车间距警报-刹车(红字)*/
/*2.--2--车间距警报-刹车(红字)*/
variable_1 = Get_ID_CF02F2A_Sig_Advanced_Emerg_Braking_Sys_Sta();
variable_2 = Get_ID_CF02FA0_Sig_Advanced_Emerg_Braking_Sys_Sta();
......@@ -117,7 +119,7 @@ void Popups_Polling(void)
Popup_Delete(POPUP1_BRAKE_SPACING_R);
}
/*3.车间距警报-碰撞报警*/
/*3.--2--车间距警报-碰撞报警*/
variable_1 = Get_ID_CF02FA1_Sig_Advanced_Emerg_Braking_Sys_Sta();
if (variable_1 == 0x06u)
......@@ -132,7 +134,7 @@ void Popups_Polling(void)
Popup_Delete(POPUP1_BRAKE_SPACING_COLLISION);
}
/*4.车间距警报-刹车(黄字)*/
/*4.--3--车间距警报-刹车(黄字)*/
variable_1 = Get_ID_CF02F2A_Sig_Advanced_Emerg_Braking_Sys_Sta();
variable_2 = Get_ID_CF02FA0_Sig_Advanced_Emerg_Braking_Sys_Sta();
......@@ -156,7 +158,7 @@ void Popups_Polling(void)
Popup_Clear(POPUP1_BRAKE_SPACING_Y);
}
/*5.ASR工作*/
/*5.--4--ASR工作*/
variable_1 = Get_ID_18F0010B_Sig_ATC_or_ASR_Lamp_State();
if (variable_1 == 0x01u)
......@@ -169,7 +171,7 @@ void Popups_Polling(void)
}
/*----第二组---------------------------------------------------------------------*/
/*6.PTO紧急警报-刹车*/
/*6.--1--PTO紧急警报-刹车*/
variable_1 = Get_ID_18FED900_Sig_PTO_SW();
variable_2 = Line_In_Get_Status(LINE_IN_PTO); // B01
......@@ -182,7 +184,7 @@ void Popups_Polling(void)
Popup_Delete(POPUT2_PTO);
}
/*7.忘记松手刹车 LINE_IN_Get_PARK_BRAKE 驻车制动*/
/*7.--2--忘记松手刹车 LINE_IN_Get_PARK_BRAKE 驻车制动*/
variable_1 = Line_In_Get_Status(LINE_IN_PARK_BRAKE);
if ((variable_1 == LINE_IN_LOGIC_VALID) && (V_Speed >= 66u)) // 6.67Km
......@@ -194,7 +196,7 @@ void Popups_Polling(void)
Popup_Delete(POPUP2_PARKING_BRAKE);
}
/*8.遥控调整车辆高度(有车速)*/
/*8.--3--遥控调整车辆高度(有车速)*/
variable_1 = Line_In_Get_Status(LINE_IN_AIR_SUS);
if ((variable_1 == LINE_IN_LOGIC_VALID) && (V_Speed > 5u)) // 0.5Km
......@@ -207,11 +209,11 @@ void Popups_Polling(void)
}
/*----第三组---------------------------------------------------------------------*/
/*9.自动巡航模式*/
/*9.--1--自动巡航模式*/
variable_1 = Get_ID_18FF4100_Sig_Cruise_VariableSLD_Disp();
variable_2 = Common_Get_Cruise_TimeSta();
if ((variable_1 == 0x01u) && (variable_2 == 1u)) // 5s内不显示
if ((variable_1 == 0x01u) && (variable_2 == 1u))
{
Popup_Request(POPUP3_CRUISE);
}
......@@ -220,11 +222,11 @@ void Popups_Polling(void)
Popup_Delete(POPUP3_CRUISE);
}
/*10.可变SLD 模式*/
/*10.--2--可变SLD 模式*/
variable_1 = Get_ID_18FF4100_Sig_Cruise_VariableSLD_Disp();
variable_2 = Common_Get_Cruise_SLD_TimeSta();
if ((variable_1 == 0x03u) && (variable_2 == 1u)) // 5s内不显示
if ((variable_1 == 0x03u) && (variable_2 == 1u))
{
Popup_Request(POPUP3_VARIABLE_SLD);
}
......@@ -236,10 +238,13 @@ void Popups_Polling(void)
/*----第四组---------------------------------------------------------------------*/
if (E_Speed < 350u)
{
/*11.充电异常（系统检测）*/
if (K_Line_Set.K_Line_LID2B == 0x00u)
{
/*11.--1--充电异常（系统检测）*/
variable_1 = Line_In_Get_Status(LINE_IN_CHARGE);
variable_2 = Common_VolWarning_Sta();
if ((variable_1 == LINE_IN_LOGIC_VALID) && (K_Line_Set.K_Line_LID2B == 0x00u))
if ((variable_1 == LINE_IN_LOGIC_VALID) || (variable_2 < 4u))
{
Popup_Request(POPUT4_ABNORMAL_CHARGE);
}
......@@ -248,10 +253,11 @@ void Popups_Polling(void)
Popup_Delete(POPUT4_ABNORMAL_CHARGE);
}
/*12.油压（系统检测）*/
/*12.--2--油压（系统检测）*/
variable_1 = Line_In_Get_Status(LINE_IN_ENG_OIL);
variable_2 = Common_VolWarning_Sta();
if ((variable_1 == LINE_IN_LOGIC_VALID) && (K_Line_Set.K_Line_LID2B == 0x00u))
if ((variable_1 == LINE_IN_LOGIC_VALID) || (variable_2 < 4u))
{
Popup_Request(POPUP4_OIL_PRESSURE);
}
......@@ -259,8 +265,14 @@ void Popups_Polling(void)
{
Popup_Delete(POPUP4_OIL_PRESSURE);
}
}
else
{
Popup_Clear(POPUT4_ABNORMAL_CHARGE);
Popup_Clear(POPUP4_OIL_PRESSURE);
}
/*13.AMT初始化异常 DM1 SPN4220 Key On時*/
/*13.--3--AMT初始化异常 DM1 SPN4220 Key On時*/
variable_4 = Get_ID_18FECA03_Sig_SPN();
if ((variable_4 == 4220u) && (K_Line_Set.K_Line_LID41 == 0x13u))
......@@ -272,7 +284,7 @@ void Popups_Polling(void)
Popup_Delete(POPUP4_AMT_INIT_EXCE);
}
/*14.尿素品质异常（系统检测）*/
/*14.--4--尿素品质异常（系统检测）*/
if (0)
{
Popup_Request(POPUP4_ADBLUE_QUALITY);
......@@ -282,7 +294,7 @@ void Popups_Polling(void)
Popup_Delete(POPUP4_ADBLUE_QUALITY);
}
/*15.尿素喷射异常（系统检测）*/
/*15.--5--尿素喷射异常（系统检测）*/
if (0)
{
Popup_Request(POPUP4_ADBLUE_SPRAY);
......@@ -292,7 +304,7 @@ void Popups_Polling(void)
Popup_Delete(POPUP4_ADBLUE_SPRAY);
}
/*16.尿素水补给（系统检测）*/
/*16.--6--尿素水补给（系统检测）*/
if (0)
{
Popup_Request(POPUP4_ADBLUE_SUPPLY);
......@@ -302,7 +314,7 @@ void Popups_Polling(void)
Popup_Delete(POPUP4_ADBLUE_SUPPLY);
}
/*17.AMT初始化结束 DM1 SPN4021 Key On時*/
/*17.--7--AMT初始化结束 DM1 SPN4021 Key On時*/
variable_4 = Get_ID_18FECA03_Sig_SPN();
if ((variable_4 == 4021u) && (K_Line_Set.K_Line_LID41 == 0x13u))
......@@ -314,7 +326,7 @@ void Popups_Polling(void)
Popup_Delete(POPUP4_START_ENG);
}
/*18.DPD自动再生*/
/*18.--8--DPD自动再生*/
if (0)
{
Popup_Request(POPUP4_DPD_AUTO);
......@@ -337,7 +349,7 @@ void Popups_Polling(void)
}
/*----第五组---------------------------------------------------------------------*/
/*19.过热（过热，请在安全的场所停车）有车速 LID $43 :0x82*/
/*19.--1--过热（过热，请在安全的场所停车）有车速 LID $43 :0x82*/
variable_1 = Coolant_Get_Valid();
variable_2 = Coolant_Get_CurSeg();
......@@ -369,8 +381,7 @@ void Popups_Polling(void)
Popup_Delete(POPUP5_LOW_COOLANT);
}
/*21.油压(机油)请在安全场所停车*/
/*发动机启动(350r/min)后、350r/min持续5秒以上时，A32信号（10ms周期监测），连续20次检出Lo时。*/
/*21.油压(机油)请在安全场所停车 发动机启动(350r/min)后、350r/min持续5秒以上时，A32信号（10ms周期监测），连续20次检出Lo时。*/
variable_1 = Line_In_Get_Status(LINE_IN_ENG_OIL);
if ((E_Speed > 350u) && (variable_1 == LINE_IN_LOGIC_VALID))
......@@ -441,20 +452,12 @@ void Popups_Polling(void)
Popup_Delete(POPUP5_CRITICAL_EMISSION);
}
#if 0
//38.AMT异常-图1 ID：18FF8503 Byte：1 Bit：4,3 01(B) LID $41 : 0x13
variable_1 = Get_ID_18FF8503_Sig_Spanner_Warning();
if ((EOL == 0x13) && (V_Speed) && (variable_1 == 1))
if (K_Line_Set.K_Line_LID41 = 0x13u)
{
Popup_Request(POPUP5_AMT_SPANNER_WARNING_SPEED);
}
else
{
Popup_Delete(POPUP5_AMT_SPANNER_WARNING_SPEED);
}
/*28.AMT异常-图1 ID：18FF8503 Byte：1 Bit：4,3 01(B) LID $41 : 0x13 PGN：65413 TC2DIS*/
variable_1 = Get_ID_18FF8503_Sig_Spanner_Warning();
//39.AMT异常-请重启发动机 ID：18FF8503 Byte：1 Bit：4,3 01(B) LID $41 : 0x13
if ((EOL == 0x13) && (V_Speed == 0) && (variable_1 == 1))
if (variable_1 == 1)
{
Popup_Request(POPUP5_AMT_SPANNER_WARNING);
}
......@@ -463,20 +466,10 @@ void Popups_Polling(void)
Popup_Delete(POPUP5_AMT_SPANNER_WARNING);
}
//40.AMT异常(气压低下)-图1 ID：18FF8503 Byte：2 Bit：6,5 01(B) LID $41 : 0x13
/*29.AMT异常(气压低下)-图1 ID：18FF8503 Byte：2 Bit：6,5 01(B) LID $41 : 0x13 PGN：65413 TC2DIS*/
variable_1 = Get_ID_18FF2300_Sig_Glow_Lamp();
if ((EOL == 0x13) && (V_Speed) && (variable_1 == 1))
{
Popup_Request(POPUP5_AMT_LOW_AIR_WARNING_SPEED);
}
else
{
Popup_Delete(POPUP5_AMT_LOW_AIR_WARNING_SPEED);
}
//41.AMT异常(气压低下)-图2
if ((EOL == 0x13) && (V_Speed == 0) && (variable_1 == 1))
if (variable_1 == 1)
{
Popup_Request(POPUP5_AMT_LOW_AIR_WARNING);
}
......@@ -484,32 +477,29 @@ void Popups_Polling(void)
{
Popup_Delete(POPUP5_AMT_LOW_AIR_WARNING);
}
//42.低圧警報-轮胎漏气警告 ID：18011733 Byte：5 Bit：5 01(B) LID $3E : 0x01
variable_1 = Get_ID_18011733_Sig_Fast_air_leakage_alarm();
if ((EOL == 0x01) && (variable_1 == 1))
{
Popup_Request(POPUP5_LOW_PRESSURE_ALARM_SPEED);
}
else
{
Popup_Delete(POPUP5_LOW_PRESSURE_ALARM_SPEED);
Popup_Clear(POPUP5_AMT_SPANNER_WARNING);
Popup_Clear(POPUP5_AMT_LOW_AIR_WARNING);
}
//43.低圧警報 - 若报警图一样，同42.否则此处增加43报警逻辑
//44.尿素补给-补充尿素溶液-图1 ID：18FF2300 Byte：3 Bit：4,3 01(B)
variable_1 = Get_ID_18FF2300_Sig_Amber2();
if ((V_Speed) && (variable_1 == 1))
/*30.胎压 低圧警報-轮胎漏气警告 ID：18011733 Byte：5 Bit：5 01(B) LID $3E : 0x01*/
variable_1 = Get_TPMSFast_air_leakage();
if ((K_Line_Set.K_Line_LID3E = 0x01u) && (variable_1 == 0x01u))
{
Popup_Request(POPUP5_APP_ADBLUE_SPEED);
Popup_Request(POPUP5_LOW_PRESSURE_ALARM);
}
else
{
Popup_Delete(POPUP5_APP_ADBLUE_SPEED);
Popup_Delete(POPUP5_LOW_PRESSURE_ALARM);
}
//45.尿素补给-补充尿素溶液-图2 ID：18FF2300 Byte：3 Bit：4,3 01(B)
if ((V_Speed == 0) && (variable_1 == 1))
/*31.尿素补给-补充尿素溶液-图1 ID：18FF2300 Byte：3 Bit：4,3 01(B)*/
variable_1 = Get_ID_18FF2300_Sig_Amber2();
if (variable_1 == 0x01u)
{
Popup_Request(POPUP5_APP_ADBLUE);
}
......@@ -518,18 +508,10 @@ void Popups_Polling(void)
Popup_Delete(POPUP5_APP_ADBLUE);
}
//46.尿素余量少-有车速-图1 ID：18FF2300 Byte：3 Bit：4,3 10(B)
if ((V_Speed) && (variable_1 == 2))
{
Popup_Request(POPUP5_ADBLUE_LEVEL_LOW_SPEED);
}
else
{
Popup_Delete(POPUP5_ADBLUE_LEVEL_LOW_SPEED);
}
/*32.尿素余量少-无车速-图2 ID：18FF2300 Byte：3 Bit：4,3 10(B)*/
variable_1 = Get_ID_18FF2300_Sig_Amber2();
//47.尿素余量少-无车速-图2 ID：18FF2300 Byte：3 Bit：4,3 10(B)
if ((V_Speed == 0) && (variable_1 == 2))
if (variable_1 == 0x02u)
{
Popup_Request(POPUP5_ADBLUE_LEVEL_LOW);
}
......@@ -538,34 +520,22 @@ void Popups_Polling(void)
Popup_Delete(POPUP5_ADBLUE_LEVEL_LOW);
}
//48. 低圧警報（低下）ID：18011733 Byte：5 Bit：8 01(B) LID $3E : 0x01
variable_1 = Get_ID_18011733_Sig_Low_Presure_Alarm();
if ((EOL == 0x01) && (variable_1 == 1))
/*33. 低圧警報（低下）ID：18011733 Byte：5 Bit：8 01(B) LID $3E : 0x01*/
variable_1 = Get_TPMSLow_Presure_Sta();
if ((K_Line_Set.K_Line_LID3E = 0x01u) && (variable_1 == 0x01u))
{
Popup_Request(POPUP5_LOW_FAILURE_SPEED);
Popup_Request(POPUP5_LOW_FAILURE);
}
else
{
Popup_Delete(POPUP5_LOW_FAILURE_SPEED);
Popup_Delete(POPUP5_LOW_FAILURE);
}
//49.低圧警報（低下） 同//48
//50.摄像头有污染-图1 ID：18FE5BE8 Byte7 Bit5-8 0010(B) 0011(B) LID $27: 0x01
/*34.摄像头有污染-请与五十铃公司联系 ID：18FE5BE8 Byte7 Bit5-8 0010(B) 0011(B) LID $27: 0x01*/
variable_1 = Get_ID_18FE5BE8_Sig_Camera_Status();
if (V_Speed)
{
if ((EOL == 0x01) && (V_Speed) && ((variable_1 == 2) || (variable_2 == 3)))
{
Popup_Request(POPUP5_CAMERA_POLLUTION_SPEED);
}
else
{
Popup_Delete(POPUP5_CAMERA_POLLUTION_SPEED);
}
}
//51.摄像头有污染-请与五十铃公司联系 ID：18FE5BE8 Byte7 Bit5-8 0010(B) 0011(B) LID $27: 0x01
if ((EOL == 0x01) && (V_Speed == 0x00) && ((variable_1 == 2) || (variable_2 == 3)))
if ((K_Line_Set.K_Line_LID27 = 0x01u) && ((variable_1 == 0x02u) || (variable_2 == 0x03u)))
{
Popup_Request(POPUP5_CAMERA_POLLUTION);
}
......@@ -574,50 +544,34 @@ void Popups_Polling(void)
Popup_Delete(POPUP5_CAMERA_POLLUTION);
}
//52.尿素喷射异常（停止）-图1 ID：18FF2300 Byte：3 Bit：2,1 01(B)
/*35.尿素喷射异常（停止）-图1 ID：18FF2300 Byte：3 Bit：2,1 01(B)*/
variable_1 = Get_ID_18FF2300_Sig_Amber1();
if ((V_Speed) && (variable_1 == 1))
{
Popup_Request(POPUP5_AdBlue_LEVEL_LOW_SPEED);
}
else
{
Popup_Delete(POPUP5_AdBlue_LEVEL_LOW_SPEED);
}
//53.尿素喷射异常（停止）-图2 ID：18FF2300 Byte：3 Bit：2,1 01(B)
if ((V_Speed == 0) && (variable_1 == 1))
if ((variable_1 == 0x01u) || (variable_1 == 0x03u))
{
Popup_Request(POPUP5_AdBlue_LEVEL_LOW);
Popup_Request(POPUP5_AdBlue_INJ_SYSTEM);
}
else
{
Popup_Delete(POPUP5_AdBlue_LEVEL_LOW);
Popup_Delete(POPUP5_AdBlue_INJ_SYSTEM);
}
//54.尿素喷射异常（消耗量）-图1 ID：18FF2300 Byte：3 Bit：2,1 10(B)
if ((V_Speed) && (variable_1 == 2))
{
Popup_Request(POPUP5_AdBlue_INJ_SYSTEM_SPEED);
}
else
{
Popup_Delete(POPUP5_AdBlue_INJ_SYSTEM_SPEED);
}
/*36.尿素喷射异常（消耗量）-图1 ID：18FF2300 Byte：3 Bit：2,1 10(B)*/
variable_1 = Get_ID_18FF2300_Sig_Amber1();
//55.尿素喷射异常（消耗量）-图2 ID：18FF2300 Byte：3 Bit：2,1 10(B)
if ((V_Speed == 0) && (variable_1 == 2))
if ((variable_1 == 0x02u) || (variable_1 == 0x03u))
{
Popup_Request(POPUP5_AdBlue_INJ_SYSTEM);
Popup_Request(POPUP5_AdBlue_DOS_MALFUNC);
}
else
{
Popup_Delete(POPUP5_AdBlue_INJ_SYSTEM);
Popup_Delete(POPUP5_AdBlue_DOS_MALFUNC);
}
//56.高圧警報-轮胎高压警告 ID：18011733 Byte：5 Bit：7 01(B) LID $3E : 0x01
variable_1 = Get_ID_18011733_Sig_High_Presure_Alarm();
if ((EOL == 0x01) && (variable_1 == 1))
/*37.高圧警報-轮胎高压警告 ID：18011733 Byte：5 Bit：7 01(B) LID $3E : 0x01*/
variable_1 = Get_TPMSHigh_Presure_Sta();
if ((K_Line_Set.K_Line_LID3E = 0x01u) && (variable_1 == 0x01u))
{
Popup_Request(POPUP5_TPMS_HIGH_AIR);
}
......@@ -626,9 +580,10 @@ void Popups_Polling(void)
Popup_Delete(POPUP5_TPMS_HIGH_AIR);
}
//57.高温警報-轮胎高温警告 ID：18011733 Byte：5 Bit：6 01(B) LID $3E : 0x01
variable_1 = Get_ID_18011733_Sig_High_Temperature_Alarm();
if ((EOL == 0x01) && (variable_1 == 1))
/*38.高温警報-轮胎高温警告 ID：18011733 Byte：5 Bit：6 01(B) LID $3E : 0x01*/
variable_1 = Get_TPMSHigh_Temperature_Sta();
if ((K_Line_Set.K_Line_LID3E = 0x01u) && (variable_1 == 0x01u))
{
Popup_Request(POPUP5_TPMS_HIGH_TEMP);
}
......@@ -637,31 +592,10 @@ void Popups_Polling(void)
Popup_Delete(POPUP5_TPMS_HIGH_TEMP);
}
//58.尿素喷射异常(停止、消耗量)交互显示----尿素喷射系统异常 ID：18FF2300 Byte：3 Bit：2,1 11(B)
variable_1 = Get_ID_18FF2300_Sig_Amber1();
if (variable_1 == 3)
{
Popup_Request(POPUP5_AdBlue_DOS_MALFUNC);
}
else
{
Popup_Delete(POPUP5_AdBlue_DOS_MALFUNC);
}
//59.DPD手动再生要求1-DPD需要再生 18FD7C00 Byte：1 Bit：3-1 001：On – solid
/*39.DPD手动再生要求1-DPD需要再生 18FD7C00 Byte：1 Bit：3-1 001：On – solid*/
variable_1 = Get_ID_18FD7C00_Sig_DPF_Lamp_Status_Amber();
if ((V_Speed) && (variable_1 == 1))
{
Popup_Request(POPUP5_PUSH_DPD_SWITCH1_SPEED);
}
else
{
Popup_Delete(POPUP5_PUSH_DPD_SWITCH1_SPEED);
}
//60.DPD手动再生要求1-请按下DPD开关 18FD7C00 Byte：1 Bit：3-1 001：On – solid
if ((V_Speed == 0) && (variable_1 == 1))
if (variable_1 == 0x01u)
{
Popup_Request(POPUP5_PUSH_DPD_SWITCH1);
}
......@@ -670,18 +604,10 @@ void Popups_Polling(void)
Popup_Delete(POPUP5_PUSH_DPD_SWITCH1);
}
//61.DPD手动再生要求2-DPD需要再生 18FD7C00 Byte：1 Bit：3-1 100：On – fast blink (1 HZ)
if ((V_Speed) && (variable_1 == 4))
{
Popup_Request(POPUP5_PUSH_DPD_SWITCH2_SPEED);
}
else
{
Popup_Delete(POPUP5_PUSH_DPD_SWITCH2_SPEED);
}
/*40.DPD手动再生要求2-DPD需要再生 18FD7C00 Byte：1 Bit：3-1 100：On – fast blink (1 HZ)*/
variable_1 = Get_ID_18FD7C00_Sig_DPF_Lamp_Status_Amber();
//62.DPD手动再生要求2-请按下DPD开关 18FD7C00 Byte：1 Bit：3-1 100：On – fast blink (1 HZ)
if ((V_Speed == 0) && (variable_1 == 4))
if (variable_1 == 0x04u)
{
Popup_Request(POPUP5_PUSH_DPD_SWITCH2);
}
......@@ -690,9 +616,10 @@ void Popups_Polling(void)
Popup_Delete(POPUP5_PUSH_DPD_SWITCH2);
}
//63.TPMS故障-轮胎监控失败 ID：18011733 Byte：6 Bit：ALL 0111(B) or 1000(B) or 1001(B)
variable_1 = Get_ID_18011733_Sig_Sensor_fault_information();
if ((variable_1 == 7) || (variable_1 == 8) || (variable_1 == 9) )
/*41.TPMS故障-轮胎监控失败 ID：18011733 Byte：6 Bit：ALL 0111(B) or 1000(B) or 1001(B)*/
variable_1 = Get_TPMSSensor_fault_Sta();
if ((K_Line_Set.K_Line_LID3E = 0x01u) && (variable_1 == 0x01u))
{
Popup_Request(POPUP5_TPMS_FAILURE);
}
......@@ -702,9 +629,10 @@ void Popups_Polling(void)
}
//64.TPMS電池低下-轮胎监控传感器电压下降 ID：18011733 Byte：5 Bit：4 01(B) LID $3E : 0x01
variable_1 = Get_ID_18011733_Sig_Low_Voltage_Alarm();
if ((EOL == 0x01) && (variable_1 == 1))
/*42.TPMS電池低下-轮胎监控传感器电压下降 ID：18011733 Byte：5 Bit：4 01(B) LID $3E : 0x01*/
variable_1 = Get_TPMSLow_Voltage_Sta();
if ((K_Line_Set.K_Line_LID3E = 0x01u) && (variable_1 == 1))
{
Popup_Request(POPUP5_TPMS_MONITOR_DROP);
}
......@@ -712,11 +640,14 @@ void Popups_Polling(void)
{
Popup_Delete(POPUP5_TPMS_MONITOR_DROP);
}
//65.DPD手动再生中 //没有执行条件
//66.遥控车辆高度调整中(无车速) B30 28V
variable_1 = Line_In_Get_Status(LINE_IN_AIR_SUS);//获取硬线结果 B30
if ((V_Speed == 0) && (variable_1 == 1))
/*----第六组---------------------------------------------------------------------*/
if (V_Speed < 66u)
{
/*43.遥控车辆高度调整中(无车速) B30 28V*/
variable_1 = Line_In_Get_Status(LINE_IN_AIR_SUS);
if (variable_1 == 1)
{
Popup_Request(POPUP6_HEIGHT_CONTROL);
}
......@@ -725,12 +656,11 @@ void Popups_Polling(void)
Popup_Delete(POPUP6_HEIGHT_CONTROL);
}
//67.PTO(停车中)(无车速)
//ID：18FED900 Byte：2 Bit：8,7 01(B) OR B01 28V
/*44.PTO(停车中)(无车速) /ID：18FED900 Byte：2 Bit：8,7 01(B) OR B01 28V*/
variable_1 = Get_ID_18FED900_Sig_PTO_SW();
variable_2 = Line_In_Get_Status(LINE_IN_PTO);
if ((V_Speed == 0) || (variable_1 == 1) || ( variable_2 == 1))
if ((variable_1 == 1) || ( variable_2 == 1))
{
Popup_Request(POPUP6_PTO_STOP);
}
......@@ -738,24 +668,19 @@ void Popups_Polling(void)
{
Popup_Delete(POPUP6_PTO_STOP);
}
//68.充电异常-请在安全的场所停车
//エンジン始動(350r/min)後、350r/minが5秒以上継続している場合、A34信号（10ms周期で監視）で。
//发动机启动(350r/min)后、350r/min持续5秒以上时，A34信号（10ms周期监测），
//检出（Lo 或 连续500次以上电压值＜21V）时。
variable_1 = Line_In_Get_Status(LINE_IN_CHARGE); //A34
if ((V_Speed) && (variable_1 == 1) && (E_Speed > 350))
{
Popup_Request(POPUP7_CHARGE_ABNORMAL_SPEED);
}
else
{
Popup_Delete(POPUP7_CHARGE_ABNORMAL_SPEED);
Popup_Clear(POPUP6_HEIGHT_CONTROL);
Popup_Clear(POPUP6_PTO_STOP);
}
//69.充电异常-请与五十铃公司联系
if ((V_Speed == 0) && (variable_1 == 1) && (E_Speed > 350))
/*----第七组---------------------------------------------------------------------*/
/*45.充电异常-请与五十铃公司联系*/
variable_1 = Line_In_Get_Status(LINE_IN_CHARGE);
variable_2 = Common_VolWarning_Sta();
if ((variable_1 == 0x01u) || ((variable_2 == 0x01u) && (E_Speed > 350u)))
{
Popup_Request(POPUP7_CHARGE_ABNORMAL);
}
......@@ -763,66 +688,104 @@ void Popups_Polling(void)
{
Popup_Delete(POPUP7_CHARGE_ABNORMAL);
}
//70.AMT異常-AMT异常 ID：18FF8503　Bite：1 Bit：2,1 LID $41 : 0x13
/*46.AMT異常-AMT异常 ID：18FF8503　Bite：1 Bit：2,1 LID $41 : 0x13*/
variable_1 = Get_ID_18FF8503_Sig_Stop_Warning();
if ((EOL == 0x13) && (V_Speed) && (variable_1))
if ((K_Line_Set.K_Line_LID41 == 0x13u) && (variable_1 == 0x01u))
{
Popup_Request(POPUP7_AMT_ERROR_SPEED);
Popup_Request(POPUP7_AMT_ERROR);
}
else
{
Popup_Delete(POPUP7_AMT_ERROR_SPEED);
Popup_Delete(POPUP7_AMT_ERROR);
}
//71.AMT異常-请联系经销商
if ((EOL == 0x13) && (V_Speed == 0) && (variable_1))
/*----第八组---------------------------------------------------------------------*/
/*47.补充燃料-油箱单位*/
//if (K_Line_Set.K_Line_LID43 == 0x82u)
//{
// //if ((Fuel_Seg <= 1 ) && (FuelStatus == 0) && (FuelResistanceV != 65535))
// if (0)
// {
// Popup_Request(POPUP8_REFUEL);
// }
// else
// {
// Popup_Delete(POPUP8_REFUEL);
// }
//}
//else
//{
// Popup_Clear(POPUP8_REFUEL);
//}
if (K_Line_Set.K_Line_LID41 == 0x13u)
{
/*48.AMT过热-离合器过载 ID：18FF8503　Bite：2 Bit：4,3 001(B) LID $41 : 0x13*/
variable_1 = Get_ID_18FF8503_Sig_Clutch_Overload_warning();
if (variable_1 == 0x01u)
{
Popup_Request(POPUP7_AMT_ERROR);
Popup_Request(POPUP8_ATM_CLUCH_OVERHEATING);
}
else
{
Popup_Delete(POPUP7_AMT_ERROR);
Popup_Delete(POPUP8_ATM_CLUCH_OVERHEATING);
}
//72.补充燃料-油箱单位 LID $43 : 0x82
//显示条件　 　：　A11的13秒平均値≧128Ω
//不显示条件　：　A11的13秒平均値< 128Ω
/*49.AMT磨耗-离合器磨损 ID：18FF8503　Bite：2 Bit：2,1 001(B) LID $41 : 0x13*/
variable_1 = Get_ID_18FF8503_Sig_Manouvering_mode();
if ((EOL == 0x82) && (Fuel_Get_Res() > 128))
if (variable_1 == 0x01u)
{
Popup_Request(POPUP8_REFUEL);
Popup_Request(POPUP1_BRAKE_BRAKE);
}
else
{
Popup_Delete(POPUP8_REFUEL);
Popup_Delete(POPUP1_BRAKE_BRAKE);
}
//73.AMT过热-离合器过载 ID：18FF8503　Bite：2 Bit：4,3 001(B) LID $41 : 0x13
variable_1 = Get_ID_18FF8503_Sig_Clutch_Overload_warning();
if ((EOL == 0x13) && (V_Speed) && (variable_1 == 1))
{
Popup_Request(POPUP8_ATM_CLUCH_OVERHEATING_SPEED);
}
else
{
Popup_Delete(POPUP8_ATM_CLUCH_OVERHEATING_SPEED);
Popup_Clear(POPUP8_ATM_CLUCH_OVERHEATING);
Popup_Clear(POPUP1_BRAKE_BRAKE);
}
//74.AMT过热-选择合适的档位 ID：18FF8503　Bite：2 Bit：4,3 001(B) LID $41 : 0x13
if ((EOL == 0x13) && (V_Speed == 0) && (variable_1 == 1))
/*50.低电压报警 显示条件：发动机启动(350r/min)后，7秒检测到23.5V时 显示消失条件：10秒检测到25V以上时*/
//if (( KL30_Volt < 2350) && ( E_Speed > 350)) //23.5V
//{
// Popup_Request(POPUP8_LOW_VOLTAGE_SPEED);
//}
//else if (KL30_Volt > 2500)
//{
// Popup_Delete(POPUP8_LOW_VOLTAGE_SPEED);
//}
/*51.过电压报警 显示条件：发动机启动(350r/min)后，7秒检测到30.4V以上时 显示消失条件：10秒检测到29.4V以下时*/
//if ((KL30_Volt > 3044) && ( E_Speed > 350)) //30.44V
//{
// Popup_Request(POPUP8_OVERVOLTAGE);
//}
//else if (KL30_Volt < 2940)
//{
// Popup_Delete(POPUP8_OVERVOLTAGE);
//}
/*52.后蹄片磨损*/
variable_1 = Line_In_Get_Status(LINE_IN_WEAR2);
if (variable_1 == LINE_IN_LOGIC_VALID)
{
Popup_Request(POPUP8_ATM_CLUCH_OVERHEATING);
Popup_Request(POPUP1_BRAKE_BRAKE);
}
else
{
Popup_Delete(POPUP8_ATM_CLUCH_OVERHEATING);
Popup_Delete(POPUP1_BRAKE_BRAKE);
}
/*53.前蹄片磨损*/
variable_1 = Line_In_Get_Status(LINE_IN_WEAR_IND);
//75.AMT磨耗-离合器磨损 ID：18FF8503　Bite：2 Bit：2,1 001(B) LID $41 : 0x13
variable_1 = Get_ID_18FF8503_Sig_Manouvering_mode();
if ((EOL == 0x13) && (variable_1 == 1))
if (variable_1 == LINE_IN_LOGIC_VALID)
{
Popup_Request(POPUP1_BRAKE_BRAKE);
}
......@@ -831,142 +794,129 @@ void Popups_Polling(void)
Popup_Delete(POPUP1_BRAKE_BRAKE);
}
/*54.DPD自动再生-DPD自动再生中 ID：18FED900 (AUXIO) Byte：8 bit：5,4 01(B) Engine Speed ： 350rpm以上*/
variable_1 = Get_ID_18FED900_Sig_DPF_Regeneration_Status();
//76.低电压报警
//显示条件：发动机启动(350r/min)后，7秒检测到23.5V时
//显示消失条件：10秒检测到25V以上时
if ( E_Speed > 350) //转速350R/min
{
if ( KL30_Volt < 2350) //23.5V
if ((E_Speed >= 350) && (variable_1 == 0x01u))
{
Popup_Request(POPUP8_LOW_VOLTAGE_SPEED);
Popup_Request(POPUP8_DPD_AUTO);
}
else if (KL30_Volt > 2500)
else
{
Popup_Delete(POPUP8_LOW_VOLTAGE_SPEED);
Popup_Delete(POPUP8_DPD_AUTO);
}
/*----第九组---------------------------------------------------------------------*/
/*55.气压过低-请冲入空气*/
/*56.EBS故障（红）-请与五十铃公司联系*/
#if 0
/*----第十组---------------------------------------------------------------------*/
/*57.省油耗建议-急加速*/
if ((AccSubSpeed.AccSpeed_Flag == 1) && (User_App.User_JADD != 0xFF))
{
Popup_Request(POPUP10_RAPID_ACC);
}
else
{
Popup_Delete(POPUP8_LOW_VOLTAGE_SPEED);
Popup_Delete(POPUP10_RAPID_ACC);
}
//77.过电压报警
//显示条件：发动机启动(350r/min)后，7秒检测到30.4V以上时
//显示消失条件：10秒检测到29.4V以下时
if ( E_Speed > 350) //转速350R/min
/*58.省油耗建议-急减速*/
if ((AccSubSpeed.SubSpeed_Flag == 1) && (User_App.User_JSUB != 0xFF))
{
Popup_Request(POPUP10_RAPID_SUB);
}
else
{
if (KL30_Volt > 3044) //30.44V
Popup_Delete(POPUP10_RAPID_SUB);
}
/*59.省油耗建议-请降低发动机转速*/
if ((DataOverESpeed == 1) && (User_App.User_Speed != 0xFF))
{
Popup_Request(POPUP8_OVERVOLTAGE);
Popup_Request(POPUP10_REVAL_ENGINE);
}
else if (KL30_Volt < 2940)
else
{
Popup_Delete(POPUP8_OVERVOLTAGE);
Popup_Delete(POPUP10_REVAL_ENGINE);
}
/*60.省油耗建议-请降低速度*/
if (
((DataOverSpeedK_Line == 1) && (K_Line_Set.K_Line_LID44 != 0xFF)) || \
((AccSubSpeed.GslSpeed_Flag) && (User_App.User_Gsl)) || \
((AccSubSpeed.YblSpeed_Flag) && (User_App.User_Ybl))
)
{
Popup_Request(POPUP10_REVAL_SPEED);
}
else
{
Popup_Delete(POPUP8_OVERVOLTAGE);
Popup_Delete(POPUP10_REVAL_SPEED);
}
//78.DPD自动再生-DPD自动再生中 ID：18FED900 (AUXIO) Byte：8 bit：5,4 01(B) Engine Speed ： 350rpm以上
variable_1 = Get_ID_18FED900_Sig_DPF_Regeneration_Status();
if ((V_Speed) && (E_Speed >= 350) && (variable_1 == 1))
/*----第十一组---------------------------------------------------------------------*/
/*61.发动机机油＆滤清器*/
if (((State_Flag.User_FDJYLQQ_FLAG == 1) || (State_Flag.User_FDJYLQQ_FLAG == 2)) && (User_FDJYLQQ_Time <= 600))
{
Popup_Request(POPUP8_DPD_AUTO_SPEED);
Popup_Request(POPUP11_ENGINE_OIL_FILTERPOPUP11_ENGINE_OIL_FILTER);
}
else
{
Popup_Delete(POPUP8_DPD_AUTO_SPEED);
Popup_Delete(POPUP11_ENGINE_OIL_FILTER);
}
//79.DPD自动再生-再生将自动完成，不需要操作开关
if ((V_Speed == 0) && (E_Speed >= 350) && (variable_1 == 1)) //转速350R/min
/*62.燃油滤清器*/
if (((State_Flag.User_RYLQQ_FLAG == 1) || (State_Flag.User_RYLQQ_FLAG == 2)) && (User_RYLQQ_Time <= 600))
{
Popup_Request(POPUP8_DPD_AUTO);
Popup_Request(POPUP11_FUEL_FILTER);
}
else
{
Popup_Delete(POPUP8_DPD_AUTO);
Popup_Delete(POPUP11_FUEL_FILTER);
}
//80.气压过低-气压过低请注意 A28 GND
//OR条件
//与LED等同时 任一压力传感器为539kPa(1.89V)以下时
variable_1 = Line_In_Get_Status(LINE_IN_BRAKE_AIR_EBS);
if ((V_Speed) && (variable_1 == 0) )
/*63.变速箱油*/
if (((State_Flag.User_BSXY_FLAG == 1) || (State_Flag.User_BSXY_FLAG == 2)) && (User_BSXY_Time <= 600))
{
Popup_Request(POPUP9_AIR_PRESSURE_SPEED);
Popup_Request(POPUP11_T_MISSION_OIL);
}
else
{
Popup_Delete(POPUP9_AIR_PRESSURE_SPEED);
Popup_Delete(POPUP11_T_MISSION_OIL);
}
//81.气压过低-请冲入空气
if ((V_Speed == 0) && (variable_1 == 0) )
/*64.差速器油*/
if (((State_Flag.User_CSQY_FLAG == 1) || (State_Flag.User_CSQY_FLAG == 2)) && (User_CSQY_Time <= 600))
{
Popup_Request(POPUP9_AIR_PRESSURE);
Popup_Request(POPUP11_DIFF_OIL);
}
else
{
Popup_Delete(POPUP9_AIR_PRESSURE);
Popup_Delete(POPUP11_DIFF_OIL);
}
//82.EBS故障（红）-请在安全的场所停车 ID：18F0010B (EBC1) Byte：6 Bit：3-4 01(B) LID $21: 0x01
variable_1 = Get_ID_18F0010B_Sig_EBS_Red_Warning_Lamp_State();
if ((EOL == 0x01) && (V_Speed ) && (variable_1 == 1))
/*65.顺畅系统离合器油*/
//if(((State_Flag.User_LHQY_FLAG == 1) || (State_Flag.User_LHQY_FLAG == 2))&&(User_LHQY_Time <= 600))
if (0)
{
Popup_Request(POPUP9_EBS_ERROR_SPEED);
Popup_Request(POPUP11_CLUTCH_OIL);
}
else
{
Popup_Delete(POPUP9_EBS_ERROR_SPEED);
Popup_Delete(POPUP11_CLUTCH_OIL);
}
//83.EBS故障（红）-请与五十铃公司联系
if ((EOL == 0x01) && (V_Speed == 0 ) && (variable_1 == 1))
/*66.动力转向液*/
if (((State_Flag.User_DLZXY_FLAG == 1) || (State_Flag.User_DLZXY_FLAG == 2)) && (User_DLZXY_Time <= 600))
{
Popup_Request(POPUP9_EBS_ERROR);
Popup_Request(POPUP11_P_STEERING_FRUID);
}
else
{
Popup_Delete(POPUP9_EBS_ERROR);
Popup_Delete(POPUP11_P_STEERING_FRUID);
}
//84.省油耗建议-急加速
//85.省油耗建议-急减速
//86.省油耗建议-请降低发动机转速
//87.省油耗建议-请降低速度
//88.发动机机油＆滤清器 ID：18FF3018 Byte：1 Bit：8,7 01(B) 10(B)
variable_1 = Get_ID_18FF3018_Sig_Engine_Oil_Warnning();
if (variable_1 == 1 || variable_1 == 2)
/*67.更换轮胎・轮胎位置*/
if (((State_Flag.User_LT_FLAG == 1) || (State_Flag.User_LT_FLAG == 2)) && (User_LT_Time <= 600))
{
Popup_Request(POPUP11_ENGINE_OIL_FILTER_ERROR);
Popup_Request(POPUP11_TIRE_ROTATION);
}
else
{
Popup_Delete(POPUP11_ENGINE_OIL_FILTER_ERROR);
Popup_Delete(POPUP11_TIRE_ROTATION);
}
//89.燃油滤清器
//依据警报阈值、前次重置时及现在的ODO值，剩余距离：1000km时，显示提前警报。
//另外，剩余距离：负值时，再次显示本警报。
//90.变速箱油
//91.差速器油
//92.顺畅系统离合器油
//93.动力转向液
//94.更换轮胎・轮胎位置
#endif
}
else /*ig off*/
......@@ -1006,8 +956,8 @@ void Popups_Polling(void)
Popup_Clear(POPUP5_ADBLUE_LEVEL_LOW); /*32.尿素余量少-无车速*/
Popup_Clear(POPUP5_LOW_FAILURE); /*33.胎压报警-气压低*/
Popup_Clear(POPUP5_CAMERA_POLLUTION); /*34.摄像头有污染-请与五十铃公司联系*/
Popup_Clear(POPUP5_AdBlue_LEVEL_LOW); /*35.尿素喷射异常（停止）*/
Popup_Clear(POPUP5_AdBlue_INJ_SYSTEM); /*36.尿素喷射异常（消耗量）*/
Popup_Clear(POPUP5_AdBlue_INJ_SYSTEM); /*35.尿素喷射异常（停止）*/
Popup_Clear(POPUP5_AdBlue_DOS_MALFUNC); /*36.尿素喷射异常（消耗量）*/
Popup_Clear(POPUP5_TPMS_HIGH_AIR); /*37.高圧警報-轮胎高压警告*/
Popup_Clear(POPUP5_TPMS_HIGH_TEMP); /*38.高温警報-轮胎高温警告*/
Popup_Clear(POPUP5_PUSH_DPD_SWITCH1); /*39.DPD手动再生要求1-请按下DPD开关*/
......
source/Application/RTE/Common_Interface.c
View file @ ac0758a6
......@@ -8,6 +8,7 @@
#include "Gauges.h"
#include "dr7f701441.dvf.h"
#include "GPIO.h"
#include "Data_Voltmeter.h"
#include "Line_in.h"
......@@ -71,6 +72,11 @@ static uint16_t CRUISE_STUDY_Time;
static uint16_t CRUISE_SLD1_Time;
static uint16_t CRUISE_SLD2_Time;
static uint16_t VolWarning_Time;
static uint16_t HIGH_VOLTAGE;
static uint16_t LOW_VOLTAGE;
/*每次唤醒调用*/
void Common_DataInit(void)
{
......@@ -102,6 +108,10 @@ void Common_DataInit(void)
CRUISE_STUDY_Time = 0x00u;
CRUISE_SLD1_Time = 0x00u;
CRUISE_SLD2_Time = 0x00u;
VolWarning_Time = 0x00u;
HIGH_VOLTAGE = 0x0u;
LOW_VOLTAGE = 0x0u;
}
/*以下由各个处理模块按需调用*/
......@@ -257,6 +267,19 @@ void Common_Input_Para(void)
PowerIgnOnTimeLine += 2u;
}
/*电压计报警时间*/
if (Gui_Get_Voltmeter_DisplayMode() <= 3u)
{
if (VolWarning_Time <= 5100)
{
VolWarning_Time ++;
}
}
else
{
VolWarning_Time = 0;
}
/**/
if ((State_Flag.User_FDJYLQQ_FLAG == 1) || (State_Flag.User_FDJYLQQ_FLAG == 2))
{
......@@ -372,6 +395,9 @@ void Common_Input_Para(void)
{
CRUISE_SLD1_Time = 0;
}
}
else
{
......@@ -508,6 +534,22 @@ uint8_t Common_Get_Cruise_SLD_TimeSta(void)
return Time_Sta;
}
uint8_t Common_VolWarning_Sta(void)
{
uint8_t DataHiCollantVolWarning = 0u;
if (VolWarning_Time >= 5000u)
{
DataHiCollantVolWarning = 1u;
}
else
{
DataHiCollantVolWarning = 0u;
}
return DataHiCollantVolWarning ;
}
/*EOL诊断配置数据转换为仪表配置数据*/
void ReadDTCEOLValue_Meter_K_LINE(void)
{
......
source/Application/RTE/Common_Interface.h
View file @ ac0758a6
......@@ -129,6 +129,8 @@ uint8_t Get_CanFirstRecv_Event(uint8_t ID);
uint8_t Common_Get_Cruise_TimeSta(void);
uint8_t Common_Get_Cruise_SLD_TimeSta(void);
uint8_t Common_VolWarning_Sta(void);
void ReadDTCEOLValue_Meter_K_LINE(void);
void K_LINE_EOL_InitVal(void);
......
source/Application/common/TYW_stdint.h
View file @ ac0758a6
......@@ -311,9 +311,9 @@ typedef enum
#define Telltales_SelfCheckOffset (uint32_t)(2ul)
#define StartAnimationStart (uint32_t)(2ul)
//#define StartAnimationEnd (uint32_t)(3000ul)
//#define PopupStart (uint32_t)(4000ul)
#define PopupStart (uint32_t)(4000ul)
#define StartAnimationEnd (uint32_t)(50ul)
#define PopupStart (uint32_t)(1000ul)
//#define PopupStart (uint32_t)(1000ul)
#define BackLightStart (uint32_t)(2ul)
/*LED Module*/
......
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