Skip to content

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

调整报警，调整节油指导相关BUG

parent d28e1146
Show whitespace changes
Inline Side-by-side
Showing with 580 additions and 297 deletions
source/Application/APP/Data_Fuel/FuelConfig.h
View file @ 5e1d7cd9
...@@ -7,40 +7,40 @@ ...@@ -7,40 +7,40 @@
//typedef unsigned char INT8_t; //typedef unsigned char INT8_t;
//typedef unsigned int INT32_t; //typedef unsigned int INT32_t;
#define DISPLAY_BOUNDARY_ES 1500 #define DISPLAY_BOUNDARY_ES 1500u
#define DISPLAY_BOUNDARY_1 1500 #define DISPLAY_BOUNDARY_1 1500u
#define DISPLAY_BOUNDARY_2 1373 #define DISPLAY_BOUNDARY_2 1373u
#define DISPLAY_BOUNDARY_3 1191 #define DISPLAY_BOUNDARY_3 1191u
#define DISPLAY_BOUNDARY_4 1009 #define DISPLAY_BOUNDARY_4 1009u
#define DISPLAY_BOUNDARY_5 848 #define DISPLAY_BOUNDARY_5 848u
#define DISPLAY_BOUNDARY_6 697 #define DISPLAY_BOUNDARY_6 697u
#define DISPLAY_BOUNDARY_7 545 #define DISPLAY_BOUNDARY_7 545u
#define DISPLAY_BOUNDARY_8 436 #define DISPLAY_BOUNDARY_8 436u
#define DISPLAY_BOUNDARY_9 345 #define DISPLAY_BOUNDARY_9 345u
#define DISPLAY_BOUNDARY_10 254 #define DISPLAY_BOUNDARY_10 254u
#define DISPLAY_BOUNDARY_11 188 #define DISPLAY_BOUNDARY_11 188u
#define DISPLAY_BOUNDARY_12 132 #define DISPLAY_BOUNDARY_12 132u
#define DISPLAY_BOUNDARY_13 84 #define DISPLAY_BOUNDARY_13 84u
#define DISPLAY_BOUNDARY_FS 65 #define DISPLAY_BOUNDARY_FS 65u
#define BOUNDARY_FUEL_ES 0 #define BOUNDARY_FUEL_ES 0u
#define BOUNDARY_FUEL_1 400 #define BOUNDARY_FUEL_1 400u
#define BOUNDARY_FUEL_2 720 #define BOUNDARY_FUEL_2 720u
#define BOUNDARY_FUEL_3 860 #define BOUNDARY_FUEL_3 860u
#define BOUNDARY_FUEL_4 1040 #define BOUNDARY_FUEL_4 1040u
#define BOUNDARY_FUEL_5 1428 #define BOUNDARY_FUEL_5 1428u
#define BOUNDARY_FUEL_6 2577 #define BOUNDARY_FUEL_6 2577u
#define BOUNDARY_FUEL_7 3750 #define BOUNDARY_FUEL_7 3750u
#define BOUNDARY_FUEL_8 4931 #define BOUNDARY_FUEL_8 4931u
#define BOUNDARY_FUEL_9 5536 #define BOUNDARY_FUEL_9 5536u
#define BOUNDARY_FUEL_10 5724 #define BOUNDARY_FUEL_10 5724u
#define BOUNDARY_FUEL_11 6491 #define BOUNDARY_FUEL_11 6491u
#define BOUNDARY_FUEL_12 6850 #define BOUNDARY_FUEL_12 6850u
#define BOUNDARY_FUEL_13 7199 #define BOUNDARY_FUEL_13 7199u
#define BOUNDARY_FUEL_FS 7600 #define BOUNDARY_FUEL_FS 7600u
#define FUEL_R_MIN_VAL 40 // 10 X ohm #define FUEL_R_MIN_VAL 40u /* 10 X ohm */
#define FUEL_R_MAX_VAL 3000 // 10 X ohm #define FUEL_R_MAX_VAL 3000u /* 10 X ohm */
// Fuel Config // Fuel Config
typedef struct _FuelStruct typedef struct _FuelStruct
......
source/Application/APP/Data_ODO/Services_ODO_user.c
View file @ 5e1d7cd9
...@@ -61,32 +61,32 @@ void Data_User_Mileage_KL30Init(void) ...@@ -61,32 +61,32 @@ void Data_User_Mileage_KL30Init(void)
TripInit[EM_TRIP_B].IsRestart = 1u; TripInit[EM_TRIP_B].IsRestart = 1u;
TripInit[EM_TRIP_JY].Stamp = TempBuf[5]; TripInit[EM_TRIP_JY].Stamp = TempBuf[5];
TripInit[EM_TRIP_JY].MaxValue = 99999; TripInit[EM_TRIP_JY].MaxValue = 999999;
TripInit[EM_TRIP_JY].IsRestart = 1u; TripInit[EM_TRIP_JY].IsRestart = 0u;
TripInit[EM_TRIP_RY].Stamp = TempBuf[6]; TripInit[EM_TRIP_RY].Stamp = TempBuf[6];
TripInit[EM_TRIP_RY].MaxValue = 99999; TripInit[EM_TRIP_RY].MaxValue = 999999;
TripInit[EM_TRIP_RY].IsRestart = 1u; TripInit[EM_TRIP_RY].IsRestart = 0u;
TripInit[EM_TRIP_BSX].Stamp = TempBuf[7]; TripInit[EM_TRIP_BSX].Stamp = TempBuf[7];
TripInit[EM_TRIP_BSX].MaxValue = 99999; TripInit[EM_TRIP_BSX].MaxValue = 999999;
TripInit[EM_TRIP_BSX].IsRestart = 1u; TripInit[EM_TRIP_BSX].IsRestart = 0u;
TripInit[EM_TRIP_CSQ].Stamp = TempBuf[8]; TripInit[EM_TRIP_CSQ].Stamp = TempBuf[8];
TripInit[EM_TRIP_CSQ].MaxValue = 99999; TripInit[EM_TRIP_CSQ].MaxValue = 999999;
TripInit[EM_TRIP_CSQ].IsRestart = 1u; TripInit[EM_TRIP_CSQ].IsRestart = 0u;
TripInit[EM_TRIP_KQGZJ].Stamp = TempBuf[9]; TripInit[EM_TRIP_KQGZJ].Stamp = TempBuf[9];
TripInit[EM_TRIP_KQGZJ].MaxValue = 99999; TripInit[EM_TRIP_KQGZJ].MaxValue = 999999;
TripInit[EM_TRIP_KQGZJ].IsRestart = 1u; TripInit[EM_TRIP_KQGZJ].IsRestart = 0u;
TripInit[EM_TRIP_DLZX].Stamp = TempBuf[10]; TripInit[EM_TRIP_DLZX].Stamp = TempBuf[10];
TripInit[EM_TRIP_DLZX].MaxValue = 99999; TripInit[EM_TRIP_DLZX].MaxValue = 999999;
TripInit[EM_TRIP_DLZX].IsRestart = 1u; TripInit[EM_TRIP_DLZX].IsRestart = 0u;
TripInit[EM_TRIP_LT].Stamp = TempBuf[11]; TripInit[EM_TRIP_LT].Stamp = TempBuf[11];
TripInit[EM_TRIP_LT].MaxValue = 99999; TripInit[EM_TRIP_LT].MaxValue = 999999;
TripInit[EM_TRIP_LT].IsRestart = 1u; TripInit[EM_TRIP_LT].IsRestart = 0u;
Data_Trip_KL30_Init(DataTripBuf, TripInit, EM_TRIP_MAX, Func.EEPromWrite_Cbk); Data_Trip_KL30_Init(DataTripBuf, TripInit, EM_TRIP_MAX, Func.EEPromWrite_Cbk);
} }
......
source/Application/APP/Telltales/Telltales_user.c
View file @ 5e1d7cd9
...@@ -1335,6 +1335,8 @@ uint8_t LED_EVSC_L_Judgement(void) ...@@ -1335,6 +1335,8 @@ uint8_t LED_EVSC_L_Judgement(void)
uint8_t m_Condition5 = 0u; uint8_t m_Condition5 = 0u;
uint16_t m_Condition6 = 0u; uint16_t m_Condition6 = 0u;
uint16_t m_Condition7 = 0u; uint16_t m_Condition7 = 0u;
uint8_t m_AirSta1 = 0u;
uint8_t m_AirSta2 = 0u;
CanStatus1 = CAN_MSG_Status(ID_CanMsg18FE4F0B_Msg_Count); CanStatus1 = CAN_MSG_Status(ID_CanMsg18FE4F0B_Msg_Count);
CanStatus2 = CAN_MSG_Status(ID_CanMsg18F0010B_Msg_Count); CanStatus2 = CAN_MSG_Status(ID_CanMsg18F0010B_Msg_Count);
...@@ -1345,13 +1347,15 @@ uint8_t LED_EVSC_L_Judgement(void) ...@@ -1345,13 +1347,15 @@ uint8_t LED_EVSC_L_Judgement(void)
m_Condition5 = (uint8_t)Get_ID_18FE4F0B_Sig_VDC_Fully_operational(); m_Condition5 = (uint8_t)Get_ID_18FE4F0B_Sig_VDC_Fully_operational();
m_Condition6 = Common_Get_Air1_Data(); /*气压1 1.89以下*/ m_Condition6 = Common_Get_Air1_Data(); /*气压1 1.89以下*/
m_Condition7 = Common_Get_Air2_Data(); /*气压1 1.89以下*/ m_Condition7 = Common_Get_Air2_Data(); /*气压1 1.89以下*/
m_AirSta1 = Common_Get_Air1_Valid();
m_AirSta2 = Common_Get_Air2_Valid();
/*做个回差，去抖*/ /*做个回差，去抖*/
if ((m_Condition6 < 1890u) || (m_Condition7 < 1890u)) if (((m_Condition6 < 1890u) && (m_AirSta1 == 1u)) || ((m_Condition7 < 1890u) && (m_AirSta2 == 1u)))
{ {
L12_Air_Sta = 1u; L12_Air_Sta = 1u;
} }
else if ((m_Condition6 >= 1990u) && (m_Condition7 >= 1990u)) else if (((m_Condition6 >= 1990u) && (m_Condition7 >= 1990u)) || ((m_AirSta1 == 0u) && (m_AirSta2 == 0u)))
{ {
L12_Air_Sta = 0u; L12_Air_Sta = 0u;
} }
......
source/Application/Alarm/Popup_List.c
View file @ 5e1d7cd9
...@@ -12,74 +12,74 @@ const Popup_Attribute_t PopupAttributeTable[POPUP_MAX] = ...@@ -12,74 +12,74 @@ const Popup_Attribute_t PopupAttributeTable[POPUP_MAX] =
/*=============================================================================================================================================================================================================================================================================== /*===============================================================================================================================================================================================================================================================================
报警名称 | 报警类型 | 优先级 | 副优先级 | +15 On/Off | 报警类 | 成员列表 | 成员数量 | 文字消息 | 显示模式 | 报警音 | 声音提示模式 报警名称 | 报警类型 | 优先级 | 副优先级 | +15 On/Off | 报警类 | 成员列表 | 成员数量 | 文字消息 | 显示模式 | 报警音 | 声音提示模式
-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------*/ -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------*/
{/*00 POPUP1_BRAKE_BLACK =0x00u */ POPUP_TYPE_FATAL , 0u, 0u, POPUP_IGN_ON, POPUP1_BRAKE_BLACK , NULL, 1u, POPUP1_MSG_BRAKE_BLACK , POPUP_MODE_MULTI, POPUP_NONE , POPUP_MODE_MULTI,}, {/*00 POPUP1_BRAKE_BLACK =0x00u */ POPUP_TYPE_FATAL , 0u, 0u, POPUP_IGN_ON, POPUP1_BRAKE_BLACK , NULL, 1u, POPUP1_MSG_BRAKE_BLACK , POPUP_MODE_MULTI, SND_NONE , SND_TYPE_MULTI,},
{/*01 POPUP1_BRAKE_BRAKE */ POPUP_TYPE_FATAL , 0u, 0u, POPUP_IGN_ON, POPUP1_BRAKE_BRAKE , NULL, 1u, POPUP1_MSG_BRAKE_BRAKE , POPUP_MODE_MULTI, POPUP_NONE , POPUP_MODE_MULTI,}, {/*01 POPUP1_BRAKE_BRAKE */ POPUP_TYPE_FATAL , 0u, 0u, POPUP_IGN_ON, POPUP1_BRAKE_BRAKE , NULL, 1u, POPUP1_MSG_BRAKE_BRAKE , POPUP_MODE_MULTI, SND_NONE , SND_TYPE_MULTI,},
{/*02 POPUP1_BRAKE_SPACING_R */ POPUP_TYPE_FATAL , 0u, 0u, POPUP_IGN_ON, POPUP1_BRAKE_SPACING_R , NULL, 1u, POPUP1_MSG_BRAKE_SPACING_R , POPUP_MODE_MULTI, POPUP_NONE , POPUP_MODE_MULTI,}, {/*02 POPUP1_BRAKE_SPACING_R */ POPUP_TYPE_FATAL , 0u, 0u, POPUP_IGN_ON, POPUP1_BRAKE_SPACING_R , NULL, 1u, POPUP1_MSG_BRAKE_SPACING_R , POPUP_MODE_MULTI, SND_NONE , SND_TYPE_MULTI,},
{/*03 POPUP1_BRAKE_SPACING_COLLISION */ POPUP_TYPE_FATAL , 0u, 0u, POPUP_IGN_ON, POPUP1_BRAKE_SPACING_COLLISION , NULL, 1u, POPUP1_MSG_BRAKE_SPACING_COLLISION , POPUP_MODE_MULTI, POPUP_NONE , POPUP_MODE_MULTI,}, {/*03 POPUP1_BRAKE_SPACING_COLLISION */ POPUP_TYPE_FATAL , 0u, 0u, POPUP_IGN_ON, POPUP1_BRAKE_SPACING_COLLISION , NULL, 1u, POPUP1_MSG_BRAKE_SPACING_COLLISION , POPUP_MODE_MULTI, SND_NONE , SND_TYPE_MULTI,},
{/*04 POPUP1_BRAKE_SPACING_Y */ POPUP_TYPE_FATAL , 0u, 0u, POPUP_IGN_ON, POPUP1_BRAKE_SPACING_Y , NULL, 1u, POPUP1_MSG_BRAKE_SPACING_Y , POPUP_MODE_MULTI, POPUP_NONE , POPUP_MODE_MULTI,}, {/*04 POPUP1_BRAKE_SPACING_Y */ POPUP_TYPE_FATAL , 0u, 0u, POPUP_IGN_ON, POPUP1_BRAKE_SPACING_Y , NULL, 1u, POPUP1_MSG_BRAKE_SPACING_Y , POPUP_MODE_MULTI, SND_NONE , SND_TYPE_MULTI,},
{/*05 POPUT1_ASR_OPERATE */ POPUP_TYPE_FATAL , 0u, 0u, POPUP_IGN_ON, POPUT1_ASR_OPERATE , NULL, 1u, POPUT1_MSG_ASR_OPERATE , POPUP_MODE_MULTI, POPUP_NONE , POPUP_MODE_MULTI,}, {/*05 POPUT1_ASR_OPERATE */ POPUP_TYPE_FATAL , 0u, 0u, POPUP_IGN_ON, POPUT1_ASR_OPERATE , NULL, 1u, POPUT1_MSG_ASR_OPERATE , POPUP_MODE_MULTI, SND_NONE , SND_TYPE_MULTI,},
{/*06 POPUT2_PTO */ POPUP_TYPE_FATAL , 0u, 0u, POPUP_IGN_ON, POPUT2_PTO , NULL, 1u, POPUT2_MSG_PTO , POPUP_MODE_MULTI, POPUP_NONE , POPUP_MODE_MULTI,}, {/*06 POPUT2_PTO */ POPUP_TYPE_FATAL , 0u, 0u, POPUP_IGN_ON, POPUT2_PTO , NULL, 1u, POPUT2_MSG_PTO , POPUP_MODE_MULTI, SND_NONE , SND_TYPE_MULTI,},
{/*07 POPUP2_PARKING_BRAKE */ POPUP_TYPE_FATAL , 0u, 1u, POPUP_IGN_ON, POPUP2_PARKING_BRAKE , NULL, 1u, POPUP2_MSG_PARKING_BRAKE , POPUP_MODE_MULTI, POPUP_NONE , POPUP_MODE_MULTI,}, {/*07 POPUP2_PARKING_BRAKE */ POPUP_TYPE_FATAL , 0u, 1u, POPUP_IGN_ON, POPUP2_PARKING_BRAKE , NULL, 1u, POPUP2_MSG_PARKING_BRAKE , POPUP_MODE_MULTI, SND_NONE , SND_TYPE_MULTI,},
{/*08 POPUP2_AIRMATIC_HIGHT */ POPUP_TYPE_WARNING , 0u, 2u, POPUP_IGN_ON, POPUP2_AIRMATIC_HIGHT , NULL, 1u, POPUP2_MSG_AIRMATIC_HIGHT , POPUP_MODE_MULTI, POPUP_NONE , POPUP_MODE_MULTI,}, {/*08 POPUP2_AIRMATIC_HIGHT */ POPUP_TYPE_WARNING , 0u, 2u, POPUP_IGN_ON, POPUP2_AIRMATIC_HIGHT , NULL, 1u, POPUP2_MSG_AIRMATIC_HIGHT , POPUP_MODE_MULTI, SND_NONE , SND_TYPE_MULTI,},
{/*09 POPUP3_CRUISE */ POPUP_TYPE_WARNING , 1u, 0u, POPUP_IGN_ON, POPUP3_CRUISE , NULL, 1u, POPUP3_MSG_CRUISE , POPUP_MODE_MULTI, POPUP_NONE , POPUP_MODE_MULTI,}, {/*09 POPUP3_CRUISE */ POPUP_TYPE_WARNING , 1u, 0u, POPUP_IGN_ON, POPUP3_CRUISE , NULL, 1u, POPUP3_MSG_CRUISE , POPUP_MODE_MULTI, SND_NONE , SND_TYPE_MULTI,},
{/*10 POPUP3_VARIABLE_SLD */ POPUP_TYPE_WARNING , 1u, 0u, POPUP_IGN_ON, POPUP3_VARIABLE_SLD , NULL, 1u, POPUP3_MSG_VARIABLE_SLD , POPUP_MODE_MULTI, POPUP_NONE , POPUP_MODE_MULTI,}, {/*10 POPUP3_VARIABLE_SLD */ POPUP_TYPE_WARNING , 1u, 0u, POPUP_IGN_ON, POPUP3_VARIABLE_SLD , NULL, 1u, POPUP3_MSG_VARIABLE_SLD , POPUP_MODE_MULTI, SND_NONE , SND_TYPE_MULTI,},
{/*11 POPUT4_ABNORMAL_CHARGE */ POPUP_TYPE_WARNING , 2u, 0u, POPUP_IGN_ON, POPUT4_ABNORMAL_CHARGE , NULL, 1u, POPUT4_MSG_ABNORMAL_CHARGE , POPUP_MODE_MULTI, POPUP_NONE , POPUP_MODE_MULTI,}, {/*11 POPUT4_ABNORMAL_CHARGE */ POPUP_TYPE_WARNING , 2u, 0u, POPUP_IGN_ON, POPUT4_ABNORMAL_CHARGE , NULL, 1u, POPUT4_MSG_ABNORMAL_CHARGE , POPUP_MODE_MULTI, SND_NONE , SND_TYPE_MULTI,},
{/*12 POPUP4_OIL_PRESSURE */ POPUP_TYPE_WARNING , 2u, 1u, POPUP_IGN_ON, POPUP4_OIL_PRESSURE , NULL, 1u, POPUP4_MSG_OIL_PRESSURE , POPUP_MODE_MULTI, POPUP_NONE , POPUP_MODE_MULTI,}, {/*12 POPUP4_OIL_PRESSURE */ POPUP_TYPE_WARNING , 2u, 1u, POPUP_IGN_ON, POPUP4_OIL_PRESSURE , NULL, 1u, POPUP4_MSG_OIL_PRESSURE , POPUP_MODE_MULTI, SND_NONE , SND_TYPE_MULTI,},
{/*13 POPUP4_AMT_INIT_EXCE */ POPUP_TYPE_WARNING , 2u, 2u, POPUP_IGN_ON, POPUP4_AMT_INIT_EXCE , NULL, 1u, POPUP4_MSG_AMT_INIT_EXCE , POPUP_MODE_MULTI, POPUP_NONE , POPUP_MODE_MULTI,}, {/*13 POPUP4_AMT_INIT_EXCE */ POPUP_TYPE_WARNING , 2u, 2u, POPUP_IGN_ON, POPUP4_AMT_INIT_EXCE , NULL, 1u, POPUP4_MSG_AMT_INIT_EXCE , POPUP_MODE_MULTI, SND_NONE , SND_TYPE_MULTI,},
{/*14 POPUP4_ADBLUE_QUALITY */ POPUP_TYPE_WARNING , 2u, 3u, POPUP_IGN_ON, POPUP4_ADBLUE_QUALITY , NULL, 1u, POPUP4_MSG_ADBLUE_QUALITY , POPUP_MODE_MULTI, POPUP_NONE , POPUP_MODE_MULTI,}, {/*14 POPUP4_ADBLUE_QUALITY */ POPUP_TYPE_WARNING , 2u, 3u, POPUP_IGN_ON, POPUP4_ADBLUE_QUALITY , NULL, 1u, POPUP4_MSG_ADBLUE_QUALITY , POPUP_MODE_MULTI, SND_NONE , SND_TYPE_MULTI,},
{/*15 POPUP4_ADBLUE_SPRAY */ POPUP_TYPE_WARNING , 2u, 4u, POPUP_IGN_ON, POPUP4_ADBLUE_SPRAY , NULL, 1u, POPUP4_MSG_ADBLUE_SPRAY , POPUP_MODE_MULTI, POPUP_NONE , POPUP_MODE_MULTI,}, {/*15 POPUP4_ADBLUE_SPRAY */ POPUP_TYPE_WARNING , 2u, 4u, POPUP_IGN_ON, POPUP4_ADBLUE_SPRAY , NULL, 1u, POPUP4_MSG_ADBLUE_SPRAY , POPUP_MODE_MULTI, SND_NONE , SND_TYPE_MULTI,},
{/*16 POPUP4_ADBLUE_SUPPLY */ POPUP_TYPE_WARNING , 2u, 5u, POPUP_IGN_ON, POPUP4_ADBLUE_SUPPLY , NULL, 1u, POPUP4_MSG_ADBLUE_SUPPLY , POPUP_MODE_MULTI, POPUP_NONE , POPUP_MODE_MULTI,}, {/*16 POPUP4_ADBLUE_SUPPLY */ POPUP_TYPE_WARNING , 2u, 5u, POPUP_IGN_ON, POPUP4_ADBLUE_SUPPLY , NULL, 1u, POPUP4_MSG_ADBLUE_SUPPLY , POPUP_MODE_MULTI, SND_NONE , SND_TYPE_MULTI,},
{/*17 POPUP4_START_ENG */ POPUP_TYPE_WARNING , 2u, 6u, POPUP_IGN_ON, POPUP4_START_ENG , NULL, 1u, POPUP4_MSG_START_ENG , POPUP_MODE_MULTI, POPUP_NONE , POPUP_MODE_MULTI,}, {/*17 POPUP4_START_ENG */ POPUP_TYPE_WARNING , 2u, 6u, POPUP_IGN_ON, POPUP4_START_ENG , NULL, 1u, POPUP4_MSG_START_ENG , POPUP_MODE_MULTI, SND_NONE , SND_TYPE_MULTI,},
{/*18 POPUP4_DPD_AUTO */ POPUP_TYPE_WARNING , 2u, 7u, POPUP_IGN_ON, POPUP4_DPD_AUTO , NULL, 1u, POPUP4_MSG_DPD_AUTO , POPUP_MODE_MULTI, POPUP_NONE , POPUP_MODE_MULTI,}, {/*18 POPUP4_DPD_AUTO */ POPUP_TYPE_WARNING , 2u, 7u, POPUP_IGN_ON, POPUP4_DPD_AUTO , NULL, 1u, POPUP4_MSG_DPD_AUTO , POPUP_MODE_MULTI, SND_NONE , SND_TYPE_MULTI,},
{/*19 POPUP5_OVER_HEAT */ POPUP_TYPE_WARNING , 3u, 0u, POPUP_IGN_ON, POPUP5_OVER_HEAT , NULL, 1u, POPUP5_MSG_OVER_HEAT , POPUP_MODE_MULTI, POPUP_NONE , POPUP_MODE_MULTI,}, {/*19 POPUP5_OVER_HEAT */ POPUP_TYPE_WARNING , 3u, 0u, POPUP_IGN_ON, POPUP5_OVER_HEAT , NULL, 1u, POPUP5_MSG_OVER_HEAT , POPUP_MODE_MULTI, SND_NONE , SND_TYPE_MULTI,},
{/*20 POPUP5_LOW_COOLANT */ POPUP_TYPE_WARNING , 3u, 0u, POPUP_IGN_ON, POPUP5_LOW_COOLANT , NULL, 1u, POPUP5_MSG_LOW_COOLANT , POPUP_MODE_MULTI, POPUP_NONE , POPUP_MODE_MULTI,}, {/*20 POPUP5_LOW_COOLANT */ POPUP_TYPE_WARNING , 3u, 0u, POPUP_IGN_ON, POPUP5_LOW_COOLANT , NULL, 1u, POPUP5_MSG_LOW_COOLANT , POPUP_MODE_MULTI, SND_NONE , SND_TYPE_MULTI,},
{/*21 POPUP5_ENGINE_OIL_PRESSURE */ POPUP_TYPE_WARNING , 3u, 0u, POPUP_IGN_ON, POPUP5_ENGINE_OIL_PRESSURE , NULL, 1u, POPUP5_MSG_ENGINE_OIL_PRESSURE , POPUP_MODE_MULTI, POPUP_NONE , POPUP_MODE_MULTI,}, {/*21 POPUP5_ENGINE_OIL_PRESSURE */ POPUP_TYPE_WARNING , 3u, 0u, POPUP_IGN_ON, POPUP5_ENGINE_OIL_PRESSURE , NULL, 1u, POPUP5_MSG_ENGINE_OIL_PRESSURE , POPUP_MODE_MULTI, SND_NONE , SND_TYPE_MULTI,},
{/*22 POPUP5_METER_FAILURE */ POPUP_TYPE_WARNING , 3u, 0u, POPUP_IGN_ON, POPUP5_METER_FAILURE , NULL, 1u, POPUP5_MSG_METER_FAILURE , POPUP_MODE_MULTI, POPUP_NONE , POPUP_MODE_MULTI,}, {/*22 POPUP5_METER_FAILURE */ POPUP_TYPE_WARNING , 3u, 0u, POPUP_IGN_ON, POPUP5_METER_FAILURE , NULL, 1u, POPUP5_MSG_METER_FAILURE , POPUP_MODE_MULTI, SND_NONE , SND_TYPE_MULTI,},
{/*22 POPUP5_CAN_ERROR */ POPUP_TYPE_WARNING , 3u, 0u, POPUP_IGN_ON, POPUP5_CAN_ERROR , NULL, 1u, POPUP5_MSG_CAN_ERROR , POPUP_MODE_MULTI, POPUP_NONE , POPUP_MODE_MULTI,}, {/*22 POPUP5_CAN_ERROR */ POPUP_TYPE_WARNING , 3u, 0u, POPUP_IGN_ON, POPUP5_CAN_ERROR , NULL, 1u, POPUP5_MSG_CAN_ERROR , POPUP_MODE_MULTI, SND_NONE , SND_TYPE_MULTI,},
{/*24 POPUP5_SPEED_LIMIT */ POPUP_TYPE_WARNING , 3u, 0u, POPUP_IGN_ON, POPUP5_SPEED_LIMIT , NULL, 1u, POPUP5_MSG_SPEED_LIMIT , POPUP_MODE_MULTI, POPUP_NONE , POPUP_MODE_MULTI,}, {/*24 POPUP5_SPEED_LIMIT */ POPUP_TYPE_WARNING , 3u, 0u, POPUP_IGN_ON, POPUP5_SPEED_LIMIT , NULL, 1u, POPUP5_MSG_SPEED_LIMIT , POPUP_MODE_MULTI, SND_NONE , SND_TYPE_MULTI,},
{/*25 POPUP5_TORQUE_REDUCTION */ POPUP_TYPE_WARNING , 3u, 0u, POPUP_IGN_ON, POPUP5_TORQUE_REDUCTION , NULL, 1u, POPUP5_MSG_TORQUE_REDUCTION , POPUP_MODE_MULTI, POPUP_NONE , POPUP_MODE_MULTI,}, {/*25 POPUP5_TORQUE_REDUCTION */ POPUP_TYPE_WARNING , 3u, 0u, POPUP_IGN_ON, POPUP5_TORQUE_REDUCTION , NULL, 1u, POPUP5_MSG_TORQUE_REDUCTION , POPUP_MODE_MULTI, SND_NONE , SND_TYPE_MULTI,},
{/*26 POPUP5_INCORRECT_ADBLUE */ POPUP_TYPE_WARNING , 3u, 0u, POPUP_IGN_ON, POPUP5_INCORRECT_ADBLUE , NULL, 1u, POPUP5_MSG_INCORRECT_ADBLUE , POPUP_MODE_MULTI, POPUP_NONE , POPUP_MODE_MULTI,}, {/*26 POPUP5_INCORRECT_ADBLUE */ POPUP_TYPE_WARNING , 3u, 0u, POPUP_IGN_ON, POPUP5_INCORRECT_ADBLUE , NULL, 1u, POPUP5_MSG_INCORRECT_ADBLUE , POPUP_MODE_MULTI, SND_NONE , SND_TYPE_MULTI,},
{/*27 POPUP5_CRITICAL_EMISSION */ POPUP_TYPE_WARNING , 3u, 0u, POPUP_IGN_ON, POPUP5_CRITICAL_EMISSION , NULL, 1u, POPUP5_MSG_CRITICAL_EMISSION , POPUP_MODE_MULTI, POPUP_NONE , POPUP_MODE_MULTI,}, {/*27 POPUP5_CRITICAL_EMISSION */ POPUP_TYPE_WARNING , 3u, 0u, POPUP_IGN_ON, POPUP5_CRITICAL_EMISSION , NULL, 1u, POPUP5_MSG_CRITICAL_EMISSION , POPUP_MODE_MULTI, SND_NONE , SND_TYPE_MULTI,},
{/*28 POPUP5_AMT_SPANNER_WARNING */ POPUP_TYPE_WARNING , 3u, 0u, POPUP_IGN_ON, POPUP5_AMT_SPANNER_WARNING , NULL, 1u, POPUP5_MSG_AMT_SPANNER_WARNING , POPUP_MODE_MULTI, POPUP_NONE , POPUP_MODE_MULTI,}, {/*28 POPUP5_AMT_SPANNER_WARNING */ POPUP_TYPE_WARNING , 3u, 0u, POPUP_IGN_ON, POPUP5_AMT_SPANNER_WARNING , NULL, 1u, POPUP5_MSG_AMT_SPANNER_WARNING , POPUP_MODE_MULTI, SND_NONE , SND_TYPE_MULTI,},
{/*29 POPUP5_AMT_LOW_AIR_WARNING */ POPUP_TYPE_WARNING , 3u, 0u, POPUP_IGN_ON, POPUP5_AMT_LOW_AIR_WARNING , NULL, 1u, POPUP5_MSG_AMT_LOW_AIR_WARNING , POPUP_MODE_MULTI, POPUP_NONE , POPUP_MODE_MULTI,}, {/*29 POPUP5_AMT_LOW_AIR_WARNING */ POPUP_TYPE_WARNING , 3u, 0u, POPUP_IGN_ON, POPUP5_AMT_LOW_AIR_WARNING , NULL, 1u, POPUP5_MSG_AMT_LOW_AIR_WARNING , POPUP_MODE_MULTI, SND_NONE , SND_TYPE_MULTI,},
{/*30 POPUP5_LOW_PRESSURE_ALARM */ POPUP_TYPE_WARNING , 3u, 0u, POPUP_IGN_ON, POPUP5_LOW_PRESSURE_ALARM , NULL, 1u, POPUP5_MSG_LOW_PRESSURE_ALARM , POPUP_MODE_MULTI, POPUP_NONE , POPUP_MODE_MULTI,}, {/*30 POPUP5_LOW_PRESSURE_ALARM */ POPUP_TYPE_WARNING , 3u, 0u, POPUP_IGN_ON, POPUP5_LOW_PRESSURE_ALARM , NULL, 1u, POPUP5_MSG_LOW_PRESSURE_ALARM , POPUP_MODE_MULTI, SND_NONE , SND_TYPE_MULTI,},
{/*31 POPUP5_APP_ADBLUE */ POPUP_TYPE_WARNING , 3u, 0u, POPUP_IGN_ON, POPUP5_APP_ADBLUE , NULL, 1u, POPUP5_MSG_APP_ADBLUE , POPUP_MODE_MULTI, POPUP_NONE , POPUP_MODE_MULTI,}, {/*31 POPUP5_APP_ADBLUE */ POPUP_TYPE_WARNING , 3u, 0u, POPUP_IGN_ON, POPUP5_APP_ADBLUE , NULL, 1u, POPUP5_MSG_APP_ADBLUE , POPUP_MODE_MULTI, SND_NONE , SND_TYPE_MULTI,},
{/*32 POPUP5_ADBLUE_LEVEL_LOW */ POPUP_TYPE_WARNING , 3u, 0u, POPUP_IGN_ON, POPUP5_ADBLUE_LEVEL_LOW , NULL, 1u, POPUP5_MSG_ADBLUE_LEVEL_LOW , POPUP_MODE_MULTI, POPUP_NONE , POPUP_MODE_MULTI,}, {/*32 POPUP5_ADBLUE_LEVEL_LOW */ POPUP_TYPE_WARNING , 3u, 0u, POPUP_IGN_ON, POPUP5_ADBLUE_LEVEL_LOW , NULL, 1u, POPUP5_MSG_ADBLUE_LEVEL_LOW , POPUP_MODE_MULTI, SND_NONE , SND_TYPE_MULTI,},
{/*33 POPUP5_LOW_FAILURE */ POPUP_TYPE_WARNING , 3u, 0u, POPUP_IGN_ON, POPUP5_LOW_FAILURE , NULL, 1u, POPUP5_MSG_LOW_FAILURE , POPUP_MODE_MULTI, POPUP_NONE , POPUP_MODE_MULTI,}, {/*33 POPUP5_LOW_FAILURE */ POPUP_TYPE_WARNING , 3u, 0u, POPUP_IGN_ON, POPUP5_LOW_FAILURE , NULL, 1u, POPUP5_MSG_LOW_FAILURE , POPUP_MODE_MULTI, SND_NONE , SND_TYPE_MULTI,},
{/*34 POPUP5_CAMERA_POLLUTION */ POPUP_TYPE_WARNING , 3u, 0u, POPUP_IGN_ON, POPUP5_CAMERA_POLLUTION , NULL, 1u, POPUP5_MSG_CAMERA_POLLUTION , POPUP_MODE_MULTI, POPUP_NONE , POPUP_MODE_MULTI,}, {/*34 POPUP5_CAMERA_POLLUTION */ POPUP_TYPE_WARNING , 3u, 0u, POPUP_IGN_ON, POPUP5_CAMERA_POLLUTION , NULL, 1u, POPUP5_MSG_CAMERA_POLLUTION , POPUP_MODE_MULTI, SND_NONE , SND_TYPE_MULTI,},
{/*35 POPUP5_AdBlue_INJ_SYSTEM */ POPUP_TYPE_WARNING , 3u, 0u, 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, 0u, POPUP_IGN_ON, POPUP5_AdBlue_INJ_SYSTEM , NULL, 1u, POPUP5_MSG_AdBlue_INJ_SYSTEM , POPUP_MODE_MULTI, SND_NONE , SND_TYPE_MULTI,},
{/*36 POPUP5_AdBlue_DOS_MALFUNC */ POPUP_TYPE_WARNING , 3u, 0u, POPUP_IGN_ON, POPUP5_AdBlue_DOS_MALFUNC , NULL, 1u, POPUP5_MSG_AdBlue_DOS_MALFUNC , POPUP_MODE_MULTI, POPUP_NONE , POPUP_MODE_MULTI,}, {/*36 POPUP5_AdBlue_DOS_MALFUNC */ POPUP_TYPE_WARNING , 3u, 0u, POPUP_IGN_ON, POPUP5_AdBlue_DOS_MALFUNC , NULL, 1u, POPUP5_MSG_AdBlue_DOS_MALFUNC , POPUP_MODE_MULTI, SND_NONE , SND_TYPE_MULTI,},
{/*37 POPUP5_TPMS_HIGH_AIR */ POPUP_TYPE_WARNING , 3u, 0u, POPUP_IGN_ON, POPUP5_TPMS_HIGH_AIR , NULL, 1u, POPUP5_MSG_TPMS_HIGH_AIR , POPUP_MODE_MULTI, POPUP_NONE , POPUP_MODE_MULTI,}, {/*37 POPUP5_TPMS_HIGH_AIR */ POPUP_TYPE_WARNING , 3u, 0u, POPUP_IGN_ON, POPUP5_TPMS_HIGH_AIR , NULL, 1u, POPUP5_MSG_TPMS_HIGH_AIR , POPUP_MODE_MULTI, SND_NONE , SND_TYPE_MULTI,},
{/*38 POPUP5_TPMS_HIGH_TEMP */ POPUP_TYPE_WARNING , 3u, 0u, POPUP_IGN_ON, POPUP5_TPMS_HIGH_TEMP , NULL, 1u, POPUP5_MSG_TPMS_HIGH_TEMP , POPUP_MODE_MULTI, POPUP_NONE , POPUP_MODE_MULTI,}, {/*38 POPUP5_TPMS_HIGH_TEMP */ POPUP_TYPE_WARNING , 3u, 0u, POPUP_IGN_ON, POPUP5_TPMS_HIGH_TEMP , NULL, 1u, POPUP5_MSG_TPMS_HIGH_TEMP , POPUP_MODE_MULTI, SND_NONE , SND_TYPE_MULTI,},
{/*39 POPUP5_PUSH_DPD_SWITCH1 */ POPUP_TYPE_WARNING , 3u, 0u, POPUP_IGN_ON, POPUP5_PUSH_DPD_SWITCH1 , NULL, 1u, POPUP5_MSG_PUSH_DPD_SWITCH1 , POPUP_MODE_MULTI, POPUP_NONE , POPUP_MODE_MULTI,}, {/*39 POPUP5_PUSH_DPD_SWITCH1 */ POPUP_TYPE_WARNING , 3u, 0u, POPUP_IGN_ON, POPUP5_PUSH_DPD_SWITCH1 , NULL, 1u, POPUP5_MSG_PUSH_DPD_SWITCH1 , POPUP_MODE_MULTI, SND_NONE , SND_TYPE_MULTI,},
{/*40 POPUP5_PUSH_DPD_SWITCH2 */ POPUP_TYPE_WARNING , 3u, 0u, POPUP_IGN_ON, POPUP5_PUSH_DPD_SWITCH2 , NULL, 1u, POPUP5_MSG_PUSH_DPD_SWITCH2 , POPUP_MODE_MULTI, POPUP_NONE , POPUP_MODE_MULTI,}, {/*40 POPUP5_PUSH_DPD_SWITCH2 */ POPUP_TYPE_WARNING , 3u, 0u, POPUP_IGN_ON, POPUP5_PUSH_DPD_SWITCH2 , NULL, 1u, POPUP5_MSG_PUSH_DPD_SWITCH2 , POPUP_MODE_MULTI, SND_NONE , SND_TYPE_MULTI,},
{/*41 POPUP5_TPMS_FAILURE */ POPUP_TYPE_WARNING , 3u, 0u, POPUP_IGN_ON, POPUP5_TPMS_FAILURE , NULL, 1u, POPUP5_MSG_TPMS_FAILURE , POPUP_MODE_MULTI, POPUP_NONE , POPUP_MODE_MULTI,}, {/*41 POPUP5_TPMS_FAILURE */ POPUP_TYPE_WARNING , 3u, 0u, POPUP_IGN_ON, POPUP5_TPMS_FAILURE , NULL, 1u, POPUP5_MSG_TPMS_FAILURE , POPUP_MODE_MULTI, SND_NONE , SND_TYPE_MULTI,},
{/*42 POPUP5_TPMS_MONITOR_DROP */ POPUP_TYPE_WARNING , 3u, 0u, POPUP_IGN_ON, POPUP5_TPMS_MONITOR_DROP , NULL, 1u, POPUP5_MSG_TPMS_MONITOR_DROP , POPUP_MODE_MULTI, POPUP_NONE , POPUP_MODE_MULTI,}, {/*42 POPUP5_TPMS_MONITOR_DROP */ POPUP_TYPE_WARNING , 3u, 0u, POPUP_IGN_ON, POPUP5_TPMS_MONITOR_DROP , NULL, 1u, POPUP5_MSG_TPMS_MONITOR_DROP , POPUP_MODE_MULTI, SND_NONE , SND_TYPE_MULTI,},
{/*43 POPUP6_HEIGHT_CONTROL */ POPUP_TYPE_WARNING , 3u, 0u, POPUP_IGN_ON, POPUP6_HEIGHT_CONTROL , NULL, 1u, POPUP6_MSG_HEIGHT_CONTROL , POPUP_MODE_MULTI, POPUP_NONE , POPUP_MODE_MULTI,}, {/*43 POPUP6_HEIGHT_CONTROL */ POPUP_TYPE_WARNING , 3u, 0u, POPUP_IGN_ON, POPUP6_HEIGHT_CONTROL , NULL, 1u, POPUP6_MSG_HEIGHT_CONTROL , POPUP_MODE_MULTI, SND_NONE , SND_TYPE_MULTI,},
{/*44 POPUP6_PTO_STOP */ POPUP_TYPE_WARNING , 3u, 0u, POPUP_IGN_ON, POPUP6_PTO_STOP , NULL, 1u, POPUP6_MSG_PTO_STOP , POPUP_MODE_MULTI, POPUP_NONE , POPUP_MODE_MULTI,}, {/*44 POPUP6_PTO_STOP */ POPUP_TYPE_WARNING , 3u, 0u, POPUP_IGN_ON, POPUP6_PTO_STOP , NULL, 1u, POPUP6_MSG_PTO_STOP , POPUP_MODE_MULTI, SND_NONE , SND_TYPE_MULTI,},
{/*45 POPUP7_CHARGE_ABNORMAL */ POPUP_TYPE_WARNING , 3u, 0u, POPUP_IGN_ON, POPUP7_CHARGE_ABNORMAL , NULL, 1u, POPUP7_MSG_CHARGE_ABNORMAL , POPUP_MODE_MULTI, POPUP_NONE , POPUP_MODE_MULTI,}, {/*45 POPUP7_CHARGE_ABNORMAL */ POPUP_TYPE_WARNING , 3u, 0u, POPUP_IGN_ON, POPUP7_CHARGE_ABNORMAL , NULL, 1u, POPUP7_MSG_CHARGE_ABNORMAL , POPUP_MODE_MULTI, SND_NONE , SND_TYPE_MULTI,},
{/*46 POPUP7_AMT_ERROR */ POPUP_TYPE_WARNING , 3u, 0u, POPUP_IGN_ON, POPUP7_AMT_ERROR , NULL, 1u, POPUP7_MSG_AMT_ERROR , POPUP_MODE_MULTI, POPUP_NONE , POPUP_MODE_MULTI,}, {/*46 POPUP7_AMT_ERROR */ POPUP_TYPE_WARNING , 3u, 0u, POPUP_IGN_ON, POPUP7_AMT_ERROR , NULL, 1u, POPUP7_MSG_AMT_ERROR , POPUP_MODE_MULTI, SND_NONE , SND_TYPE_MULTI,},
{/*47 POPUP8_REFUEL */ POPUP_TYPE_WARNING , 3u, 0u, POPUP_IGN_ON, POPUP8_REFUEL , NULL, 1u, POPUP8_MSG_REFUEL , POPUP_MODE_MULTI, POPUP_NONE , POPUP_MODE_MULTI,}, {/*47 POPUP8_REFUEL */ POPUP_TYPE_WARNING , 3u, 0u, POPUP_IGN_ON, POPUP8_REFUEL , NULL, 1u, POPUP8_MSG_REFUEL , POPUP_MODE_MULTI, SND_NONE , SND_TYPE_MULTI,},
{/*48 POPUP8_ATM_CLUCH_OVERHEATING */ POPUP_TYPE_WARNING , 3u, 0u, POPUP_IGN_ON, POPUP8_ATM_CLUCH_OVERHEATING , NULL, 1u, POPUP8_MSG_ATM_CLUCH_OVERHEATING , POPUP_MODE_MULTI, POPUP_NONE , POPUP_MODE_MULTI,}, {/*48 POPUP8_ATM_CLUCH_OVERHEATING */ POPUP_TYPE_WARNING , 3u, 0u, POPUP_IGN_ON, POPUP8_ATM_CLUCH_OVERHEATING , NULL, 1u, POPUP8_MSG_ATM_CLUCH_OVERHEATING , POPUP_MODE_MULTI, SND_NONE , SND_TYPE_MULTI,},
{/*49 POPUP8_ATM_WORN_OUT */ POPUP_TYPE_WARNING , 3u, 0u, POPUP_IGN_ON, POPUP8_ATM_WORN_OUT , NULL, 1u, POPUP8_MSG_ATM_WORN_OUT , POPUP_MODE_MULTI, POPUP_NONE , POPUP_MODE_MULTI,}, {/*49 POPUP8_ATM_WORN_OUT */ POPUP_TYPE_WARNING , 3u, 0u, POPUP_IGN_ON, POPUP8_ATM_WORN_OUT , NULL, 1u, POPUP8_MSG_ATM_WORN_OUT , POPUP_MODE_MULTI, SND_NONE , SND_TYPE_MULTI,},
{/*50 POPUP8_LOWVOLTAGE */ POPUP_TYPE_WARNING , 3u, 0u, POPUP_IGN_ON, POPUP8_LOWVOLTAGE , NULL, 1u, POPUP8_MSG_LOWVOLTAGE , POPUP_MODE_MULTI, POPUP_NONE , POPUP_MODE_MULTI,}, {/*50 POPUP8_LOWVOLTAGE */ POPUP_TYPE_WARNING , 3u, 0u, POPUP_IGN_ON, POPUP8_LOWVOLTAGE , NULL, 1u, POPUP8_MSG_LOWVOLTAGE , POPUP_MODE_MULTI, SND_NONE , SND_TYPE_MULTI,},
{/*51 POPUP8_OVERVOLTAGE */ POPUP_TYPE_WARNING , 3u, 0u, POPUP_IGN_ON, POPUP8_OVERVOLTAGE , NULL, 1u, POPUP8_MSG_OVERVOLTAGE , POPUP_MODE_MULTI, POPUP_NONE , POPUP_MODE_MULTI,}, {/*51 POPUP8_OVERVOLTAGE */ POPUP_TYPE_WARNING , 3u, 0u, POPUP_IGN_ON, POPUP8_OVERVOLTAGE , NULL, 1u, POPUP8_MSG_OVERVOLTAGE , POPUP_MODE_MULTI, SND_NONE , SND_TYPE_MULTI,},
{/*52 POPUP8_BRAKE_BLOCKR */ POPUP_TYPE_WARNING , 3u, 0u, POPUP_IGN_ON, POPUP8_BRAKE_BLOCKR , NULL, 1u, POPUP8_MSG_BRAKE_BLOCKR , POPUP_MODE_MULTI, POPUP_NONE , POPUP_MODE_MULTI,}, {/*52 POPUP8_BRAKE_BLOCKR */ POPUP_TYPE_WARNING , 3u, 0u, POPUP_IGN_ON, POPUP8_BRAKE_BLOCKR , NULL, 1u, POPUP8_MSG_BRAKE_BLOCKR , POPUP_MODE_MULTI, SND_NONE , SND_TYPE_MULTI,},
{/*53 POPUP8_BRAKE_BLOCKF */ POPUP_TYPE_WARNING , 3u, 0u, POPUP_IGN_ON, POPUP8_BRAKE_BLOCKF , NULL, 1u, POPUP8_MSG_BRAKE_BLOCKF , POPUP_MODE_MULTI, POPUP_NONE , POPUP_MODE_MULTI,}, {/*53 POPUP8_BRAKE_BLOCKF */ POPUP_TYPE_WARNING , 3u, 0u, POPUP_IGN_ON, POPUP8_BRAKE_BLOCKF , NULL, 1u, POPUP8_MSG_BRAKE_BLOCKF , POPUP_MODE_MULTI, SND_NONE , SND_TYPE_MULTI,},
{/*54 POPUP8_DPD_AUTO */ POPUP_TYPE_WARNING , 3u, 0u, POPUP_IGN_ON, POPUP8_DPD_AUTO , NULL, 1u, POPUP8_MSG_DPD_AUTO , POPUP_MODE_MULTI, POPUP_NONE , POPUP_MODE_MULTI,}, {/*54 POPUP8_DPD_AUTO */ POPUP_TYPE_WARNING , 3u, 0u, POPUP_IGN_ON, POPUP8_DPD_AUTO , NULL, 1u, POPUP8_MSG_DPD_AUTO , POPUP_MODE_MULTI, SND_NONE , SND_TYPE_MULTI,},
{/*55 POPUP9_AIR_PRESSURE */ POPUP_TYPE_WARNING , 3u, 0u, POPUP_IGN_ON, POPUP9_AIR_PRESSURE , NULL, 1u, POPUP9_MSG_AIR_PRESSURE , POPUP_MODE_MULTI, POPUP_NONE , POPUP_MODE_MULTI,}, {/*55 POPUP9_AIR_PRESSURE */ POPUP_TYPE_WARNING , 3u, 0u, POPUP_IGN_ON, POPUP9_AIR_PRESSURE , NULL, 1u, POPUP9_MSG_AIR_PRESSURE , POPUP_MODE_MULTI, SND_NONE , SND_TYPE_MULTI,},
{/*56 POPUP9_EBS_ERROR */ POPUP_TYPE_WARNING , 3u, 0u, POPUP_IGN_ON, POPUP9_EBS_ERROR , NULL, 1u, POPUP9_MSG_EBS_ERROR , POPUP_MODE_MULTI, POPUP_NONE , POPUP_MODE_MULTI,}, {/*56 POPUP9_EBS_ERROR */ POPUP_TYPE_WARNING , 3u, 0u, POPUP_IGN_ON, POPUP9_EBS_ERROR , NULL, 1u, POPUP9_MSG_EBS_ERROR , POPUP_MODE_MULTI, SND_NONE , SND_TYPE_MULTI,},
{/*57 POPUP10_RAPID_ACC */ POPUP_TYPE_WARNING , 3u, 0u, POPUP_IGN_ON, POPUP10_RAPID_ACC , NULL, 1u, POPUP10_MSG_RAPID_ACC , POPUP_MODE_MULTI, POPUP_NONE , POPUP_MODE_MULTI,}, {/*57 POPUP10_RAPID_ACC */ POPUP_TYPE_WARNING , 3u, 0u, POPUP_IGN_ON, POPUP10_RAPID_ACC , NULL, 1u, POPUP10_MSG_RAPID_ACC , POPUP_MODE_MULTI, SND_NONE , SND_TYPE_MULTI,},
{/*58 POPUP10_RAPID_SUB */ POPUP_TYPE_WARNING , 3u, 0u, POPUP_IGN_ON, POPUP10_RAPID_SUB , NULL, 1u, POPUP10_MSG_RAPID_SUB , POPUP_MODE_MULTI, POPUP_NONE , POPUP_MODE_MULTI,}, {/*58 POPUP10_RAPID_SUB */ POPUP_TYPE_WARNING , 3u, 0u, POPUP_IGN_ON, POPUP10_RAPID_SUB , NULL, 1u, POPUP10_MSG_RAPID_SUB , POPUP_MODE_MULTI, SND_NONE , SND_TYPE_MULTI,},
{/*59 POPUP10_REVAL_ENGINE */ POPUP_TYPE_WARNING , 3u, 0u, POPUP_IGN_ON, POPUP10_REVAL_ENGINE , NULL, 1u, POPUP10_MSG_REVAL_ENGINE , POPUP_MODE_MULTI, POPUP_NONE , POPUP_MODE_MULTI,}, {/*59 POPUP10_REVAL_ENGINE */ POPUP_TYPE_WARNING , 3u, 0u, POPUP_IGN_ON, POPUP10_REVAL_ENGINE , NULL, 1u, POPUP10_MSG_REVAL_ENGINE , POPUP_MODE_MULTI, SND_NONE , SND_TYPE_MULTI,},
{/*60 POPUP10_REVAL_SPEED */ POPUP_TYPE_WARNING , 3u, 0u, POPUP_IGN_ON, POPUP10_REVAL_SPEED , NULL, 1u, POPUP10_MSG_REVAL_SPEED , POPUP_MODE_MULTI, POPUP_NONE , POPUP_MODE_MULTI,}, {/*60 POPUP10_REVAL_SPEED */ POPUP_TYPE_WARNING , 3u, 0u, POPUP_IGN_ON, POPUP10_REVAL_SPEED , NULL, 1u, POPUP10_MSG_REVAL_SPEED , POPUP_MODE_MULTI, SND_NONE , SND_TYPE_MULTI,},
{/*61 POPUP11_ENGINE_OIL_FILTER */ POPUP_TYPE_WARNING , 3u, 0u, POPUP_IGN_ON, POPUP11_ENGINE_OIL_FILTER , NULL, 1u, POPUP11_MSG_ENGINE_OIL_FILTER , POPUP_MODE_MULTI, POPUP_NONE , POPUP_MODE_MULTI,}, {/*61 POPUP11_ENGINE_OIL_FILTER */ POPUP_TYPE_WARNING , 3u, 0u, POPUP_IGN_ON, POPUP11_ENGINE_OIL_FILTER , NULL, 1u, POPUP11_MSG_ENGINE_OIL_FILTER , POPUP_MODE_MULTI, SND_NONE , SND_TYPE_MULTI,},
{/*62 POPUP11_FUEL_FILTER */ POPUP_TYPE_WARNING , 3u, 0u, POPUP_IGN_ON, POPUP11_FUEL_FILTER , NULL, 1u, POPUP11_MSG_FUEL_FILTER , POPUP_MODE_MULTI, POPUP_NONE , POPUP_MODE_MULTI,}, {/*62 POPUP11_FUEL_FILTER */ POPUP_TYPE_WARNING , 3u, 0u, POPUP_IGN_ON, POPUP11_FUEL_FILTER , NULL, 1u, POPUP11_MSG_FUEL_FILTER , POPUP_MODE_MULTI, SND_NONE , SND_TYPE_MULTI,},
{/*63 POPUP11_T_MISSION_OIL */ POPUP_TYPE_WARNING , 3u, 0u, POPUP_IGN_ON, POPUP11_T_MISSION_OIL , NULL, 1u, POPUP11_MSG_T_MISSION_OIL , POPUP_MODE_MULTI, POPUP_NONE , POPUP_MODE_MULTI,}, {/*63 POPUP11_T_MISSION_OIL */ POPUP_TYPE_WARNING , 3u, 0u, POPUP_IGN_ON, POPUP11_T_MISSION_OIL , NULL, 1u, POPUP11_MSG_T_MISSION_OIL , POPUP_MODE_MULTI, SND_NONE , SND_TYPE_MULTI,},
{/*64 POPUP11_DIFF_OIL */ POPUP_TYPE_WARNING , 3u, 0u, POPUP_IGN_ON, POPUP11_DIFF_OIL , NULL, 1u, POPUP11_MSG_DIFF_OIL , POPUP_MODE_MULTI, POPUP_NONE , POPUP_MODE_MULTI,}, {/*64 POPUP11_DIFF_OIL */ POPUP_TYPE_WARNING , 3u, 0u, POPUP_IGN_ON, POPUP11_DIFF_OIL , NULL, 1u, POPUP11_MSG_DIFF_OIL , POPUP_MODE_MULTI, SND_NONE , SND_TYPE_MULTI,},
{/*65 POPUP11_CLUTCH_OIL */ POPUP_TYPE_WARNING , 3u, 0u, POPUP_IGN_ON, POPUP11_CLUTCH_OIL , NULL, 1u, POPUP11_MSG_CLUTCH_OIL , POPUP_MODE_MULTI, POPUP_NONE , POPUP_MODE_MULTI,}, {/*65 POPUP11_CLUTCH_OIL */ POPUP_TYPE_WARNING , 3u, 0u, POPUP_IGN_ON, POPUP11_CLUTCH_OIL , NULL, 1u, POPUP11_MSG_CLUTCH_OIL , POPUP_MODE_MULTI, SND_NONE , SND_TYPE_MULTI,},
{/*66 POPUP11_P_STEERING_FRUID */ POPUP_TYPE_WARNING , 3u, 0u, POPUP_IGN_ON, POPUP11_P_STEERING_FRUID , NULL, 1u, POPUP11_MSG_P_STEERING_FRUID , POPUP_MODE_MULTI, POPUP_NONE , POPUP_MODE_MULTI,}, {/*66 POPUP11_P_STEERING_FRUID */ POPUP_TYPE_WARNING , 3u, 0u, POPUP_IGN_ON, POPUP11_P_STEERING_FRUID , NULL, 1u, POPUP11_MSG_P_STEERING_FRUID , POPUP_MODE_MULTI, SND_NONE , SND_TYPE_MULTI,},
{/*67 POPUP11_TIRE_ROTATION */ POPUP_TYPE_WARNING , 3u, 0u, POPUP_IGN_ON, POPUP11_TIRE_ROTATION , NULL, 1u, POPUP11_MSG_TIRE_ROTATION , POPUP_MODE_MULTI, POPUP_NONE , POPUP_MODE_MULTI,}, {/*67 POPUP11_TIRE_ROTATION */ POPUP_TYPE_WARNING , 3u, 0u, POPUP_IGN_ON, POPUP11_TIRE_ROTATION , NULL, 1u, POPUP11_MSG_TIRE_ROTATION , POPUP_MODE_MULTI, SND_NONE , SND_TYPE_MULTI,},
/*=============================================================================================================================================================================================================================================================================*/ /*=============================================================================================================================================================================================================================================================================*/
}; };
\ No newline at end of file
source/Application/Alarm/Popup_Message_List.h
View file @ 5e1d7cd9
...@@ -85,8 +85,20 @@ enum PopupMessageName ...@@ -85,8 +85,20 @@ enum PopupMessageName
消息类型定义 消息类型定义
******************************************************************************/ ******************************************************************************/
#define POPUP_TYPE_GENERAL 0x00u /*一般消息*/ #define POPUP_TYPE_GENERAL 0x00u /*一般消息*/
#define POPUP_TYPE_GENERAL 0x01u /*扭矩限制、车速限制 交互显示*/ #define POPUP_TYPE_TPMS 0x01u /*胎压消息*/
#define POPUP_TYPE_ADBULE_ANOMALY 0x02u /*尿素喷射异常(停止、消耗量)交互显示*/ #define POPUP_TYPE_DOOR 0x02u /*门开消息*/
#define POPUP_TYPE_RADAR 0x03u /*雷达消息*/
#define POPUP_TYPE_SERVICE 0x04u /*保养消息*/
#define POPUP_TYPE_OVSPD 0x05u /*超速消息*/
#define POPUP_TYPE_KEYS 0x06u /*按键激活消息*/
#define POPUP_TYPE_HOOVES 0x07u /*蹄片磨损*/
#define POPUP_TYPE_ADDFUEL 0x08u /*是否已加油*/
#define POPUP_TYPE_KEYBATLOW 0x09u /*钥匙电量低*/
#define POPUP_TYPE_GOHOME 0x0Au /*伴我回家*/
#define POPUP_TYPE_ADASLDSHW 0x0Bu /*方向盘脱手*/
#define POPUP_TYPE_TSR_TR 0x0Cu /*限速标识提醒*/
#define POPUP_TYPE_DRIVING 0x0Du /*本次行驶信息*/
#define POPUP_TYPE_MENU 0x0Eu
/****************************************************************************** /******************************************************************************
伪文字消息列表 伪文字消息列表
......
source/Application/Alarm/Popups.c
View file @ 5e1d7cd9
...@@ -14,6 +14,7 @@ ...@@ -14,6 +14,7 @@
#include "Line_in.h" #include "Line_in.h"
#include "Telltales_user.h" #include "Telltales_user.h"
#include "Data_CoolantTemperature.h" #include "Data_CoolantTemperature.h"
#include "Data_VehicleSpeed.h"
#include "Data_Voltmeter.h" #include "Data_Voltmeter.h"
#include "Data_Fuel_User.h" #include "Data_Fuel_User.h"
#include "FuelConfig.h" #include "FuelConfig.h"
...@@ -57,6 +58,7 @@ void Popups_Polling(void) ...@@ -57,6 +58,7 @@ void Popups_Polling(void)
if ((u32IG_ON_Timer <= PopupStart) && (u32IG_ON_Timer >= 2u)) if ((u32IG_ON_Timer <= PopupStart) && (u32IG_ON_Timer >= 2u))
{ {
;
} }
else else
{ {
...@@ -241,9 +243,10 @@ void Popups_Polling(void) ...@@ -241,9 +243,10 @@ void Popups_Polling(void)
{ {
/*11.--1--充电异常（系统检测）*/ /*11.--1--充电异常（系统检测）*/
variable_1 = Line_In_Get_Status(LINE_IN_CHARGE); variable_1 = Line_In_Get_Status(LINE_IN_CHARGE);
variable_2 = Common_VolWarning_Sta(); variable_2 = Gui_Get_Voltmeter_DisplayMode(); /*当前电压格数*/
variable_3 = Get_Voltmeter_Valid();
if ((variable_1 == LINE_IN_LOGIC_VALID) || (variable_2 < 4u)) if ((variable_1 == LINE_IN_LOGIC_VALID) || ((variable_2 < 4u) && (variable_3 == 1u)))
{ {
Popup_Request(POPUT4_ABNORMAL_CHARGE); Popup_Request(POPUT4_ABNORMAL_CHARGE);
} }
...@@ -254,9 +257,10 @@ void Popups_Polling(void) ...@@ -254,9 +257,10 @@ void Popups_Polling(void)
/*12.--2--油压（系统检测）*/ /*12.--2--油压（系统检测）*/
variable_1 = Line_In_Get_Status(LINE_IN_ENG_OIL); variable_1 = Line_In_Get_Status(LINE_IN_ENG_OIL);
variable_2 = Common_VolWarning_Sta(); variable_2 = Gui_Get_Voltmeter_DisplayMode(); /*当前电压格数*/
variable_3 = Get_Voltmeter_Valid();
if ((variable_1 == LINE_IN_LOGIC_VALID) || (variable_2 < 4u)) if ((variable_1 == LINE_IN_LOGIC_VALID) || ((variable_2 < 4u) && (variable_3 == 1u)))
{ {
Popup_Request(POPUP4_OIL_PRESSURE); Popup_Request(POPUP4_OIL_PRESSURE);
} }
...@@ -368,7 +372,7 @@ void Popups_Polling(void) ...@@ -368,7 +372,7 @@ void Popups_Polling(void)
Popup_Clear(POPUP5_OVER_HEAT); Popup_Clear(POPUP5_OVER_HEAT);
} }
/*20.冷却水（冷却液不足） B32 GND*/ /*20.--2--冷却水（冷却液不足） B32 GND*/
variable_1 = Line_In_Get_Status(LINE_IN_LOW_COOLANT); variable_1 = Line_In_Get_Status(LINE_IN_LOW_COOLANT);
if (variable_1 == LINE_IN_LOGIC_VALID) if (variable_1 == LINE_IN_LOGIC_VALID)
...@@ -380,7 +384,7 @@ void Popups_Polling(void) ...@@ -380,7 +384,7 @@ void Popups_Polling(void)
Popup_Delete(POPUP5_LOW_COOLANT); Popup_Delete(POPUP5_LOW_COOLANT);
} }
/*21.油压(机油)请在安全场所停车 发动机启动(350r/min)后、350r/min持续5秒以上时，A32信号（10ms周期监测），连续20次检出Lo时。*/ /*21.--3--油压(机油)请在安全场所停车 发动机启动(350r/min)后、350r/min持续5秒以上时，A32信号（10ms周期监测），连续20次检出Lo时。*/
variable_1 = Line_In_Get_Status(LINE_IN_ENG_OIL); variable_1 = Line_In_Get_Status(LINE_IN_ENG_OIL);
if ((E_Speed > 350u) && (variable_1 == LINE_IN_LOGIC_VALID)) if ((E_Speed > 350u) && (variable_1 == LINE_IN_LOGIC_VALID))
...@@ -392,10 +396,10 @@ void Popups_Polling(void) ...@@ -392,10 +396,10 @@ void Popups_Polling(void)
Popup_Delete(POPUP5_ENGINE_OIL_PRESSURE); Popup_Delete(POPUP5_ENGINE_OIL_PRESSURE);
} }
/*22.仪表故障-请与五十铃公司联系*/ /*22.--4--仪表故障-请与五十铃公司联系*/
Popup_Clear(POPUP5_METER_FAILURE); Popup_Clear(POPUP5_METER_FAILURE);
/*23.通信系统-请与五十铃公司联系*/ /*23.--5--通信系统-请与五十铃公司联系*/
if (Can_BusOFF == ID_TOTAL_MAX) if (Can_BusOFF == ID_TOTAL_MAX)
{ {
Popup_Request(POPUP5_CAN_ERROR); Popup_Request(POPUP5_CAN_ERROR);
...@@ -405,7 +409,7 @@ void Popups_Polling(void) ...@@ -405,7 +409,7 @@ void Popups_Polling(void)
Popup_Delete(POPUP5_CAN_ERROR); Popup_Delete(POPUP5_CAN_ERROR);
} }
/*24.车速限制-图1 ID：18FF2300 Byte：7 Bit：4,3 10(B)*/ /*24.--6--车速限制-图1 ID：18FF2300 Byte：7 Bit：4,3 10(B)*/
variable_1 = Get_ID_18FF2300_Sig_Engine_Derate(); variable_1 = Get_ID_18FF2300_Sig_Engine_Derate();
if ((variable_1 == 0x02u) || (variable_1 == 0x03u)) if ((variable_1 == 0x02u) || (variable_1 == 0x03u))
...@@ -417,7 +421,7 @@ void Popups_Polling(void) ...@@ -417,7 +421,7 @@ void Popups_Polling(void)
Popup_Delete(POPUP5_SPEED_LIMIT); Popup_Delete(POPUP5_SPEED_LIMIT);
} }
/*25.扭矩限制-图2 ID：18FF2300 Byte：7 Bit：4,3 01(B)*/ /*25.--7--扭矩限制-图2 ID：18FF2300 Byte：7 Bit：4,3 01(B)*/
if ((variable_1 == 0x01u) || (variable_1 == 0x03u)) if ((variable_1 == 0x01u) || (variable_1 == 0x03u))
{ {
Popup_Request(POPUP5_TORQUE_REDUCTION); Popup_Request(POPUP5_TORQUE_REDUCTION);
...@@ -427,7 +431,7 @@ void Popups_Polling(void) ...@@ -427,7 +431,7 @@ void Popups_Polling(void)
Popup_Delete(POPUP5_TORQUE_REDUCTION); Popup_Delete(POPUP5_TORQUE_REDUCTION);
} }
/*26.尿素品质异常-图1 ID：18FF2300 Byte：3 Bit：6,5 01(B)*/ /*26.--8--尿素品质异常-图1 ID：18FF2300 Byte：3 Bit：6,5 01(B)*/
variable_1 = Get_ID_18FF2300_Sig_Amber3(); variable_1 = Get_ID_18FF2300_Sig_Amber3();
if (variable_1 == 0x01u) if (variable_1 == 0x01u)
...@@ -439,7 +443,7 @@ void Popups_Polling(void) ...@@ -439,7 +443,7 @@ void Popups_Polling(void)
Popup_Delete(POPUP5_INCORRECT_ADBLUE); Popup_Delete(POPUP5_INCORRECT_ADBLUE);
} }
/*27.临界排放故障-图1 ID：18FF2300 Byte：7 Bit：6,5 01(B)*/ /*27.--9--临界排放故障-图1 ID：18FF2300 Byte：7 Bit：6,5 01(B)*/
variable_1 = Get_ID_18FF2300_Sig_EXH_System(); variable_1 = Get_ID_18FF2300_Sig_EXH_System();
if (variable_1 == 1) if (variable_1 == 1)
...@@ -451,9 +455,9 @@ void Popups_Polling(void) ...@@ -451,9 +455,9 @@ void Popups_Polling(void)
Popup_Delete(POPUP5_CRITICAL_EMISSION); Popup_Delete(POPUP5_CRITICAL_EMISSION);
} }
if (K_Line_Set.K_Line_LID41 = 0x13u) if (K_Line_Set.K_Line_LID41 == 0x13u)
{ {
/*28.AMT异常-图1 ID：18FF8503 Byte：1 Bit：4,3 01(B) LID $41 : 0x13 PGN：65413 TC2DIS*/ /*28.--10--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(); variable_1 = Get_ID_18FF8503_Sig_Spanner_Warning();
if (variable_1 == 1) if (variable_1 == 1)
...@@ -465,7 +469,7 @@ void Popups_Polling(void) ...@@ -465,7 +469,7 @@ void Popups_Polling(void)
Popup_Delete(POPUP5_AMT_SPANNER_WARNING); Popup_Delete(POPUP5_AMT_SPANNER_WARNING);
} }
/*29.AMT异常(气压低下)-图1 ID：18FF8503 Byte：2 Bit：6,5 01(B) LID $41 : 0x13 PGN：65413 TC2DIS*/ /*29.--11--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(); variable_1 = Get_ID_18FF2300_Sig_Glow_Lamp();
if (variable_1 == 1) if (variable_1 == 1)
...@@ -483,10 +487,10 @@ void Popups_Polling(void) ...@@ -483,10 +487,10 @@ void Popups_Polling(void)
Popup_Clear(POPUP5_AMT_LOW_AIR_WARNING); Popup_Clear(POPUP5_AMT_LOW_AIR_WARNING);
} }
/*30.胎压 低圧警報-轮胎漏气警告 ID：18011733 Byte：5 Bit：5 01(B) LID $3E : 0x01*/ /*30.--12--胎压 低圧警報-轮胎漏气警告 ID：18011733 Byte：5 Bit：5 01(B) LID $3E : 0x01*/
variable_1 = Get_TPMSFast_air_leakage(); variable_1 = Get_TPMSFast_air_leakage();
if ((K_Line_Set.K_Line_LID3E = 0x01u) && (variable_1 == 0x01u)) if ((K_Line_Set.K_Line_LID3E == 0x01u) && (variable_1 == 0x01u))
{ {
Popup_Request(POPUP5_LOW_PRESSURE_ALARM); Popup_Request(POPUP5_LOW_PRESSURE_ALARM);
} }
...@@ -495,7 +499,7 @@ void Popups_Polling(void) ...@@ -495,7 +499,7 @@ void Popups_Polling(void)
Popup_Delete(POPUP5_LOW_PRESSURE_ALARM); Popup_Delete(POPUP5_LOW_PRESSURE_ALARM);
} }
/*31.尿素补给-补充尿素溶液-图1 ID：18FF2300 Byte：3 Bit：4,3 01(B)*/ /*31.--13--尿素补给-补充尿素溶液-图1 ID：18FF2300 Byte：3 Bit：4,3 01(B)*/
variable_1 = Get_ID_18FF2300_Sig_Amber2(); variable_1 = Get_ID_18FF2300_Sig_Amber2();
if (variable_1 == 0x01u) if (variable_1 == 0x01u)
...@@ -507,7 +511,7 @@ void Popups_Polling(void) ...@@ -507,7 +511,7 @@ void Popups_Polling(void)
Popup_Delete(POPUP5_APP_ADBLUE); Popup_Delete(POPUP5_APP_ADBLUE);
} }
/*32.尿素余量少-无车速-图2 ID：18FF2300 Byte：3 Bit：4,3 10(B)*/ /*32.--14--尿素余量少-无车速-图2 ID：18FF2300 Byte：3 Bit：4,3 10(B)*/
variable_1 = Get_ID_18FF2300_Sig_Amber2(); variable_1 = Get_ID_18FF2300_Sig_Amber2();
if (variable_1 == 0x02u) if (variable_1 == 0x02u)
...@@ -519,10 +523,10 @@ void Popups_Polling(void) ...@@ -519,10 +523,10 @@ void Popups_Polling(void)
Popup_Delete(POPUP5_ADBLUE_LEVEL_LOW); Popup_Delete(POPUP5_ADBLUE_LEVEL_LOW);
} }
/*33. 低圧警報（低下）ID：18011733 Byte：5 Bit：8 01(B) LID $3E : 0x01*/ /*33.--15--低圧警報（低下）ID：18011733 Byte：5 Bit：8 01(B) LID $3E : 0x01*/
variable_1 = Get_TPMSLow_Presure_Sta(); variable_1 = Get_TPMSLow_Presure_Sta();
if ((K_Line_Set.K_Line_LID3E = 0x01u) && (variable_1 == 0x01u)) if ((K_Line_Set.K_Line_LID3E == 0x01u) && (variable_1 == 0x01u))
{ {
Popup_Request(POPUP5_LOW_FAILURE); Popup_Request(POPUP5_LOW_FAILURE);
} }
...@@ -531,10 +535,10 @@ void Popups_Polling(void) ...@@ -531,10 +535,10 @@ void Popups_Polling(void)
Popup_Delete(POPUP5_LOW_FAILURE); Popup_Delete(POPUP5_LOW_FAILURE);
} }
/*34.摄像头有污染-请与五十铃公司联系 ID：18FE5BE8 Byte7 Bit5-8 0010(B) 0011(B) LID $27: 0x01*/ /*34.--16--摄像头有污染-请与五十铃公司联系 ID：18FE5BE8 Byte7 Bit5-8 0010(B) 0011(B) LID $27: 0x01*/
variable_1 = Get_ID_18FE5BE8_Sig_Camera_Status(); variable_1 = Get_ID_18FE5BE8_Sig_Camera_Status();
if ((K_Line_Set.K_Line_LID27 = 0x01u) && ((variable_1 == 0x02u) || (variable_2 == 0x03u))) if ((K_Line_Set.K_Line_LID27 == 0x01u) && ((variable_1 == 0x02u) || (variable_2 == 0x03u)))
{ {
Popup_Request(POPUP5_CAMERA_POLLUTION); Popup_Request(POPUP5_CAMERA_POLLUTION);
} }
...@@ -543,7 +547,7 @@ void Popups_Polling(void) ...@@ -543,7 +547,7 @@ void Popups_Polling(void)
Popup_Delete(POPUP5_CAMERA_POLLUTION); Popup_Delete(POPUP5_CAMERA_POLLUTION);
} }
/*35.尿素喷射异常（停止）-图1 ID：18FF2300 Byte：3 Bit：2,1 01(B)*/ /*35.--17尿素喷射异常（停止）-图1 ID：18FF2300 Byte：3 Bit：2,1 01(B)*/
variable_1 = Get_ID_18FF2300_Sig_Amber1(); variable_1 = Get_ID_18FF2300_Sig_Amber1();
if ((variable_1 == 0x01u) || (variable_1 == 0x03u)) if ((variable_1 == 0x01u) || (variable_1 == 0x03u))
...@@ -555,7 +559,7 @@ void Popups_Polling(void) ...@@ -555,7 +559,7 @@ void Popups_Polling(void)
Popup_Delete(POPUP5_AdBlue_INJ_SYSTEM); Popup_Delete(POPUP5_AdBlue_INJ_SYSTEM);
} }
/*36.尿素喷射异常（消耗量）-图1 ID：18FF2300 Byte：3 Bit：2,1 10(B)*/ /*36.--18--尿素喷射异常（消耗量）-图1 ID：18FF2300 Byte：3 Bit：2,1 10(B)*/
variable_1 = Get_ID_18FF2300_Sig_Amber1(); variable_1 = Get_ID_18FF2300_Sig_Amber1();
if ((variable_1 == 0x02u) || (variable_1 == 0x03u)) if ((variable_1 == 0x02u) || (variable_1 == 0x03u))
...@@ -567,10 +571,10 @@ void Popups_Polling(void) ...@@ -567,10 +571,10 @@ void Popups_Polling(void)
Popup_Delete(POPUP5_AdBlue_DOS_MALFUNC); Popup_Delete(POPUP5_AdBlue_DOS_MALFUNC);
} }
/*37.高圧警報-轮胎高压警告 ID：18011733 Byte：5 Bit：7 01(B) LID $3E : 0x01*/ /*37.--19--高圧警報-轮胎高压警告 ID：18011733 Byte：5 Bit：7 01(B) LID $3E : 0x01*/
variable_1 = Get_TPMSHigh_Presure_Sta(); variable_1 = Get_TPMSHigh_Presure_Sta();
if ((K_Line_Set.K_Line_LID3E = 0x01u) && (variable_1 == 0x01u)) if ((K_Line_Set.K_Line_LID3E == 0x01u) && (variable_1 == 0x01u))
{ {
Popup_Request(POPUP5_TPMS_HIGH_AIR); Popup_Request(POPUP5_TPMS_HIGH_AIR);
} }
...@@ -579,10 +583,10 @@ void Popups_Polling(void) ...@@ -579,10 +583,10 @@ void Popups_Polling(void)
Popup_Delete(POPUP5_TPMS_HIGH_AIR); Popup_Delete(POPUP5_TPMS_HIGH_AIR);
} }
/*38.高温警報-轮胎高温警告 ID：18011733 Byte：5 Bit：6 01(B) LID $3E : 0x01*/ /*38.--20--高温警報-轮胎高温警告 ID：18011733 Byte：5 Bit：6 01(B) LID $3E : 0x01*/
variable_1 = Get_TPMSHigh_Temperature_Sta(); variable_1 = Get_TPMSHigh_Temperature_Sta();
if ((K_Line_Set.K_Line_LID3E = 0x01u) && (variable_1 == 0x01u)) if ((K_Line_Set.K_Line_LID3E == 0x01u) && (variable_1 == 0x01u))
{ {
Popup_Request(POPUP5_TPMS_HIGH_TEMP); Popup_Request(POPUP5_TPMS_HIGH_TEMP);
} }
...@@ -591,7 +595,7 @@ void Popups_Polling(void) ...@@ -591,7 +595,7 @@ void Popups_Polling(void)
Popup_Delete(POPUP5_TPMS_HIGH_TEMP); Popup_Delete(POPUP5_TPMS_HIGH_TEMP);
} }
/*39.DPD手动再生要求1-DPD需要再生 18FD7C00 Byte：1 Bit：3-1 001：On – solid*/ /*39.--22--DPD手动再生要求1-DPD需要再生 18FD7C00 Byte：1 Bit：3-1 001：On – solid*/
variable_1 = Get_ID_18FD7C00_Sig_DPF_Lamp_Status_Amber(); variable_1 = Get_ID_18FD7C00_Sig_DPF_Lamp_Status_Amber();
if (variable_1 == 0x01u) if (variable_1 == 0x01u)
...@@ -603,7 +607,7 @@ void Popups_Polling(void) ...@@ -603,7 +607,7 @@ void Popups_Polling(void)
Popup_Delete(POPUP5_PUSH_DPD_SWITCH1); Popup_Delete(POPUP5_PUSH_DPD_SWITCH1);
} }
/*40.DPD手动再生要求2-DPD需要再生 18FD7C00 Byte：1 Bit：3-1 100：On – fast blink (1 HZ)*/ /*40.--23--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(); variable_1 = Get_ID_18FD7C00_Sig_DPF_Lamp_Status_Amber();
if (variable_1 == 0x04u) if (variable_1 == 0x04u)
...@@ -615,11 +619,11 @@ void Popups_Polling(void) ...@@ -615,11 +619,11 @@ void Popups_Polling(void)
Popup_Delete(POPUP5_PUSH_DPD_SWITCH2); Popup_Delete(POPUP5_PUSH_DPD_SWITCH2);
} }
/*41.TPMS故障-轮胎监控失败 ID：18011733 Byte：6 Bit：ALL 0111(B) or 1000(B) or 1001(B)*/ /*41.--24--TPMS故障-轮胎监控失败 ID：18011733 Byte：6 Bit：ALL 0111(B) or 1000(B) or 1001(B)*/
variable_1 = Get_TPMSSensor_fault_Sta(); variable_1 = Get_TPMSSensor_fault_Sta();
variable_2 = CAN_MSG_Status(ID_CanMsg18011733_Msg_Count); variable_2 = CAN_MSG_Status(ID_CanMsg18011733_Msg_Count);
if ((K_Line_Set.K_Line_LID3E = 0x01u) && ((variable_1 == 0x01u) || (variable_2 == CAN_SIG_LOST))) if ((K_Line_Set.K_Line_LID3E == 0x01u) && ((variable_1 == 0x01u) || (variable_2 == CAN_SIG_LOST)))
{ {
Popup_Request(POPUP5_TPMS_FAILURE); Popup_Request(POPUP5_TPMS_FAILURE);
} }
...@@ -628,10 +632,10 @@ void Popups_Polling(void) ...@@ -628,10 +632,10 @@ void Popups_Polling(void)
Popup_Delete(POPUP5_TPMS_FAILURE); Popup_Delete(POPUP5_TPMS_FAILURE);
} }
/*42.TPMS電池低下-轮胎监控传感器电压下降 ID：18011733 Byte：5 Bit：4 01(B) LID $3E : 0x01*/ /*42.--25--TPMS電池低下-轮胎监控传感器电压下降 ID：18011733 Byte：5 Bit：4 01(B) LID $3E : 0x01*/
variable_1 = Get_TPMSLow_Voltage_Sta(); variable_1 = Get_TPMSLow_Voltage_Sta();
if ((K_Line_Set.K_Line_LID3E = 0x01u) && (variable_1 == 1)) if ((K_Line_Set.K_Line_LID3E == 0x01u) && (variable_1 == 1))
{ {
Popup_Request(POPUP5_TPMS_MONITOR_DROP); Popup_Request(POPUP5_TPMS_MONITOR_DROP);
} }
...@@ -643,7 +647,7 @@ void Popups_Polling(void) ...@@ -643,7 +647,7 @@ void Popups_Polling(void)
/*----第六组---------------------------------------------------------------------*/ /*----第六组---------------------------------------------------------------------*/
if (V_Speed < 66u) if (V_Speed < 66u)
{ {
/*43.遥控车辆高度调整中(无车速) B30 28V*/ /*43.--1--遥控车辆高度调整中(无车速) B30 28V*/
variable_1 = Line_In_Get_Status(LINE_IN_AIR_SUS); variable_1 = Line_In_Get_Status(LINE_IN_AIR_SUS);
if (variable_1 == 0x01u) if (variable_1 == 0x01u)
...@@ -655,7 +659,7 @@ void Popups_Polling(void) ...@@ -655,7 +659,7 @@ void Popups_Polling(void)
Popup_Delete(POPUP6_HEIGHT_CONTROL); Popup_Delete(POPUP6_HEIGHT_CONTROL);
} }
/*44.PTO(停车中)(无车速) /ID：18FED900 Byte：2 Bit：8,7 01(B) OR B01 28V*/ /*44.--2--PTO(停车中)(无车速) /ID：18FED900 Byte：2 Bit：8,7 01(B) OR B01 28V*/
variable_1 = Get_ID_18FED900_Sig_PTO_SW(); variable_1 = Get_ID_18FED900_Sig_PTO_SW();
variable_2 = Line_In_Get_Status(LINE_IN_PTO); variable_2 = Line_In_Get_Status(LINE_IN_PTO);
...@@ -675,9 +679,9 @@ void Popups_Polling(void) ...@@ -675,9 +679,9 @@ void Popups_Polling(void)
} }
/*----第七组---------------------------------------------------------------------*/ /*----第七组---------------------------------------------------------------------*/
/*45.充电异常-请与五十铃公司联系*/ /*45.--1--充电异常-请与五十铃公司联系*/
variable_1 = Line_In_Get_Status(LINE_IN_CHARGE); variable_1 = Line_In_Get_Status(LINE_IN_CHARGE);
variable_2 = Common_VolWarning_Sta(); variable_2 = Common_Get_VolWarning_Sta();
if ((variable_1 == 0x01u) || ((variable_2 == 0x01u) && (E_Speed > 350u))) if ((variable_1 == 0x01u) || ((variable_2 == 0x01u) && (E_Speed > 350u)))
{ {
...@@ -687,7 +691,8 @@ void Popups_Polling(void) ...@@ -687,7 +691,8 @@ void Popups_Polling(void)
{ {
Popup_Delete(POPUP7_CHARGE_ABNORMAL); Popup_Delete(POPUP7_CHARGE_ABNORMAL);
} }
/*46.AMT異常-AMT异常 ID：18FF8503　Bite：1 Bit：2,1 LID $41 : 0x13*/
/*46.--2--AMT異常-AMT异常 ID：18FF8503　Bite：1 Bit：2,1 LID $41 : 0x13*/
variable_1 = Get_ID_18FF8503_Sig_Stop_Warning(); variable_1 = Get_ID_18FF8503_Sig_Stop_Warning();
if ((K_Line_Set.K_Line_LID41 == 0x13u) && (variable_1 == 0x01u)) if ((K_Line_Set.K_Line_LID41 == 0x13u) && (variable_1 == 0x01u))
...@@ -700,14 +705,14 @@ void Popups_Polling(void) ...@@ -700,14 +705,14 @@ void Popups_Polling(void)
} }
/*----第八组---------------------------------------------------------------------*/ /*----第八组---------------------------------------------------------------------*/
/*47.补充燃料-油箱单位*/ /*47.--1--补充燃料-油箱单位*/
variable_1 = Fuel_Get_CurSeg();/*格*/ variable_1 = Fuel_Get_CurSeg(); /*格*/
variable_2 = GetFuelSensorState();/*燃油状态*/ variable_2 = GetFuelSensorState(); /*燃油状态*/
variable_5 = GetFuelResistance(); /*采集的阻值*/ variable_5 = GetFuelResistance(); /*采集的阻值*/
if (K_Line_Set.K_Line_LID43 == 0x82u) if (K_Line_Set.K_Line_LID43 == 0x82u)
{ {
if ((variable_1 <= 1 ) && (variable_2 == FuelSensorNormal) && (variable_5 != 65535)) if ((variable_1 <= 1) && (variable_2 == FuelSensorNormal) && (variable_5 != 65535))
{ {
Popup_Request(POPUP8_REFUEL); Popup_Request(POPUP8_REFUEL);
} }
...@@ -723,7 +728,7 @@ void Popups_Polling(void) ...@@ -723,7 +728,7 @@ void Popups_Polling(void)
if (K_Line_Set.K_Line_LID41 == 0x13u) if (K_Line_Set.K_Line_LID41 == 0x13u)
{ {
/*48.AMT过热-离合器过载 ID：18FF8503　Bite：2 Bit：4,3 001(B) LID $41 : 0x13*/ /*48.--2--AMT过热-离合器过载 ID：18FF8503　Bite：2 Bit：4,3 001(B) LID $41 : 0x13*/
variable_1 = Get_ID_18FF8503_Sig_Clutch_Overload_warning(); variable_1 = Get_ID_18FF8503_Sig_Clutch_Overload_warning();
if (variable_1 == 0x01u) if (variable_1 == 0x01u)
...@@ -735,7 +740,7 @@ void Popups_Polling(void) ...@@ -735,7 +740,7 @@ void Popups_Polling(void)
Popup_Delete(POPUP8_ATM_CLUCH_OVERHEATING); Popup_Delete(POPUP8_ATM_CLUCH_OVERHEATING);
} }
/*49.AMT磨耗-离合器磨损 ID：18FF8503　Bite：2 Bit：2,1 001(B) LID $41 : 0x13*/ /*49.--3--AMT磨耗-离合器磨损 ID：18FF8503　Bite：2 Bit：2,1 001(B) LID $41 : 0x13*/
variable_1 = Get_ID_18FF8503_Sig_Manouvering_mode(); variable_1 = Get_ID_18FF8503_Sig_Manouvering_mode();
if (variable_1 == 0x01u) if (variable_1 == 0x01u)
...@@ -753,27 +758,31 @@ void Popups_Polling(void) ...@@ -753,27 +758,31 @@ void Popups_Polling(void)
Popup_Clear(POPUP1_BRAKE_BRAKE); Popup_Clear(POPUP1_BRAKE_BRAKE);
} }
/*50.低电压报警 显示条件：发动机启动(350r/min)后，7秒检测到23.5V时 显示消失条件：10秒检测到25V以上时*/ /*50.--4--低电压报警 显示条件：发动机启动(350r/min)后，7秒检测到23.5V时 显示消失条件：10秒检测到25V以上时*/
// if (( KL30_Volt < 2350) && ( E_Speed > 350)) //23.5V variable_1 = Common_Get_LOW_VOLTAGE();
//{
// Popup_Request(POPUP8_LOW_VOLTAGE_SPEED); if (( variable_1 == 0x01u) && ( E_Speed > 350)) //23.5V
// } {
// else if (KL30_Volt > 2500) Popup_Request(POPUP8_LOWVOLTAGE);
//{ }
// Popup_Delete(POPUP8_LOW_VOLTAGE_SPEED); else if (variable_1 == 0x00u)
// } {
Popup_Delete(POPUP8_LOWVOLTAGE);
/*51.过电压报警 显示条件：发动机启动(350r/min)后，7秒检测到30.4V以上时 显示消失条件：10秒检测到29.4V以下时*/ }
// if ((KL30_Volt > 3044) && ( E_Speed > 350)) //30.44V
//{ /*51.--5--过电压报警 显示条件：发动机启动(350r/min)后，7秒检测到30.4V以上时 显示消失条件：10秒检测到29.4V以下时*/
// Popup_Request(POPUP8_OVERVOLTAGE); variable_1 = Common_Get_HIGH_VOLTAGE();
// }
// else if (KL30_Volt < 2940) if ((variable_1 == 0x01u) && ( E_Speed > 350)) //30.44V
//{ {
// Popup_Delete(POPUP8_OVERVOLTAGE); Popup_Request(POPUP8_OVERVOLTAGE);
// } }
else if (variable_1 == 0x00u)
/*52.后蹄片磨损*/ {
Popup_Delete(POPUP8_OVERVOLTAGE);
}
/*52.--6--后蹄片磨损*/
variable_1 = Line_In_Get_Status(LINE_IN_WEAR2); variable_1 = Line_In_Get_Status(LINE_IN_WEAR2);
if (variable_1 == LINE_IN_LOGIC_VALID) if (variable_1 == LINE_IN_LOGIC_VALID)
...@@ -784,7 +793,8 @@ void Popups_Polling(void) ...@@ -784,7 +793,8 @@ void Popups_Polling(void)
{ {
Popup_Delete(POPUP1_BRAKE_BRAKE); Popup_Delete(POPUP1_BRAKE_BRAKE);
} }
/*53.前蹄片磨损*/
/*53.--7--前蹄片磨损*/
variable_1 = Line_In_Get_Status(LINE_IN_WEAR_IND); variable_1 = Line_In_Get_Status(LINE_IN_WEAR_IND);
if (variable_1 == LINE_IN_LOGIC_VALID) if (variable_1 == LINE_IN_LOGIC_VALID)
...@@ -796,7 +806,7 @@ void Popups_Polling(void) ...@@ -796,7 +806,7 @@ void Popups_Polling(void)
Popup_Delete(POPUP1_BRAKE_BRAKE); Popup_Delete(POPUP1_BRAKE_BRAKE);
} }
/*54.DPD自动再生-DPD自动再生中 ID：18FED900 (AUXIO) Byte：8 bit：5,4 01(B) Engine Speed ： 350rpm以上*/ /*54.--8--DPD自动再生-DPD自动再生中 ID：18FED900 (AUXIO) Byte：8 bit：5,4 01(B) Engine Speed ： 350rpm以上*/
variable_1 = Get_ID_18FED900_Sig_DPF_Regeneration_Status(); variable_1 = Get_ID_18FED900_Sig_DPF_Regeneration_Status();
if ((E_Speed >= 350) && (variable_1 == 0x01u)) if ((E_Speed >= 350) && (variable_1 == 0x01u))
...@@ -809,11 +819,11 @@ void Popups_Polling(void) ...@@ -809,11 +819,11 @@ void Popups_Polling(void)
} }
/*----第九组---------------------------------------------------------------------*/ /*----第九组---------------------------------------------------------------------*/
/*55.气压过低-请冲入空气*/ /*55.--1--气压过低-请冲入空气*/
variable_1 = (uint8_t)Line_In_Get_Status(LINE_IN_BRAKE_AIR_EBS); variable_1 = (uint8_t)Line_In_Get_Status(LINE_IN_BRAKE_AIR_EBS);
variable_2 = Common_Get_L12_Air_Sta(); variable_2 = Common_Get_L12_Air_Sta();
if ((variable_1 == LINE_IN_LOGIC_VALID ) || (variable_2 == 0X01U)) if ((variable_1 == LINE_IN_LOGIC_VALID) || (variable_2 == 0X01U))
{ {
Popup_Request(POPUP9_AIR_PRESSURE); Popup_Request(POPUP9_AIR_PRESSURE);
} }
...@@ -822,7 +832,7 @@ void Popups_Polling(void) ...@@ -822,7 +832,7 @@ void Popups_Polling(void)
Popup_Delete(POPUP9_AIR_PRESSURE); Popup_Delete(POPUP9_AIR_PRESSURE);
} }
/*56.EBS故障（红）-请与五十铃公司联系*/ /*56.--2--EBS故障（红）-请与五十铃公司联系*/
variable_1 = Get_ID_18F0010B_Sig_EBS_Red_Warning_Lamp_State(); variable_1 = Get_ID_18F0010B_Sig_EBS_Red_Warning_Lamp_State();
variable_2 = CAN_MSG_Status(ID_CanMsg18F0010B_Msg_Count); variable_2 = CAN_MSG_Status(ID_CanMsg18F0010B_Msg_Count);
...@@ -841,9 +851,9 @@ void Popups_Polling(void) ...@@ -841,9 +851,9 @@ void Popups_Polling(void)
{ {
Popup_Clear(POPUP9_EBS_ERROR); Popup_Clear(POPUP9_EBS_ERROR);
} }
#if 0
/*----第十组---------------------------------------------------------------------*/ /*----第十组---------------------------------------------------------------------*/
/*57.省油耗建议-急加速*/ /*57.--1--省油耗建议-急加速*/
if ((AccSubSpeed.AccSpeed_Flag == 1) && (User_App.User_JADD != 0xFF)) if ((AccSubSpeed.AccSpeed_Flag == 1) && (User_App.User_JADD != 0xFF))
{ {
Popup_Request(POPUP10_RAPID_ACC); Popup_Request(POPUP10_RAPID_ACC);
...@@ -852,7 +862,8 @@ void Popups_Polling(void) ...@@ -852,7 +862,8 @@ void Popups_Polling(void)
{ {
Popup_Delete(POPUP10_RAPID_ACC); Popup_Delete(POPUP10_RAPID_ACC);
} }
/*58.省油耗建议-急减速*/
/*58.--2--省油耗建议-急减速*/
if ((AccSubSpeed.SubSpeed_Flag == 1) && (User_App.User_JSUB != 0xFF)) if ((AccSubSpeed.SubSpeed_Flag == 1) && (User_App.User_JSUB != 0xFF))
{ {
Popup_Request(POPUP10_RAPID_SUB); Popup_Request(POPUP10_RAPID_SUB);
...@@ -861,8 +872,11 @@ void Popups_Polling(void) ...@@ -861,8 +872,11 @@ void Popups_Polling(void)
{ {
Popup_Delete(POPUP10_RAPID_SUB); Popup_Delete(POPUP10_RAPID_SUB);
} }
/*59.省油耗建议-请降低发动机转速*/
if ((DataOverESpeed == 1) && (User_App.User_Speed != 0xFF)) /*59.--3--省油耗建议-请降低发动机转速*/
variable_1 = Common_Get_OverSpeed_Status();
if ((variable_1 == 1) && (User_App.User_Speed != 0xFF))
{ {
Popup_Request(POPUP10_REVAL_ENGINE); Popup_Request(POPUP10_REVAL_ENGINE);
} }
...@@ -870,12 +884,14 @@ void Popups_Polling(void) ...@@ -870,12 +884,14 @@ void Popups_Polling(void)
{ {
Popup_Delete(POPUP10_REVAL_ENGINE); Popup_Delete(POPUP10_REVAL_ENGINE);
} }
/*60.省油耗建议-请降低速度*/
/*60.--4--省油耗建议-请降低速度*/
variable_1 = Common_Get_OverSpeedLine_Status();
if ( if (
((DataOverSpeedK_Line == 1) && (K_Line_Set.K_Line_LID44 != 0xFF)) || \ ((variable_1 == 1) && (K_Line_Set.K_Line_LID44 != 0xFF)) ||
((AccSubSpeed.GslSpeed_Flag) && (User_App.User_Gsl)) || \ ((AccSubSpeed.GslSpeed_Flag == 0x01u) && (User_App.User_Gsl == 0x01u)) ||
((AccSubSpeed.YblSpeed_Flag) && (User_App.User_Ybl)) ((AccSubSpeed.YblSpeed_Flag == 0x01u) && (User_App.User_Ybl == 0x01u)))
)
{ {
Popup_Request(POPUP10_REVAL_SPEED); Popup_Request(POPUP10_REVAL_SPEED);
} }
...@@ -885,17 +901,18 @@ void Popups_Polling(void) ...@@ -885,17 +901,18 @@ void Popups_Polling(void)
} }
/*----第十一组---------------------------------------------------------------------*/ /*----第十一组---------------------------------------------------------------------*/
/*61.发动机机油＆滤清器*/ /*61.--1--发动机机油＆滤清器*/
if (((State_Flag.User_FDJYLQQ_FLAG == 1) || (State_Flag.User_FDJYLQQ_FLAG == 2)) && (User_FDJYLQQ_Time <= 600)) if (((State_Flag.User_FDJYLQQ_FLAG == 1) || (State_Flag.User_FDJYLQQ_FLAG == 2)) && (Common_Get_FDJYLQQ_Sta() == 0x01u))
{ {
Popup_Request(POPUP11_ENGINE_OIL_FILTERPOPUP11_ENGINE_OIL_FILTER); Popup_Request(POPUP11_ENGINE_OIL_FILTER);
} }
else else
{ {
Popup_Delete(POPUP11_ENGINE_OIL_FILTER); Popup_Delete(POPUP11_ENGINE_OIL_FILTER);
} }
/*62.燃油滤清器*/
if (((State_Flag.User_RYLQQ_FLAG == 1) || (State_Flag.User_RYLQQ_FLAG == 2)) && (User_RYLQQ_Time <= 600)) /*62.--2--燃油滤清器*/
if (((State_Flag.User_RYLQQ_FLAG == 1) || (State_Flag.User_RYLQQ_FLAG == 2)) && (Common_Get_RYLQQ_Sta() == 0x01u))
{ {
Popup_Request(POPUP11_FUEL_FILTER); Popup_Request(POPUP11_FUEL_FILTER);
} }
...@@ -903,8 +920,9 @@ void Popups_Polling(void) ...@@ -903,8 +920,9 @@ void Popups_Polling(void)
{ {
Popup_Delete(POPUP11_FUEL_FILTER); Popup_Delete(POPUP11_FUEL_FILTER);
} }
/*63.变速箱油*/
if (((State_Flag.User_BSXY_FLAG == 1) || (State_Flag.User_BSXY_FLAG == 2)) && (User_BSXY_Time <= 600)) /*63.--3--变速箱油*/
if (((State_Flag.User_BSXY_FLAG == 1) || (State_Flag.User_BSXY_FLAG == 2)) && (Common_Get_BSXY_Sta() == 0x01u))
{ {
Popup_Request(POPUP11_T_MISSION_OIL); Popup_Request(POPUP11_T_MISSION_OIL);
} }
...@@ -912,8 +930,9 @@ void Popups_Polling(void) ...@@ -912,8 +930,9 @@ void Popups_Polling(void)
{ {
Popup_Delete(POPUP11_T_MISSION_OIL); Popup_Delete(POPUP11_T_MISSION_OIL);
} }
/*64.差速器油*/
if (((State_Flag.User_CSQY_FLAG == 1) || (State_Flag.User_CSQY_FLAG == 2)) && (User_CSQY_Time <= 600)) /*64.--4--差速器油*/
if (((State_Flag.User_CSQY_FLAG == 1) || (State_Flag.User_CSQY_FLAG == 2)) && (Common_Get_CSQY_Sta() == 0x01u))
{ {
Popup_Request(POPUP11_DIFF_OIL); Popup_Request(POPUP11_DIFF_OIL);
} }
...@@ -921,8 +940,9 @@ void Popups_Polling(void) ...@@ -921,8 +940,9 @@ void Popups_Polling(void)
{ {
Popup_Delete(POPUP11_DIFF_OIL); Popup_Delete(POPUP11_DIFF_OIL);
} }
/*65.顺畅系统离合器油*/
//if(((State_Flag.User_LHQY_FLAG == 1) || (State_Flag.User_LHQY_FLAG == 2))&&(User_LHQY_Time <= 600)) /*65.--5--顺畅系统离合器油*/
// if(((State_Flag.User_LHQY_FLAG == 1) || (State_Flag.User_LHQY_FLAG == 2))&&(Common_Get_LHQY_Sta() ==0x01u))
if (0) if (0)
{ {
Popup_Request(POPUP11_CLUTCH_OIL); Popup_Request(POPUP11_CLUTCH_OIL);
...@@ -931,8 +951,9 @@ void Popups_Polling(void) ...@@ -931,8 +951,9 @@ void Popups_Polling(void)
{ {
Popup_Delete(POPUP11_CLUTCH_OIL); Popup_Delete(POPUP11_CLUTCH_OIL);
} }
/*66.动力转向液*/
if (((State_Flag.User_DLZXY_FLAG == 1) || (State_Flag.User_DLZXY_FLAG == 2)) && (User_DLZXY_Time <= 600)) /*66.--6--动力转向液*/
if (((State_Flag.User_DLZXY_FLAG == 1) || (State_Flag.User_DLZXY_FLAG == 2)) && (Common_Get_DLZXY_Sta() == 0x01u))
{ {
Popup_Request(POPUP11_P_STEERING_FRUID); Popup_Request(POPUP11_P_STEERING_FRUID);
} }
...@@ -940,8 +961,9 @@ void Popups_Polling(void) ...@@ -940,8 +961,9 @@ void Popups_Polling(void)
{ {
Popup_Delete(POPUP11_P_STEERING_FRUID); Popup_Delete(POPUP11_P_STEERING_FRUID);
} }
/*67.更换轮胎・轮胎位置*/
if (((State_Flag.User_LT_FLAG == 1) || (State_Flag.User_LT_FLAG == 2)) && (User_LT_Time <= 600)) /*67.--7--更换轮胎・轮胎位置*/
if (((State_Flag.User_LT_FLAG == 1) || (State_Flag.User_LT_FLAG == 2)) && (Common_Get_LT_Sta() == 0x01u))
{ {
Popup_Request(POPUP11_TIRE_ROTATION); Popup_Request(POPUP11_TIRE_ROTATION);
} }
...@@ -949,7 +971,6 @@ void Popups_Polling(void) ...@@ -949,7 +971,6 @@ void Popups_Polling(void)
{ {
Popup_Delete(POPUP11_TIRE_ROTATION); Popup_Delete(POPUP11_TIRE_ROTATION);
} }
#endif
} }
else /*ig off*/ else /*ig off*/
{ {
......
source/Application/Graphic/Menu/Menu_user.c
View file @ 5e1d7cd9
...@@ -811,14 +811,14 @@ void Level3_2Menu_8Exit(void) ...@@ -811,14 +811,14 @@ void Level3_2Menu_8Exit(void)
/*更换机油机油滤清器*/ /*更换机油机油滤清器*/
void Level3_3Menu_1Enter(void) void Level3_3Menu_1Enter(void)
{ {
if (User_App.User_FDJYLQQ == 0u) //if (User_App.User_FDJYLQQ == 0u)
{ //{
User_set_Num.User_FDJYLQQ = 0u; // User_set_Num.User_FDJYLQQ = 0u;
} //}
else //else
{ //{
User_set_Num.User_FDJYLQQ = (uint32_t)K_Line_Set.K_Line_LID4F * 1000u; // User_set_Num.User_FDJYLQQ = (uint32_t)K_Line_Set.K_Line_LID4F * 1000u;
} //}
} }
void Level3_3Menu_1Do(void) void Level3_3Menu_1Do(void)
{ {
...@@ -850,14 +850,14 @@ void Level3_3Menu_1Exit(void) ...@@ -850,14 +850,14 @@ void Level3_3Menu_1Exit(void)
/*更换燃油滤清器*/ /*更换燃油滤清器*/
void Level3_3Menu_2Enter(void) void Level3_3Menu_2Enter(void)
{ {
if (User_App.User_RYLQQ == 0u) //if (User_App.User_RYLQQ == 0u)
{ //{
User_set_Num.User_RYLQQ = 0u; // User_set_Num.User_RYLQQ = 0u;
} //}
else //else
{ //{
User_set_Num.User_RYLQQ = (uint32_t)K_Line_User_RYLQQ * 1000u; // User_set_Num.User_RYLQQ = (uint32_t)K_Line_User_RYLQQ * 1000u;
} //}
} }
void Level3_3Menu_2Do(void) void Level3_3Menu_2Do(void)
{ {
...@@ -889,14 +889,14 @@ void Level3_3Menu_2Exit(void) ...@@ -889,14 +889,14 @@ void Level3_3Menu_2Exit(void)
/*更换变速箱油*/ /*更换变速箱油*/
void Level3_3Menu_3Enter(void) void Level3_3Menu_3Enter(void)
{ {
if (User_App.User_BSXY == 0u) //if (User_App.User_BSXY == 0u)
{ //{
User_set_Num.User_BSXY = 0u; // User_set_Num.User_BSXY = 0u;
} //}
else //else
{ //{
User_set_Num.User_BSXY = (uint32_t)K_Line_Set.K_Line_LID4A * 1000; // User_set_Num.User_BSXY = (uint32_t)K_Line_Set.K_Line_LID4A * 1000;
} //}
} }
void Level3_3Menu_3Do(void) void Level3_3Menu_3Do(void)
{ {
...@@ -928,14 +928,14 @@ void Level3_3Menu_3Exit(void) ...@@ -928,14 +928,14 @@ void Level3_3Menu_3Exit(void)
/*更换差速器油*/ /*更换差速器油*/
void Level3_3Menu_4Enter(void) void Level3_3Menu_4Enter(void)
{ {
if (User_App.User_CSQY == 0u) //if (User_App.User_CSQY == 0u)
{ //{
User_set_Num.User_CSQY = 0u; // User_set_Num.User_CSQY = 0u;
} //}
else //else
{ //{
User_set_Num.User_CSQY = (uint32_t)K_Line_Set.K_Line_LID4B * 1000; // User_set_Num.User_CSQY = (uint32_t)K_Line_Set.K_Line_LID4B * 1000;
} //}
} }
void Level3_3Menu_4Do(void) void Level3_3Menu_4Do(void)
{ {
...@@ -980,14 +980,14 @@ void Level3_3Menu_4Exit(void) ...@@ -980,14 +980,14 @@ void Level3_3Menu_4Exit(void)
/*更换动力转向液*/ /*更换动力转向液*/
void Level3_3Menu_6Enter(void) void Level3_3Menu_6Enter(void)
{ {
if (User_App.User_DLZXY == 0u) //if (User_App.User_DLZXY == 0u)
{ //{
User_set_Num.User_DLZXY = 0u; // User_set_Num.User_DLZXY = 0u;
} //}
else //else
{ //{
User_set_Num.User_DLZXY = (uint32_t)K_Line_Set.K_Line_LID4D * 1000; // User_set_Num.User_DLZXY = (uint32_t)K_Line_Set.K_Line_LID4D * 1000;
} //}
} }
void Level3_3Menu_6Do(void) void Level3_3Menu_6Do(void)
{ {
...@@ -1019,14 +1019,14 @@ void Level3_3Menu_6Exit(void) ...@@ -1019,14 +1019,14 @@ void Level3_3Menu_6Exit(void)
/*更换轮胎*/ /*更换轮胎*/
void Level3_3Menu_7Enter(void) void Level3_3Menu_7Enter(void)
{ {
if (User_App.User_LT == 0u) //if (User_App.User_LT == 0u)
{ //{
User_set_Num.User_LT = 0u; // User_set_Num.User_LT = 0u;
} //}
else //else
{ //{
User_set_Num.User_LT = (uint32_t)K_Line_Set.K_Line_LID4E * 1000; // User_set_Num.User_LT = (uint32_t)K_Line_Set.K_Line_LID4E * 1000;
} //}
} }
void Level3_3Menu_7Do(void) void Level3_3Menu_7Do(void)
{ {
......
source/Application/RTE/Common_Interface.c
View file @ 5e1d7cd9
...@@ -74,6 +74,11 @@ static uint16_t CRUISE_SLD2_Time; ...@@ -74,6 +74,11 @@ static uint16_t CRUISE_SLD2_Time;
static uint16_t VolWarning_Time; static uint16_t VolWarning_Time;
static uint16_t LOW_VOLTAGE_TIME1;
static uint16_t LOW_VOLTAGE_TIME2;
static uint16_t HIGH_VOLTAGE_TIME1;
static uint16_t HIGH_VOLTAGE_TIME2;
static uint16_t HIGH_VOLTAGE; static uint16_t HIGH_VOLTAGE;
static uint16_t LOW_VOLTAGE; static uint16_t LOW_VOLTAGE;
...@@ -110,6 +115,10 @@ void Common_DataInit(void) ...@@ -110,6 +115,10 @@ void Common_DataInit(void)
CRUISE_SLD2_Time = 0x00u; CRUISE_SLD2_Time = 0x00u;
VolWarning_Time = 0x00u; VolWarning_Time = 0x00u;
LOW_VOLTAGE_TIME1 = 0x00u;
LOW_VOLTAGE_TIME2 = 0x00u;
HIGH_VOLTAGE_TIME1 = 0x00u;
HIGH_VOLTAGE_TIME2 = 0x00u;
HIGH_VOLTAGE = 0x0u; HIGH_VOLTAGE = 0x0u;
LOW_VOLTAGE = 0x0u; LOW_VOLTAGE = 0x0u;
} }
...@@ -158,6 +167,36 @@ uint8_t Common_Get_OverSpeed_Status(void) ...@@ -158,6 +167,36 @@ uint8_t Common_Get_OverSpeed_Status(void)
return OverSpeedStatus; return OverSpeedStatus;
} }
uint8_t Common_Get_OverSpeedLine_Status(void)
{
uint8_t OverSpeedStatus = 0u;
uint16_t DispVSpeed = 0u;
uint16_t DataOverSpeedValue = 0u;
DataOverSpeedValue = K_Line_Set.K_Line_LID44;
DataOverSpeedValue *= 10u;
DispVSpeed = Common_Get_Disp_V_Speed();
if (K_Line_Set.K_Line_LID44 != 0xFF)
{
if (DispVSpeed >= (DataOverSpeedValue + 20))
{
OverSpeedStatus = 1u;
}
else if (DispVSpeed <= DataOverSpeedValue)
{
OverSpeedStatus = 0u;
}
}
else
{
OverSpeedStatus = 0u;
}
return OverSpeedStatus;
}
static void Common_Set_IG_Sts(COMMON_PowerStatus_t Val) static void Common_Set_IG_Sts(COMMON_PowerStatus_t Val)
{ {
PowerSts = Val; PowerSts = Val;
...@@ -272,7 +311,7 @@ void Common_Input_Para(void) ...@@ -272,7 +311,7 @@ void Common_Input_Para(void)
{ {
if (VolWarning_Time <= 5100) if (VolWarning_Time <= 5100)
{ {
VolWarning_Time ++; VolWarning_Time++;
} }
} }
else else
...@@ -280,10 +319,59 @@ void Common_Input_Para(void) ...@@ -280,10 +319,59 @@ void Common_Input_Para(void)
VolWarning_Time = 0; VolWarning_Time = 0;
} }
/**/
if (RTE_Read_KL15_Voltage() <= 23500) /*A2*/
{
if (LOW_VOLTAGE_TIME1 <= 3500)
LOW_VOLTAGE_TIME1++;
else
LOW_VOLTAGE = 1;
}
else
{
LOW_VOLTAGE_TIME1 = 0;
}
if (RTE_Read_KL15_Voltage() >= 25000) /*A2*/
{
if (LOW_VOLTAGE_TIME2 <= 5000)
LOW_VOLTAGE_TIME2++;
else
LOW_VOLTAGE = 0;
}
else
{
LOW_VOLTAGE_TIME2 = 0;
}
//
if (RTE_Read_KL15_Voltage() >= 30400) /*A2*/
{
if (HIGH_VOLTAGE_TIME1 <= 3500)
HIGH_VOLTAGE_TIME1++;
else
HIGH_VOLTAGE = 1;
}
else
{
HIGH_VOLTAGE_TIME1 = 0;
}
if (RTE_Read_KL15_Voltage() <= 29400) /*A2*/
{
if (HIGH_VOLTAGE_TIME2 <= 5000)
HIGH_VOLTAGE_TIME2++;
else
HIGH_VOLTAGE = 0;
}
else
{
HIGH_VOLTAGE_TIME2 = 0;
}
/**/ /**/
if ((State_Flag.User_FDJYLQQ_FLAG == 1) || (State_Flag.User_FDJYLQQ_FLAG == 2)) if ((State_Flag.User_FDJYLQQ_FLAG == 1) || (State_Flag.User_FDJYLQQ_FLAG == 2))
{ {
if (User_FDJYLQQ_Time < 601) if (User_FDJYLQQ_Time < 30001)
User_FDJYLQQ_Time++; User_FDJYLQQ_Time++;
} }
else else
...@@ -293,7 +381,7 @@ void Common_Input_Para(void) ...@@ -293,7 +381,7 @@ void Common_Input_Para(void)
if ((State_Flag.User_RYLQQ_FLAG == 1) || (State_Flag.User_RYLQQ_FLAG == 2)) if ((State_Flag.User_RYLQQ_FLAG == 1) || (State_Flag.User_RYLQQ_FLAG == 2))
{ {
if (User_RYLQQ_Time < 601) if (User_RYLQQ_Time < 30001)
User_RYLQQ_Time++; User_RYLQQ_Time++;
} }
else else
...@@ -303,7 +391,7 @@ void Common_Input_Para(void) ...@@ -303,7 +391,7 @@ void Common_Input_Para(void)
if ((State_Flag.User_BSXY_FLAG == 1) || (State_Flag.User_BSXY_FLAG == 2)) if ((State_Flag.User_BSXY_FLAG == 1) || (State_Flag.User_BSXY_FLAG == 2))
{ {
if (User_BSXY_Time < 601) if (User_BSXY_Time < 30001)
User_BSXY_Time++; User_BSXY_Time++;
} }
else else
...@@ -313,7 +401,7 @@ void Common_Input_Para(void) ...@@ -313,7 +401,7 @@ void Common_Input_Para(void)
if ((State_Flag.User_CSQY_FLAG == 1) || (State_Flag.User_CSQY_FLAG == 2)) if ((State_Flag.User_CSQY_FLAG == 1) || (State_Flag.User_CSQY_FLAG == 2))
{ {
if (User_CSQY_Time < 601) if (User_CSQY_Time < 30001)
User_CSQY_Time++; User_CSQY_Time++;
} }
else else
...@@ -323,7 +411,7 @@ void Common_Input_Para(void) ...@@ -323,7 +411,7 @@ void Common_Input_Para(void)
if ((State_Flag.User_LHQY_FLAG == 1) || (State_Flag.User_LHQY_FLAG == 2)) if ((State_Flag.User_LHQY_FLAG == 1) || (State_Flag.User_LHQY_FLAG == 2))
{ {
if (User_LHQY_Time < 601) if (User_LHQY_Time < 30001)
User_LHQY_Time++; User_LHQY_Time++;
} }
else else
...@@ -333,7 +421,7 @@ void Common_Input_Para(void) ...@@ -333,7 +421,7 @@ void Common_Input_Para(void)
if ((State_Flag.User_KQGZJ_FLAG == 1) || (State_Flag.User_KQGZJ_FLAG == 2)) if ((State_Flag.User_KQGZJ_FLAG == 1) || (State_Flag.User_KQGZJ_FLAG == 2))
{ {
if (User_KQGZJ_Time < 601) if (User_KQGZJ_Time < 30001)
User_KQGZJ_Time++; User_KQGZJ_Time++;
} }
else else
...@@ -343,7 +431,7 @@ void Common_Input_Para(void) ...@@ -343,7 +431,7 @@ void Common_Input_Para(void)
if ((State_Flag.User_DLZXY_FLAG == 1) || (State_Flag.User_DLZXY_FLAG == 2)) if ((State_Flag.User_DLZXY_FLAG == 1) || (State_Flag.User_DLZXY_FLAG == 2))
{ {
if (User_DLZXY_Time < 601) if (User_DLZXY_Time < 30001)
User_DLZXY_Time++; User_DLZXY_Time++;
} }
else else
...@@ -353,7 +441,7 @@ void Common_Input_Para(void) ...@@ -353,7 +441,7 @@ void Common_Input_Para(void)
if ((State_Flag.User_LT_FLAG == 1) || (State_Flag.User_LT_FLAG == 2)) if ((State_Flag.User_LT_FLAG == 1) || (State_Flag.User_LT_FLAG == 2))
{ {
if (User_LT_Time < 601) if (User_LT_Time < 30001)
User_LT_Time++; User_LT_Time++;
} }
else else
...@@ -364,7 +452,7 @@ void Common_Input_Para(void) ...@@ -364,7 +452,7 @@ void Common_Input_Para(void)
/**/ /**/
if (Get_ID_18FF4100_Sig_Cruise_VariableSLD_Disp() == 1u) if (Get_ID_18FF4100_Sig_Cruise_VariableSLD_Disp() == 1u)
{ {
if (CRUISE_1_Time < 1500u) if (CRUISE_1_Time < 1501u)
{ {
CRUISE_1_Time++; CRUISE_1_Time++;
} }
...@@ -375,7 +463,7 @@ void Common_Input_Para(void) ...@@ -375,7 +463,7 @@ void Common_Input_Para(void)
} }
if (Get_ID_18FF4100_Sig_Cruise_VariableSLD_Disp() == 2u) if (Get_ID_18FF4100_Sig_Cruise_VariableSLD_Disp() == 2u)
{ {
if (CRUISE_STUDY_Time < 1500u) if (CRUISE_STUDY_Time < 1501u)
{ {
CRUISE_STUDY_Time++; CRUISE_STUDY_Time++;
} }
...@@ -386,7 +474,7 @@ void Common_Input_Para(void) ...@@ -386,7 +474,7 @@ void Common_Input_Para(void)
} }
if (Get_ID_18FF4100_Sig_Cruise_VariableSLD_Disp() == 3u) if (Get_ID_18FF4100_Sig_Cruise_VariableSLD_Disp() == 3u)
{ {
if (CRUISE_SLD1_Time < 1500u) if (CRUISE_SLD1_Time < 1501u)
{ {
CRUISE_SLD1_Time++; CRUISE_SLD1_Time++;
} }
...@@ -395,9 +483,6 @@ void Common_Input_Para(void) ...@@ -395,9 +483,6 @@ void Common_Input_Para(void)
{ {
CRUISE_SLD1_Time = 0; CRUISE_SLD1_Time = 0;
} }
} }
else else
{ {
...@@ -417,15 +502,27 @@ void Common_Input_Para(void) ...@@ -417,15 +502,27 @@ void Common_Input_Para(void)
Common_Set_Disp_E_Speed(0u); Common_Set_Disp_E_Speed(0u);
/*----*/ /*----*/
User_FDJYLQQ_Time = 0u; User_FDJYLQQ_Time = 0x00u;
User_RYLQQ_Time = 0u; User_RYLQQ_Time = 0x00u;
User_BSXY_Time = 0u; User_BSXY_Time = 0x00u;
User_CSQY_Time = 0u; User_CSQY_Time = 0x00u;
User_LHQY_Time = 0u; User_LHQY_Time = 0x00u;
User_KQGZJ_Time = 0u; User_KQGZJ_Time = 0x00u;
User_DLZXY_Time = 0u; User_DLZXY_Time = 0x00u;
User_LT_Time = 0u; User_LT_Time = 0x00u;
/*----*/
CRUISE_1_Time = 0x00u;
CRUISE_STUDY_Time = 0x00u;
CRUISE_SLD1_Time = 0x00u;
CRUISE_SLD2_Time = 0x00u;
VolWarning_Time = 0x00u;
LOW_VOLTAGE_TIME1 = 0x00u;
LOW_VOLTAGE_TIME2 = 0x00u;
HIGH_VOLTAGE_TIME1 = 0x00u;
HIGH_VOLTAGE_TIME2 = 0x00u;
HIGH_VOLTAGE = 0x0u;
LOW_VOLTAGE = 0x0u;
} }
} }
...@@ -534,7 +631,7 @@ uint8_t Common_Get_Cruise_SLD_TimeSta(void) ...@@ -534,7 +631,7 @@ uint8_t Common_Get_Cruise_SLD_TimeSta(void)
return Time_Sta; return Time_Sta;
} }
uint8_t Common_VolWarning_Sta(void) uint8_t Common_Get_VolWarning_Sta(void)
{ {
uint8_t DataHiCollantVolWarning = 0u; uint8_t DataHiCollantVolWarning = 0u;
...@@ -547,7 +644,145 @@ uint8_t Common_VolWarning_Sta(void) ...@@ -547,7 +644,145 @@ uint8_t Common_VolWarning_Sta(void)
DataHiCollantVolWarning = 0u; DataHiCollantVolWarning = 0u;
} }
return DataHiCollantVolWarning ; return DataHiCollantVolWarning;
}
uint8_t Common_Get_HIGH_VOLTAGE(void)
{
return HIGH_VOLTAGE;
}
uint8_t Common_Get_LOW_VOLTAGE(void)
{
return LOW_VOLTAGE;
}
uint8_t Common_Get_FDJYLQQ_Sta(void)
{
uint8_t ValueSta = 0u;
if (User_FDJYLQQ_Time < 30000u)
{
ValueSta = 1u;
}
else
{
ValueSta = 0u;
}
return ValueSta;
}
uint8_t Common_Get_RYLQQ_Sta(void)
{
uint8_t ValueSta = 0u;
if (User_RYLQQ_Time < 30000u)
{
ValueSta = 1u;
}
else
{
ValueSta = 0u;
}
return ValueSta;
}
uint8_t Common_Get_BSXY_Sta(void)
{
uint8_t ValueSta = 0u;
if (User_BSXY_Time < 30000u)
{
ValueSta = 1u;
}
else
{
ValueSta = 0u;
}
return ValueSta;
}
uint8_t Common_Get_CSQY_Sta(void)
{
uint8_t ValueSta = 0u;
if (User_CSQY_Time < 30000u)
{
ValueSta = 1u;
}
else
{
ValueSta = 0u;
}
return ValueSta;
}
uint8_t Common_Get_LHQY_Sta(void)
{
uint8_t ValueSta = 0u;
if (User_LHQY_Time < 30000u)
{
ValueSta = 1u;
}
else
{
ValueSta = 0u;
}
return ValueSta;
}
uint8_t Common_Get_KQGZJ_Sta(void)
{
uint8_t ValueSta = 0u;
if (User_KQGZJ_Time < 30000u)
{
ValueSta = 1u;
}
else
{
ValueSta = 0u;
}
return ValueSta;
}
uint8_t Common_Get_DLZXY_Sta(void)
{
uint8_t ValueSta = 0u;
if (User_DLZXY_Time < 30000u)
{
ValueSta = 1u;
}
else
{
ValueSta = 0u;
}
return ValueSta;
}
uint8_t Common_Get_LT_Sta(void)
{
uint8_t ValueSta = 0u;
if (User_LT_Time < 30000u)
{
ValueSta = 1u;
}
else
{
ValueSta = 0u;
}
return ValueSta;
} }
/*EOL诊断配置数据转换为仪表配置数据*/ /*EOL诊断配置数据转换为仪表配置数据*/
......
source/Application/RTE/Common_Interface.h
View file @ 5e1d7cd9
...@@ -107,7 +107,7 @@ extern uint16_t Common_Get_Act_E_Speed(void); ...@@ -107,7 +107,7 @@ extern uint16_t Common_Get_Act_E_Speed(void);
extern uint16_t Common_Get_Disp_V_Speed(void); extern uint16_t Common_Get_Disp_V_Speed(void);
extern uint16_t Common_Get_Disp_E_Speed(void); extern uint16_t Common_Get_Disp_E_Speed(void);
extern uint8_t Common_Get_OverSpeed_Status(void); /*获取超速报警状态*/ extern uint8_t Common_Get_OverSpeed_Status(void); /*获取超速报警状态*/
extern uint8_t Common_Get_Disp_E_Status(void); /*获取转速不在经济区状态*/ extern uint8_t Common_Get_OverSpeedLine_Status(void);
extern DataValid_t Common_Get_Act_V_Speed_Valid(void); extern DataValid_t Common_Get_Act_V_Speed_Valid(void);
extern DataValid_t Common_Get_Act_E_Speed_Valid(void); extern DataValid_t Common_Get_Act_E_Speed_Valid(void);
...@@ -129,7 +129,17 @@ uint8_t Get_CanFirstRecv_Event(uint8_t ID); ...@@ -129,7 +129,17 @@ uint8_t Get_CanFirstRecv_Event(uint8_t ID);
uint8_t Common_Get_Cruise_TimeSta(void); uint8_t Common_Get_Cruise_TimeSta(void);
uint8_t Common_Get_Cruise_SLD_TimeSta(void); uint8_t Common_Get_Cruise_SLD_TimeSta(void);
uint8_t Common_VolWarning_Sta(void); uint8_t Common_Get_VolWarning_Sta(void);
uint8_t Common_Get_HIGH_VOLTAGE (void);
uint8_t Common_Get_LOW_VOLTAGE (void);
uint8_t Common_Get_FDJYLQQ_Sta (void);
uint8_t Common_Get_RYLQQ_Sta (void);
uint8_t Common_Get_BSXY_Sta (void);
uint8_t Common_Get_CSQY_Sta (void);
uint8_t Common_Get_LHQY_Sta (void);
uint8_t Common_Get_KQGZJ_Sta (void);
uint8_t Common_Get_DLZXY_Sta (void);
uint8_t Common_Get_LT_Sta (void);
void ReadDTCEOLValue_Meter_K_LINE(void); void ReadDTCEOLValue_Meter_K_LINE(void);
void K_LINE_EOL_InitVal(void); void K_LINE_EOL_InitVal(void);
......
source/System/tasks.c
View file @ 5e1d7cd9
...@@ -260,6 +260,7 @@ void Sys_Exact_50us_Tasks(void) ...@@ -260,6 +260,7 @@ void Sys_Exact_50us_Tasks(void)
SEG_LCD_Window_Control_Service(); SEG_LCD_Window_Control_Service();
} }
Buzzer_Play_ISR(); Buzzer_Play_ISR();
Data_Mileage_ISR();
} }
/*============================================================================*/ /*============================================================================*/
...@@ -273,7 +274,7 @@ void Sys_Exact_50us_Tasks(void) ...@@ -273,7 +274,7 @@ void Sys_Exact_50us_Tasks(void)
------------------------------------------------------------------------------*/ ------------------------------------------------------------------------------*/
void Sys_Exact_100ms_Tasks(void) void Sys_Exact_100ms_Tasks(void)
{ {
Data_Mileage_ISR(); //Data_Mileage_ISR();
Service_OFF_Timing_Process(); Service_OFF_Timing_Process();
Fuel_User_KL15_OFF_Processing_Service(); Fuel_User_KL15_OFF_Processing_Service();
} }
......
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