Skip to content

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

增加报警

parent 47fb0f5d
Expand all Show whitespace changes
Inline Side-by-side
Showing with 356 additions and 362 deletions
source/Application/Alarm/Popup_List.c
View file @ ac0758a6
......@@ -47,8 +47,8 @@ const Popup_Attribute_t PopupAttributeTable[POPUP_MAX] =
{/*32 POPUP5_ADBLUE_LEVEL_LOW */ POPUP_TYPE_WARNING , 3u, 13u, POPUP_IGN_ON, POPUP5_ADBLUE_LEVEL_LOW , NULL, 1u, POPUP5_MSG_ADBLUE_LEVEL_LOW , POPUP_MODE_MULTI, POPUP_NONE , POPUP_MODE_MULTI,},
{/*33 POPUP5_LOW_FAILURE */ POPUP_TYPE_WARNING , 3u, 14u, POPUP_IGN_ON, POPUP5_LOW_FAILURE , NULL, 1u, POPUP5_MSG_LOW_FAILURE , POPUP_MODE_MULTI, POPUP_NONE , POPUP_MODE_MULTI,},
{/*34 POPUP5_CAMERA_POLLUTION */ POPUP_TYPE_WARNING , 3u, 15u, POPUP_IGN_ON, POPUP5_CAMERA_POLLUTION , NULL, 1u, POPUP5_MSG_CAMERA_POLLUTION , POPUP_MODE_MULTI, POPUP_NONE , POPUP_MODE_MULTI,},
{/*35 POPUP5_AdBlue_LEVEL_LOW */ POPUP_TYPE_WARNING , 3u, 16u, POPUP_IGN_ON, POPUP5_AdBlue_LEVEL_LOW , NULL, 1u, POPUP5_MSG_AdBlue_LEVEL_LOW , POPUP_MODE_MULTI, POPUP_NONE , POPUP_MODE_MULTI,},
{/*36 POPUP5_AdBlue_INJ_SYSTEM */ POPUP_TYPE_WARNING , 3u, 17u, POPUP_IGN_ON, POPUP5_AdBlue_INJ_SYSTEM , NULL, 1u, POPUP5_MSG_AdBlue_INJ_SYSTEM , POPUP_MODE_MULTI, POPUP_NONE , POPUP_MODE_MULTI,},
{/*35 POPUP5_AdBlue_INJ_SYSTEM */ POPUP_TYPE_WARNING , 3u, 16u, POPUP_IGN_ON, POPUP5_AdBlue_INJ_SYSTEM , NULL, 1u, POPUP5_MSG_AdBlue_INJ_SYSTEM , POPUP_MODE_MULTI, POPUP_NONE , POPUP_MODE_MULTI,},
{/*36 POPUP5_AdBlue_DOS_MALFUNC */ POPUP_TYPE_WARNING , 3u, 17u, POPUP_IGN_ON, POPUP5_AdBlue_DOS_MALFUNC , NULL, 1u, POPUP5_MSG_AdBlue_DOS_MALFUNC , POPUP_MODE_MULTI, POPUP_NONE , POPUP_MODE_MULTI,},
{/*37 POPUP5_TPMS_HIGH_AIR */ POPUP_TYPE_WARNING , 3u, 18u, POPUP_IGN_ON, POPUP5_TPMS_HIGH_AIR , NULL, 1u, POPUP5_MSG_TPMS_HIGH_AIR , POPUP_MODE_MULTI, POPUP_NONE , POPUP_MODE_MULTI,},
{/*38 POPUP5_TPMS_HIGH_TEMP */ POPUP_TYPE_WARNING , 3u, 19u, POPUP_IGN_ON, POPUP5_TPMS_HIGH_TEMP , NULL, 1u, POPUP5_MSG_TPMS_HIGH_TEMP , POPUP_MODE_MULTI, POPUP_NONE , POPUP_MODE_MULTI,},
{/*39 POPUP5_PUSH_DPD_SWITCH1 */ POPUP_TYPE_WARNING , 3u, 20u, POPUP_IGN_ON, POPUP5_PUSH_DPD_SWITCH1 , NULL, 1u, POPUP5_MSG_PUSH_DPD_SWITCH1 , POPUP_MODE_MULTI, POPUP_NONE , POPUP_MODE_MULTI,},
......
source/Application/Alarm/Popup_List.h
View file @ ac0758a6
......@@ -50,8 +50,8 @@ enum PopupName
POPUP5_ADBLUE_LEVEL_LOW ,/*32.尿素余量少-无车速*/
POPUP5_LOW_FAILURE ,/*33.胎压报警-气压低*/
POPUP5_CAMERA_POLLUTION ,/*34.摄像头有污染-请与五十铃公司联系*/
POPUP5_AdBlue_LEVEL_LOW ,/*35.尿素喷射异常（停止）*/
POPUP5_AdBlue_INJ_SYSTEM ,/*36.尿素喷射异常（消耗量）*/
POPUP5_AdBlue_INJ_SYSTEM ,/*35.尿素喷射异常（停止）*/
POPUP5_AdBlue_DOS_MALFUNC ,/*36.尿素喷射异常（消耗量）*/
POPUP5_TPMS_HIGH_AIR ,/*37.高圧警報-轮胎高压警告*/
POPUP5_TPMS_HIGH_TEMP ,/*38.高温警報-轮胎高温警告*/
POPUP5_PUSH_DPD_SWITCH1 ,/*39.DPD手动再生要求1-请按下DPD开关*/
......
source/Application/Alarm/Popup_Message_List.h
View file @ ac0758a6
......@@ -44,8 +44,8 @@ enum PopupMessageName
POPUP5_MSG_ADBLUE_LEVEL_LOW , /*32.尿素余量少-无车速*/
POPUP5_MSG_LOW_FAILURE , /*33.胎压报警-气压低*/
POPUP5_MSG_CAMERA_POLLUTION , /*34.摄像头有污染-请与五十铃公司联系*/
POPUP5_MSG_AdBlue_LEVEL_LOW , /*35.尿素喷射异常（停止）*/
POPUP5_MSG_AdBlue_INJ_SYSTEM , /*36.尿素喷射异常（消耗量）*/
POPUP5_MSG_AdBlue_INJ_SYSTEM , /*35.尿素喷射异常（停止）*/
POPUP5_MSG_AdBlue_DOS_MALFUNC , /*36.尿素喷射异常（消耗量）*/
POPUP5_MSG_TPMS_HIGH_AIR , /*37.高圧警報-轮胎高压警告*/
POPUP5_MSG_TPMS_HIGH_TEMP , /*38.高温警報-轮胎高温警告*/
POPUP5_MSG_PUSH_DPD_SWITCH1 , /*39.DPD手动再生要求1-请按下DPD开关*/
......@@ -144,8 +144,8 @@ static const PopupMsgAttributeStruct PopupMsgAttributeTable[] =
{ /* POPUP5_MSG_ADBLUE_LEVEL_LOW */ POPUP_TYPE_GENERAL,}, /*32.尿素余量少-无车速*/
{ /* POPUP5_MSG_LOW_FAILURE */ POPUP_TYPE_GENERAL,}, /*33.胎压报警-气压低*/
{ /* POPUP5_MSG_CAMERA_POLLUTION */ POPUP_TYPE_GENERAL,}, /*34.摄像头有污染-请与五十铃公司联系*/
{ /* POPUP5_MSG_AdBlue_LEVEL_LOW */ POPUP_TYPE_GENERAL,}, /*35.尿素喷射异常（停止）*/
{ /* POPUP5_MSG_AdBlue_INJ_SYSTEM */ POPUP_TYPE_GENERAL,}, /*36.尿素喷射异常（消耗量）*/
{ /* POPUP5_MSG_AdBlue_INJ_SYSTEM */ POPUP_TYPE_GENERAL,}, /*35.尿素喷射异常（停止）*/
{ /* POPUP5_MSG_AdBlue_DOS_MALFUNC */ POPUP_TYPE_GENERAL,}, /*36.尿素喷射异常（消耗量）*/
{ /* POPUP5_MSG_TPMS_HIGH_AIR */ POPUP_TYPE_GENERAL,}, /*37.高圧警報-轮胎高压警告*/
{ /* POPUP5_MSG_TPMS_HIGH_TEMP */ POPUP_TYPE_GENERAL,}, /*38.高温警報-轮胎高温警告*/
{ /* POPUP5_MSG_PUSH_DPD_SWITCH1 */ POPUP_TYPE_GENERAL,}, /*39.DPD手动再生要求1-请按下DPD开关*/
......
source/Application/Alarm/Popups.c
View file @ ac0758a6
This diff is collapsed.
source/Application/RTE/Common_Interface.c
View file @ ac0758a6
......@@ -8,6 +8,7 @@
#include "Gauges.h"
#include "dr7f701441.dvf.h"
#include "GPIO.h"
#include "Data_Voltmeter.h"
#include "Line_in.h"
......@@ -71,6 +72,11 @@ static uint16_t CRUISE_STUDY_Time;
static uint16_t CRUISE_SLD1_Time;
static uint16_t CRUISE_SLD2_Time;
static uint16_t VolWarning_Time;
static uint16_t HIGH_VOLTAGE;
static uint16_t LOW_VOLTAGE;
/*每次唤醒调用*/
void Common_DataInit(void)
{
......@@ -102,6 +108,10 @@ void Common_DataInit(void)
CRUISE_STUDY_Time = 0x00u;
CRUISE_SLD1_Time = 0x00u;
CRUISE_SLD2_Time = 0x00u;
VolWarning_Time = 0x00u;
HIGH_VOLTAGE = 0x0u;
LOW_VOLTAGE = 0x0u;
}
/*以下由各个处理模块按需调用*/
......@@ -257,6 +267,19 @@ void Common_Input_Para(void)
PowerIgnOnTimeLine += 2u;
}
/*电压计报警时间*/
if (Gui_Get_Voltmeter_DisplayMode() <= 3u)
{
if (VolWarning_Time <= 5100)
{
VolWarning_Time ++;
}
}
else
{
VolWarning_Time = 0;
}
/**/
if ((State_Flag.User_FDJYLQQ_FLAG == 1) || (State_Flag.User_FDJYLQQ_FLAG == 2))
{
......@@ -372,6 +395,9 @@ void Common_Input_Para(void)
{
CRUISE_SLD1_Time = 0;
}
}
else
{
......@@ -508,6 +534,22 @@ uint8_t Common_Get_Cruise_SLD_TimeSta(void)
return Time_Sta;
}
uint8_t Common_VolWarning_Sta(void)
{
uint8_t DataHiCollantVolWarning = 0u;
if (VolWarning_Time >= 5000u)
{
DataHiCollantVolWarning = 1u;
}
else
{
DataHiCollantVolWarning = 0u;
}
return DataHiCollantVolWarning ;
}
/*EOL诊断配置数据转换为仪表配置数据*/
void ReadDTCEOLValue_Meter_K_LINE(void)
{
......
source/Application/RTE/Common_Interface.h
View file @ ac0758a6
......@@ -129,6 +129,8 @@ uint8_t Get_CanFirstRecv_Event(uint8_t ID);
uint8_t Common_Get_Cruise_TimeSta(void);
uint8_t Common_Get_Cruise_SLD_TimeSta(void);
uint8_t Common_VolWarning_Sta(void);
void ReadDTCEOLValue_Meter_K_LINE(void);
void K_LINE_EOL_InitVal(void);
......
source/Application/common/TYW_stdint.h
View file @ ac0758a6
......@@ -311,9 +311,9 @@ typedef enum
#define Telltales_SelfCheckOffset (uint32_t)(2ul)
#define StartAnimationStart (uint32_t)(2ul)
//#define StartAnimationEnd (uint32_t)(3000ul)
//#define PopupStart (uint32_t)(4000ul)
#define PopupStart (uint32_t)(4000ul)
#define StartAnimationEnd (uint32_t)(50ul)
#define PopupStart (uint32_t)(1000ul)
//#define PopupStart (uint32_t)(1000ul)
#define BackLightStart (uint32_t)(2ul)
/*LED Module*/
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment