Skip to content

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

按照禅道问题需求，调整功能

parent 5304ada8
Expand all Show whitespace changes
Inline Side-by-side
Showing with 147 additions and 110 deletions
source/Application/APP/Data_Fuel/FuelConfig.h
View file @ d3cc359f
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
#define DISPLAY_BOUNDARY_ES 1500u #define DISPLAY_BOUNDARY_ES 1500u
#define DISPLAY_BOUNDARY_1 1500u #define DISPLAY_BOUNDARY_1 1500u
#define DISPLAY_BOUNDARY_2 1373u #define DISPLAY_BOUNDARY_2 1280u/*禅道4998*/
#define DISPLAY_BOUNDARY_3 1191u #define DISPLAY_BOUNDARY_3 1191u
#define DISPLAY_BOUNDARY_4 1009u #define DISPLAY_BOUNDARY_4 1009u
#define DISPLAY_BOUNDARY_5 848u #define DISPLAY_BOUNDARY_5 848u
......
source/Application/APP/GaugesMode/GaugesInterface.c
View file @ d3cc359f
...@@ -41,8 +41,8 @@ static const uint16_t GaugesDataInInit[GaugesTotal][3][25] = ...@@ -41,8 +41,8 @@ static const uint16_t GaugesDataInInit[GaugesTotal][3][25] =
{ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 0, 0, 0, 0, 0, 0} { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 0, 0, 0, 0, 0, 0}
}, },
/*电池电压*/ /*电池电压*/
{ {0, 17000, 19000, 20000, 21000, 22000, 23000, 24000, 25000, 26000, 27000, 28000, 29000, 30000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, { {0, 18000, 19000, 20000, 21000, 22000, 23000, 24000, 25000, 26000, 27000, 28000, 29000, 30000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
{0, 18500, 19500, 20500, 21500, 22500, 23500, 24500, 25500, 26500, 27500, 28500, 29500, 30500, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, {17500, 18500, 19500, 20500, 21500, 22500, 23500, 24500, 25500, 26500, 27500, 28500, 29500, 30500, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
{0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0} {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}
}, },
......
source/Application/APP/Key/Key_user.c
View file @ d3cc359f
...@@ -14,10 +14,6 @@ ...@@ -14,10 +14,6 @@
#include "kwp2000_service.h" #include "kwp2000_service.h"
#include "CAN_Communication_Matrix.h" #include "CAN_Communication_Matrix.h"
/*-------------------------------------------------------*/
/*无车速限制值*/
#define DISPSPEEDNULLMAX 50
/*----------按键具体功能执行的回调函数-----------------------*/ /*----------按键具体功能执行的回调函数-----------------------*/
void Key_Operation_Enter(Key_Event_en_t enKeyEvent); void Key_Operation_Enter(Key_Event_en_t enKeyEvent);
......
source/Application/APP/Telltales/Telltales_user.c
View file @ d3cc359f
...@@ -630,8 +630,9 @@ uint8_t LED_H_S_A_T_Judgement(void) ...@@ -630,8 +630,9 @@ uint8_t LED_H_S_A_T_Judgement(void)
uint8_t m_Condition1 = 0u; uint8_t m_Condition1 = 0u;
uint8_t m_Condition2 = 0u; uint8_t m_Condition2 = 0u;
/*禅道4885*/
m_Condition1 = Get_ID_18FDC40B_Sig_HSAYellow_Sta(); m_Condition1 = Get_ID_18FDC40B_Sig_HSAYellow_Sta();
m_Condition2 = Get_ID_18F0010B_Sig_HSAGreen_Sta(); m_Condition2 = Get_ID_18F0010B_Sig_HSAGreen();
if (m_Condition1 == 1u) if (m_Condition1 == 1u)
{ {
...@@ -1610,15 +1611,22 @@ uint8_t LED_BRAKE_AIR_or_EBS_RED_R_Judgement(void) ...@@ -1610,15 +1611,22 @@ uint8_t LED_BRAKE_AIR_or_EBS_RED_R_Judgement(void)
uint8_t u8Result = 0u; uint8_t u8Result = 0u;
uint8_t CanStatus = 0u; uint8_t CanStatus = 0u;
uint8_t m_Condition1 = 0u; uint8_t m_Condition1 = 0u;
uint8_t m_Condition2 = 0u;
uint8_t m_Condition3 = 0u; uint8_t m_Condition3 = 0u;
m_Condition1 = (uint8_t)Line_In_Get_Status(LINE_IN_BRAKE_AIR_EBS); m_Condition1 = (uint8_t)Line_In_Get_Status(LINE_IN_BRAKE_AIR_EBS);
m_Condition2 = (uint8_t)Get_ID_18F0010B_Sig_ABS_Fully_Operational();
m_Condition3 = (uint8_t)Get_ID_18F0010B_Sig_EBS_Red_Warning_Lamp_State(); m_Condition3 = (uint8_t)Get_ID_18F0010B_Sig_EBS_Red_Warning_Lamp_State();
CanStatus = CAN_MSG_Status(ID_CanMsg18F0010B_Msg_Count); CanStatus = CAN_MSG_Status(ID_CanMsg18F0010B_Msg_Count);
if ((m_Condition1 == 0x01u) || (Common_Get_L12_Air_Sta() == 0x01u) || //if ((m_Condition1 == 0x01u) || (Common_Get_L12_Air_Sta() == 0x01u) ||
((K_Line_Set.K_Line_LID21 == 0x01u) && ((m_Condition3 == 1u) || (CanStatus == CAN_SIG_LOST)))) // ((K_Line_Set.K_Line_LID21 == 0x01u) && ((m_Condition3 == 1u) || (CanStatus == CAN_SIG_LOST))))
/*禅道5014*/
if (
(m_Condition1 == 0x01u) ||
((K_Line_Set.K_Line_LID21 == 0x01u) && ((m_Condition2 == 0u) || (m_Condition3 == 1u) || (CanStatus == CAN_SIG_LOST)))
)
{ {
u8Result = 1u; u8Result = 1u;
} }
......
source/Application/Alarm/Popup_List.c
View file @ d3cc359f
...@@ -67,27 +67,25 @@ const Popup_Attribute_t PopupAttributeTable[POPUP_MAX] = ...@@ -67,27 +67,25 @@ const Popup_Attribute_t PopupAttributeTable[POPUP_MAX] =
{/*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,}, {/*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, 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, 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, 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, SND_NONE , SND_TYPE_MULTI,},
{/* POPUP8_TemperatureThigh */ POPUP_TYPE_WARNING , 3u, 0u, POPUP_IGN_ON, POPUP8_TemperatureThigh , NULL, 1u, POPUP8_MSG_TemperatureThigh , POPUP_MODE_MULTI, SND_NONE , SND_TYPE_MULTI,}, {/* POPUP8_TemperatureThigh */ POPUP_TYPE_WARNING , 3u, 0u, POPUP_IGN_ON, POPUP8_TemperatureThigh , NULL, 1u, POPUP8_MSG_TemperatureThigh , POPUP_MODE_MULTI, SND_NONE , SND_TYPE_MULTI,},
{/* POPUP8_TBOX_GW_Sta */ POPUP_TYPE_WARNING , 3u, 0u, POPUP_IGN_ON, POPUP8_TBOX_GW_Sta , NULL, 1u, POPUP8_MSG_TBOX_GW_Sta , POPUP_MODE_MULTI, SND_NONE , SND_TYPE_MULTI,}, {/* POPUP8_TBOX_GW_Sta */ POPUP_TYPE_WARNING , 3u, 0u, POPUP_IGN_ON, POPUP8_TBOX_GW_Sta , NULL, 1u, POPUP8_MSG_TBOX_GW_Sta , POPUP_MODE_MULTI, SND_NONE , SND_TYPE_MULTI,},
{/* POPUP8_TBOX_Sta */ POPUP_TYPE_WARNING , 3u, 0u, POPUP_IGN_ON, POPUP8_TBOX_Sta , NULL, 1u, POPUP8_MSG_TBOX_Sta , POPUP_MODE_MULTI, SND_NONE , SND_TYPE_MULTI,}, {/* POPUP8_TBOX_Sta */ POPUP_TYPE_WARNING , 3u, 0u, POPUP_IGN_ON, POPUP8_TBOX_Sta , NULL, 1u, POPUP8_MSG_TBOX_Sta , POPUP_MODE_MULTI, SND_NONE , SND_TYPE_MULTI,},
{/* POPUP8_TBOX_Sig */ POPUP_TYPE_WARNING , 3u, 0u, POPUP_IGN_ON, POPUP8_TBOX_Sig , NULL, 1u, POPUP8_MSG_TBOX_Sig , POPUP_MODE_MULTI, SND_NONE , SND_TYPE_MULTI,}, {/* POPUP8_TBOX_Sig */ POPUP_TYPE_WARNING , 3u, 0u, POPUP_IGN_ON, POPUP8_TBOX_Sig , NULL, 1u, POPUP8_MSG_TBOX_Sig , POPUP_MODE_MULTI, SND_NONE , SND_TYPE_MULTI,},
{/* POPUP8_TBOX_Sig_Error */ POPUP_TYPE_WARNING , 3u, 0u, POPUP_IGN_ON, POPUP8_TBOX_Sig_Error , NULL, 1u, POPUP8_MSG_TBOX_Sig_Error , POPUP_MODE_MULTI, SND_NONE , SND_TYPE_MULTI,}, {/* POPUP8_TBOX_Sig_Error */ POPUP_TYPE_WARNING , 3u, 0u, POPUP_IGN_ON, POPUP8_TBOX_Sig_Error , NULL, 1u, POPUP8_MSG_TBOX_Sig_Error , 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, 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, 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, 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, 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, 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, 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, SND_NONE , SND_TYPE_MULTI,}, {/*57 POPUP10_RAPID_ACC */ POPUP_TYPE_WARNING , 4u, 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, SND_NONE , SND_TYPE_MULTI,}, {/*58 POPUP10_RAPID_SUB */ POPUP_TYPE_WARNING , 4u, 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, SND_NONE , SND_TYPE_MULTI,}, {/*59 POPUP10_REVAL_ENGINE */ POPUP_TYPE_WARNING , 4u, 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, SND_NONE , SND_TYPE_MULTI,}, {/*60 POPUP10_REVAL_SPEED */ POPUP_TYPE_WARNING , 4u, 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, SND_NONE , SND_TYPE_MULTI,}, {/*61 POPUP11_ENGINE_OIL_FILTER */ POPUP_TYPE_WARNING , 5u, 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, SND_NONE , SND_TYPE_MULTI,}, {/*62 POPUP11_FUEL_FILTER */ POPUP_TYPE_WARNING , 5u, 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, SND_NONE , SND_TYPE_MULTI,}, {/*63 POPUP11_T_MISSION_OIL */ POPUP_TYPE_WARNING , 5u, 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, SND_NONE , SND_TYPE_MULTI,}, {/*64 POPUP11_DIFF_OIL */ POPUP_TYPE_WARNING , 5u, 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, SND_NONE , SND_TYPE_MULTI,}, {/*65 POPUP11_CLUTCH_OIL */ POPUP_TYPE_WARNING , 5u, 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, SND_NONE , SND_TYPE_MULTI,}, {/*66 POPUP11_P_STEERING_FRUID */ POPUP_TYPE_WARNING , 5u, 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, SND_NONE , SND_TYPE_MULTI,}, {/*67 POPUP11_TIRE_ROTATION */ POPUP_TYPE_WARNING , 5u, 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_List.h
View file @ d3cc359f
...@@ -70,13 +70,11 @@ enum PopupName ...@@ -70,13 +70,11 @@ enum PopupName
POPUP8_OVERVOLTAGE ,/*51.过电压报警*/ POPUP8_OVERVOLTAGE ,/*51.过电压报警*/
POPUP8_BRAKE_BLOCKR ,/*52.后蹄片磨损*/ POPUP8_BRAKE_BLOCKR ,/*52.后蹄片磨损*/
POPUP8_BRAKE_BLOCKF ,/*53.前蹄片磨损*/ POPUP8_BRAKE_BLOCKF ,/*53.前蹄片磨损*/
POPUP8_TemperatureThigh ,/* 变速箱温度高*/ POPUP8_TemperatureThigh ,/* 变速箱温度高*/
POPUP8_TBOX_GW_Sta ,/* 未检测到GW*/ POPUP8_TBOX_GW_Sta ,/* 未检测到GW*/
POPUP8_TBOX_Sta ,/* 未检测到TBOX*/ POPUP8_TBOX_Sta ,/* 未检测到TBOX*/
POPUP8_TBOX_Sig ,/* TBOX通信异常*/ POPUP8_TBOX_Sig ,/* TBOX通信异常*/
POPUP8_TBOX_Sig_Error ,/* 平台通信异常*/ POPUP8_TBOX_Sig_Error ,/* 平台通信异常*/
POPUP8_DPD_AUTO ,/*54.DPD自动再生-再生将自动完成，不需要操作开关*/ POPUP8_DPD_AUTO ,/*54.DPD自动再生-再生将自动完成，不需要操作开关*/
POPUP9_AIR_PRESSURE ,/*55.气压过低-请冲入空气*/ POPUP9_AIR_PRESSURE ,/*55.气压过低-请冲入空气*/
POPUP9_EBS_ERROR ,/*56.EBS故障（红）-请与五十铃公司联系*/ POPUP9_EBS_ERROR ,/*56.EBS故障（红）-请与五十铃公司联系*/
......
source/Application/Alarm/Popup_Scheduler.c
View file @ d3cc359f
...@@ -792,7 +792,6 @@ static void Popup_Update_Status ( uint16_t PopupID ) ...@@ -792,7 +792,6 @@ static void Popup_Update_Status ( uint16_t PopupID )
*@Return: none. *@Return: none.
*@Note: none. *@Note: none.
**********************************************************************************************************/ **********************************************************************************************************/
uint8_t hyq_1, hyq_2;
static struct PopupList *Popup_Polling_Next ( struct PopupList *CurPopup ) static struct PopupList *Popup_Polling_Next ( struct PopupList *CurPopup )
{ {
struct PopupList *NextPopup = POPUPLIB_NULL; struct PopupList *NextPopup = POPUPLIB_NULL;
......
source/Application/Alarm/Popup_Scheduler.h
View file @ d3cc359f
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
#define POPUP_CUT_RECOVER 1u /*被打断的信息，恢复显示时，继续从此开始显示*/ #define POPUP_CUT_RECOVER 1u /*被打断的信息，恢复显示时，继续从此开始显示*/
#define POPUP_DOOR_OPEN_REAL 1u /*门开实时响应，打断其他的信息*/ #define POPUP_DOOR_OPEN_REAL 1u /*门开实时响应，打断其他的信息*/
#define POPUP_DISP_TIME_NORMAL 3u*10u /*unit = 100ms*/ #define POPUP_DISP_TIME_NORMAL 3u*10u /*unit = 100ms*/
#define POPUP_DISP_TIME_MIN 0u*10u /*unit = 100ms*/ #define POPUP_DISP_TIME_MIN 3u*10u /*unit = 100ms*/
#define POPUP_DISP_TIME_NORMAL_FLAG 9 /*unit = 100ms*/ #define POPUP_DISP_TIME_NORMAL_FLAG 9 /*unit = 100ms*/
/****************************************************************************** /******************************************************************************
查询模式定义 查询模式定义
......
source/Application/Alarm/Popups.c
View file @ d3cc359f
...@@ -1394,9 +1394,8 @@ void Popup_Alone_Sound_Server(void) ...@@ -1394,9 +1394,8 @@ void Popup_Alone_Sound_Server(void)
} }
/*15 DPD 手动再生*/ /*15 DPD 手动再生*/
//variable_1 = Get_ID_18FE5BE8_Sig_Camera_Status(); variable_1 = Get_ID_18FED900_Sig_DPF_Manual();
//if (variable_1 == 2u) if (variable_1 == 2u)/*禅道4978*/
if (0)
{ {
Sound_Request(SND_DPD_SPEED1, 1u); Sound_Request(SND_DPD_SPEED1, 1u);
} }
...@@ -1406,9 +1405,10 @@ void Popup_Alone_Sound_Server(void) ...@@ -1406,9 +1405,10 @@ void Popup_Alone_Sound_Server(void)
} }
/*15 DPD 手动再生 SXI-VC66-342_36ページ訂正 20220418*/ /*15 DPD 手动再生 SXI-VC66-342_36ページ訂正 20220418*/
//variable_1 = Get_ID_18FE5BE8_Sig_Camera_Status(); //variable_1 = Get_ID_18FD7C00_Sig_DPF_Lamp_Status_Amber();
variable_1 = Get_ID_18FD7C00_Sig_DPF_Lamp_Status_Amber(); //if (variable_1 == 4u)
if (variable_1 == 4u) variable_1 = Get_ID_18FED900_Sig_DPF_Manual();
if (variable_1 == 1u)/*禅道4978*/
{ {
Sound_Request(SND_DPD_SPEED2, 1u); Sound_Request(SND_DPD_SPEED2, 1u);
} }
...@@ -1418,9 +1418,8 @@ void Popup_Alone_Sound_Server(void) ...@@ -1418,9 +1418,8 @@ void Popup_Alone_Sound_Server(void)
} }
/*15 DPD 手动再生*/ /*15 DPD 手动再生*/
//variable_1 = Get_ID_18FE5BE8_Sig_Camera_Status(); variable_1 = Get_ID_18FED900_Sig_DPF_Manual();
//if (variable_1 == 3u) if (variable_1 == 3u)/*禅道4978*/
if (0)
{ {
Sound_Request(SND_DPD_SPEED4, 1u); Sound_Request(SND_DPD_SPEED4, 1u);
} }
......
source/Application/CAN_APP_NM/CAN_App/CAN_Communication_Matrix.c
View file @ d3cc359f
...@@ -683,6 +683,11 @@ uint8_t Get_ID_18FED900_Sig_DPF_storage(void) ...@@ -683,6 +683,11 @@ uint8_t Get_ID_18FED900_Sig_DPF_storage(void)
return (((uint8_t)((uint8_t)CAN_MSG_Read(ID_CanMsg18FED900_Msg_Count, 6u) >> 0u) & 0xFFu)); return (((uint8_t)((uint8_t)CAN_MSG_Read(ID_CanMsg18FED900_Msg_Count, 6u) >> 0u) & 0xFFu));
} }
uint8_t Get_ID_18FED900_Sig_DPF_Manual(void)
{
return (((uint8_t)((uint8_t)CAN_MSG_Read(ID_CanMsg18FED900_Msg_Count, 6u) >> 4u) & 0x03u));
}
uint8_t Get_ID_18FED900_Sig_SVS_Lamp_Status(void) uint8_t Get_ID_18FED900_Sig_SVS_Lamp_Status(void)
{ {
return (((uint8_t)((uint8_t)CAN_MSG_Read(ID_CanMsg18FED900_Msg_Count, 4u) >> 6u) & 0x03u)); return (((uint8_t)((uint8_t)CAN_MSG_Read(ID_CanMsg18FED900_Msg_Count, 4u) >> 6u) & 0x03u));
...@@ -819,6 +824,10 @@ uint8_t Get_ID_18F0010B_Sig_ASR_Brake_Control_Active(void) ...@@ -819,6 +824,10 @@ uint8_t Get_ID_18F0010B_Sig_ASR_Brake_Control_Active(void)
return (((uint8_t)((uint8_t)CAN_MSG_Read(ID_CanMsg18F0010B_Msg_Count, 0u) >> 2u) & 0x03u)); return (((uint8_t)((uint8_t)CAN_MSG_Read(ID_CanMsg18F0010B_Msg_Count, 0u) >> 2u) & 0x03u));
} }
uint8_t Get_ID_18F0010B_Sig_HSAGreen(void)
{
return (((uint8_t)((uint8_t)CAN_MSG_Read(ID_CanMsg18F0010B_Msg_Count, 0u) >> 4u) & 0x03u));
}
uint8_t Get_ID_18F0010B_Sig_HSAGreen_Sta(void) uint8_t Get_ID_18F0010B_Sig_HSAGreen_Sta(void)
{ {
return (((uint8_t)((uint8_t)CAN_MSG_Read(ID_CanMsg18F0010B_Msg_Count, 2u) >> 4u) & 0x03u)); return (((uint8_t)((uint8_t)CAN_MSG_Read(ID_CanMsg18F0010B_Msg_Count, 2u) >> 4u) & 0x03u));
......
source/Application/CAN_APP_NM/CAN_App/CAN_Communication_Matrix.h
View file @ d3cc359f
...@@ -169,6 +169,7 @@ extern uint8_t Get_ID_18FF2300_Sig_Exh_Lamp(void); ...@@ -169,6 +169,7 @@ extern uint8_t Get_ID_18FF2300_Sig_Exh_Lamp(void);
extern uint8_t Get_ID_18FED900_Sig_PTO_SW(void); extern uint8_t Get_ID_18FED900_Sig_PTO_SW(void);
extern uint8_t Get_ID_18FED900_Sig_DPF_Regeneration_Status(void); extern uint8_t Get_ID_18FED900_Sig_DPF_Regeneration_Status(void);
extern uint8_t Get_ID_18FED900_Sig_DPF_storage(void); extern uint8_t Get_ID_18FED900_Sig_DPF_storage(void);
extern uint8_t Get_ID_18FED900_Sig_DPF_Manual(void);
extern uint8_t Get_ID_18FED900_Sig_SVS_Lamp_Status(void); extern uint8_t Get_ID_18FED900_Sig_SVS_Lamp_Status(void);
extern uint8_t Get_ID_18FE5BE8_Sig_Camera_Status(void); extern uint8_t Get_ID_18FE5BE8_Sig_Camera_Status(void);
extern uint8_t Get_ID_18FE5BE8_Sig_Lane_Tracking_Status_Right_Side(void); extern uint8_t Get_ID_18FE5BE8_Sig_Lane_Tracking_Status_Right_Side(void);
...@@ -198,6 +199,7 @@ extern uint8_t Get_ID_18F0010B_Sig_ATC_or_ASR_Lamp_State(void); ...@@ -198,6 +199,7 @@ extern uint8_t Get_ID_18F0010B_Sig_ATC_or_ASR_Lamp_State(void);
extern uint8_t Get_ID_18F0010B_Sig_EBS_Amber_Warning_State(void); extern uint8_t Get_ID_18F0010B_Sig_EBS_Amber_Warning_State(void);
extern uint8_t Get_ID_18F0010B_Sig_ASR_Lamp_State(void); extern uint8_t Get_ID_18F0010B_Sig_ASR_Lamp_State(void);
extern uint8_t Get_ID_18F0010B_Sig_ASR_Brake_Control_Active(void); extern uint8_t Get_ID_18F0010B_Sig_ASR_Brake_Control_Active(void);
extern uint8_t Get_ID_18F0010B_Sig_HSAGreen(void);
extern uint8_t Get_ID_18F0010B_Sig_HSAGreen_Sta(void); extern uint8_t Get_ID_18F0010B_Sig_HSAGreen_Sta(void);
extern uint8_t Get_ID_18F0010B_Sig_EBS_Red_Warning_Lamp_State(void); extern uint8_t Get_ID_18F0010B_Sig_EBS_Red_Warning_Lamp_State(void);
extern uint8_t Get_ID_18F0010B_Sig_ABS_Fully_Operational(void); extern uint8_t Get_ID_18F0010B_Sig_ABS_Fully_Operational(void);
......
source/Application/CAN_APP_NM/CAN_App/CAN_FUNC.c
View file @ d3cc359f
...@@ -445,7 +445,7 @@ void Can_Set_Buff_18FF2A17(uint8_t CopyData[]) ...@@ -445,7 +445,7 @@ void Can_Set_Buff_18FF2A17(uint8_t CopyData[])
uint8_t Input_Trailer_ABS = 0u; uint8_t Input_Trailer_ABS = 0u;
uint8_t SW_Coupler_Lock = 0u; uint8_t SW_Coupler_Lock = 0u;
uint8_t SW_Parking = 0u; uint8_t SW_Parking = 0u;
uint8_t IGN_Voltage = 0u; uint16_t IGN_Voltage = 0u;
uint8_t MJX_MEB9_Manual_TM_Range_Low = 0u; uint8_t MJX_MEB9_Manual_TM_Range_Low = 0u;
uint8_t Range_Air_Cut_Warning = 0u; uint8_t Range_Air_Cut_Warning = 0u;
uint8_t IRIS_Warning_Lamp_Status = 0u; uint8_t IRIS_Warning_Lamp_Status = 0u;
...@@ -604,7 +604,17 @@ void Can_Set_Buff_18FF2A17(uint8_t CopyData[]) ...@@ -604,7 +604,17 @@ void Can_Set_Buff_18FF2A17(uint8_t CopyData[])
SW_Coupler_Lock = 0u; SW_Coupler_Lock = 0u;
/*电源电压*/ /*电源电压*/
IGN_Voltage = (9 + Gui_Get_Voltmeter_DisplayMode()) * 10 ; /*IGN_Voltage = (9 + Gui_Get_Voltmeter_DisplayMode()) * 10 ;*/
IGN_Voltage = Get_Voltmeter_AvrVoltage();
if (IGN_Voltage >= 9000)
{
IGN_Voltage = IGN_Voltage / 100 - 90;
}
else
{
IGN_Voltage = 90;
}
MJX_MEB9_Manual_TM_Range_Low = 0u; MJX_MEB9_Manual_TM_Range_Low = 0u;
Range_Air_Cut_Warning = 0u; Range_Air_Cut_Warning = 0u;
......
source/Application/Graphic/GUI/GUI.c
View file @ d3cc359f
This diff is collapsed.
source/Application/Graphic/UE/DisplaySch_user.c
View file @ d3cc359f
...@@ -374,7 +374,7 @@ void GUI_DisplayServices(void) ...@@ -374,7 +374,7 @@ void GUI_DisplayServices(void)
{ {
MenuFlag.Menu_Popup_Flag = 0u; MenuFlag.Menu_Popup_Flag = 0u;
if (DispVSpeed > 66u) if (DispVSpeed > DISPSPEEDNULLMAX)
{ {
NextMenu(MenuFlag.Menu_Flag); NextMenu(MenuFlag.Menu_Flag);
bCurMenuIDX = MenuFlag.Menu_Flag; bCurMenuIDX = MenuFlag.Menu_Flag;
...@@ -549,7 +549,7 @@ void Meter_Mode_conversion(void) ...@@ -549,7 +549,7 @@ void Meter_Mode_conversion(void)
/*自检模式*/ /*自检模式*/
else if (MenuFlag.Menu_Popup_Flag == 4u) else if (MenuFlag.Menu_Popup_Flag == 4u)
{ {
if ((DispVSpeed >= 66u) || (DispESpeed >= 330u)) if ((DispVSpeed > DISPSPEEDNULLMAX) || (DispESpeed >= 330u))
{ {
popupID = Popup_Get_Current_Message(); popupID = Popup_Get_Current_Message();
if ((popupID != 0xffffu) && (MenuFlag.Key_Menu_Popup_time == 0x00u)) if ((popupID != 0xffffu) && (MenuFlag.Key_Menu_Popup_time == 0x00u))
......
source/Application/Graphic/UE/DisplaySch_user.h
View file @ d3cc359f
...@@ -21,6 +21,8 @@ ...@@ -21,6 +21,8 @@
#define FRAMECNTFLAG 64u #define FRAMECNTFLAG 64u
#define DISPSPEEDNULLMAX 50
typedef struct typedef struct
{ {
uint8_t u8KEY_UP; uint8_t u8KEY_UP;
......
source/Application/RTE/Common_Interface.c
View file @ d3cc359f
...@@ -21,6 +21,9 @@ ...@@ -21,6 +21,9 @@
#include "UDS_Common.h" #include "UDS_Common.h"
#include "kwp2000_service.h" #include "kwp2000_service.h"
#include "DisplaySch_user.h"
#include "DispSch.h"
/*修饰变量static*/ /*修饰变量static*/
/*ig on off时间线*/ /*ig on off时间线*/
...@@ -305,6 +308,9 @@ void Common_Input_Para(void) ...@@ -305,6 +308,9 @@ void Common_Input_Para(void)
uint32_t EBC2_Speed_Value = 0u; uint32_t EBC2_Speed_Value = 0u;
uint8_t LineStatus1 = 0u; uint8_t LineStatus1 = 0u;
uint8_t LineStatus2 = 0u; uint8_t LineStatus2 = 0u;
UElib_uint16_t HMI_MENU_Sta = 0u;
HMI_MENU_Sta = Get_Cur_HMI();
u32IG_ON_Timer = Common_GetIgnOnTime(); u32IG_ON_Timer = Common_GetIgnOnTime();
...@@ -524,7 +530,7 @@ void Common_Input_Para(void) ...@@ -524,7 +530,7 @@ void Common_Input_Para(void)
} }
/**/ /**/
if (Get_ID_18FF4100_Sig_Cruise_VariableSLD_Disp() == 1u) if ((Get_ID_18FF4100_Sig_Cruise_VariableSLD_Disp() == 1u) && (HMI_MENU_Sta != Display_StartAnimation))
{ {
if (CRUISE_1_Time < 1501u) if (CRUISE_1_Time < 1501u)
{ {
...@@ -535,7 +541,8 @@ void Common_Input_Para(void) ...@@ -535,7 +541,8 @@ void Common_Input_Para(void)
{ {
CRUISE_1_Time = 0; CRUISE_1_Time = 0;
} }
if (Get_ID_18FF4100_Sig_Cruise_VariableSLD_Disp() == 2u)
if ((Get_ID_18FF4100_Sig_Cruise_VariableSLD_Disp() == 2u) && (HMI_MENU_Sta != Display_StartAnimation))
{ {
if (CRUISE_STUDY_Time < 1501u) if (CRUISE_STUDY_Time < 1501u)
{ {
...@@ -546,7 +553,8 @@ void Common_Input_Para(void) ...@@ -546,7 +553,8 @@ void Common_Input_Para(void)
{ {
CRUISE_STUDY_Time = 0; CRUISE_STUDY_Time = 0;
} }
if (Get_ID_18FF4100_Sig_Cruise_VariableSLD_Disp() == 3u)
if ((Get_ID_18FF4100_Sig_Cruise_VariableSLD_Disp() == 3u) && (HMI_MENU_Sta != Display_StartAnimation))
{ {
if (CRUISE_SLD1_Time < 1501u) if (CRUISE_SLD1_Time < 1501u)
{ {
......
source/Application/Sound_Alarm/Sound_Source.h
View file @ d3cc359f
...@@ -96,9 +96,9 @@ static const SndAttributeStruct SndAttributeTable[SND_SRC_INDEX_MAX] = ...@@ -96,9 +96,9 @@ static const SndAttributeStruct SndAttributeTable[SND_SRC_INDEX_MAX] =
{/*12 SND_SRC_ROWS_SPEED */ 0x00u, 13, SND_CYCLE_NONSTOP, SND_MODE_SINGLE, 1000u, },/*12 ROWS 警报 */ {/*12 SND_SRC_ROWS_SPEED */ 0x00u, 13, SND_CYCLE_NONSTOP, SND_MODE_SINGLE, 1000u, },/*12 ROWS 警报 */
{/*13 SND_SRC_Roll_SPEED */ 0x00u, 14, SND_CYCLE_NONSTOP, SND_MODE_SINGLE, 1000u, },/*13 Roll 警报 */ {/*13 SND_SRC_Roll_SPEED */ 0x00u, 14, SND_CYCLE_NONSTOP, SND_MODE_SINGLE, 1000u, },/*13 Roll 警报 */
{/*14 SND_SRC_EVSC_SPEED */ 0x01u, 15, SND_CYCLE_NONSTOP, SND_MODE_LOOP , 250u, },/*14 4HZ 2 EVSC */ {/*14 SND_SRC_EVSC_SPEED */ 0x01u, 15, SND_CYCLE_NONSTOP, SND_MODE_LOOP , 250u, },/*14 4HZ 2 EVSC */
{/*15 SND_SRC_DPD_SPEED */ 0x03u, 16, SND_CYCLE_NONSTOP, SND_MODE_SINGLE, 1000u, },/*15 1HZ 4 DPD 手动再生 */ {/*15 SND_SRC_DPD_SPEED */ 0x03u, 16, 3, SND_MODE_SINGLE, 1000u, },/*15 1HZ 4 DPD 手动再生 */
{/*15 SND_SRC_DPD_SPEED */ 0x03u, 16, 3, SND_MODE_SINGLE, 500u, },/*15 2HZ 4 DPD 手动再生 */ {/*15 SND_SRC_DPD_SPEED */ 0x03u, 16, 3, SND_MODE_SINGLE, 500u, },/*15 2HZ 4 DPD 手动再生 */
{/*15 SND_SRC_DPD_SPEED */ 0x03u, 16, SND_CYCLE_NONSTOP, SND_MODE_LOOP , 250u, },/*15 4HZ 4 DPD 手动再生 */ {/*15 SND_SRC_DPD_SPEED */ 0x03u, 16, 3, SND_MODE_LOOP , 250u, },/*15 4HZ 4 DPD 手动再生 */
{/*16 SND_SRC_NEES */ 0x00u, 17, SND_CYCLE_NONSTOP, SND_MODE_SINGLE, 1000u, },/*16 NEES */ {/*16 SND_SRC_NEES */ 0x00u, 17, SND_CYCLE_NONSTOP, SND_MODE_SINGLE, 1000u, },/*16 NEES */
{/*17 SND_SRC_ECO_STOP */ 0x00u, 18, SND_CYCLE_NONSTOP, SND_MODE_SINGLE, 1000u, },/*17 eco stop */ {/*17 SND_SRC_ECO_STOP */ 0x00u, 18, SND_CYCLE_NONSTOP, SND_MODE_SINGLE, 1000u, },/*17 eco stop */
{/*18 SND_SRC_Cyclone_High */ 0x03u, 19, SND_CYCLE_NONSTOP, SND_MODE_LOOP , 250u, },/*18 4HZ 4 气悬车高调整 */ {/*18 SND_SRC_Cyclone_High */ 0x03u, 19, SND_CYCLE_NONSTOP, SND_MODE_LOOP , 250u, },/*18 4HZ 4 气悬车高调整 */
......
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