Skip to content

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

水温指示灯，报警相关debug

parent 308e20e1
Hide whitespace changes
Inline Side-by-side
Showing with 25 additions and 30 deletions
source/Application/Alarm/Popup_List.c
View file @ 889b11f6
......@@ -18,8 +18,8 @@ const Popup_Attribute_t PopupAttributeTable[POPUP_MAX] =
{/*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, 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, 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, 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, SND_NONE , SND_TYPE_MULTI,},
{/*06 POPUT2_PTO */ POPUP_TYPE_WARNING , 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_WARNING , 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, 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, 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, SND_NONE , SND_TYPE_MULTI,},
......
source/Application/Alarm/Popups.c
View file @ 889b11f6
......@@ -187,6 +187,7 @@ void Popups_Polling(void)
if ((variable_1 == 0x01u) && (K_Line_Set.K_Line_LID21 == 0x01u))
{
Popup_Request(POPUT1_ASR_OPERATE);
return;
}
else
{
......@@ -1362,7 +1363,8 @@ void Popup_Alone_Sound_Server(void)
/*18 气悬车高调整 SXI-VC66-342_36ページ訂正 20220418*/
//variable_1 = Get_ID_CFF0F15_Sig_ID0CFF0F15_byte1_bit4_5();
variable_1 = Line_In_Get_Status(LINE_IN_AIR_SUS);
if (variable_1 == 1u)
variable_2 = Common_Get_Disp_V_Speed();
if ((variable_1 == 1u) && (variable_2 == 0u))
{
Sound_Request(SND_Cyclone_High4HZ, 1u);
}
......@@ -1375,7 +1377,7 @@ void Popup_Alone_Sound_Server(void)
//variable_1 = Get_ID_CFF0F15_Sig_ID0CFF0F15_byte1_bit4_5();
variable_1 = Line_In_Get_Status(LINE_IN_AIR_SUS);
variable_2 = Common_Get_Disp_V_Speed();
if ((variable_1 == 1u) && (variable_2 == 66u))
if ((variable_1 == 1u) && (variable_2 >= 5u))
{
Sound_Request(SND_Cyclone_High0_5, 1u);
}
......
source/Application/CAN_APP_NM/CAN_App/CAN_FUNC.c
View file @ 889b11f6
......@@ -402,11 +402,7 @@ void Can_Set_Buff_18FF2A17(uint8_t CopyData[])
uint8_t MJX_MEB9_Manual_TM_Range_Low = 0u;
uint8_t Range_Air_Cut_Warning = 0u;
uint8_t IRIS_Warning_Lamp_Status = 0u;
UElib_uint16_t HMI_MENU_Sta = 0u;
HMI_MENU_Sta = Get_Cur_HMI();
uint8_t Temperature = 0u;
/*手刹状态*/
if (Line_In_Get_Status(LINE_IN_PARK_BRAKE) == 1u)
{
......@@ -417,9 +413,9 @@ void Can_Set_Buff_18FF2A17(uint8_t CopyData[])
SW_Parking = 0 ;
}
Temperature = Get_ID_18FEEE00_Sig_Engine_Coolant_Temperature();
/*水温状态*/
if ((Get_ID_18FEEE00_Sig_Engine_Coolant_Temperature() > 0xFA) ||
(CAN_SIG_LOST == CAN_MSG_Status(ID_CanMsg18FEEE00_Msg_Count)))
if ((Temperature > 0xFA) || (CAN_SIG_LOST == CAN_MSG_Status(ID_CanMsg18FEEE00_Msg_Count)))
{
Water_Temp_Level = 2;
}
......@@ -427,19 +423,16 @@ void Can_Set_Buff_18FF2A17(uint8_t CopyData[])
{
Water_Temp_Level = 0 ;
}
else if ((Coolant_Get_CurSeg() >= 11) && (Coolant_Get_CurSeg() <= 12))
else if ((Coolant_Get_CurSeg() >= 11) && (Coolant_Get_CurSeg() <= 12) && (Temperature >= 0x96u))
{
if (HMI_MENU_Sta == Display_StartAnimation)
{
Water_Temp_Level = 0 ;
}
else
{
Water_Temp_Level = 1 ;
}
Water_Temp_Level = 1 ;
}
else
{
Water_Temp_Level = 0 ;
}
if ((Coolant_Get_Valid() == 1u) && (Coolant_Get_CurSeg() >= 12u) && (HMI_MENU_Sta != Display_StartAnimation))
if ((Coolant_Get_Valid() == 1u) && (Coolant_Get_CurSeg() >= 12u) && (Temperature >= 0x97u))
{
Water_Temp_Level_Flag = 1u;
}
......
source/Application/Graphic/UE/DisplaySch_user.h
View file @ 889b11f6
......@@ -14,7 +14,7 @@
#define DisplayAnimationTime 4500u
#define DisplayMenuTime 5000u / 10u
#define DisplayMenuTime 5500u / 10u
#define MAX_DriveInfoPage 6u
#define FUNC_ENABLE 1u
#define FUNC_DISABLE 0u
......
source/Application/common/TYW_stdint.h
View file @ 889b11f6
......@@ -311,7 +311,7 @@ typedef enum
#define Telltales_SelfCheckOffset (uint32_t)(2ul)
#define StartAnimationStart (uint32_t)(2ul)
#define StartAnimationEnd (uint32_t)(4500ul)
#define PopupStart (uint32_t)(5000ul)
#define PopupStart (uint32_t)(5500ul)
#define BackLightStart (uint32_t)(2ul)
/*LED Module*/
......
source/Driver/Buzzer/Sound_Tracks.h
View file @ 889b11f6
......@@ -67,7 +67,7 @@ static const SndTrackStruct SndTracks[] =
/*--------------------------------------------------------------
音符编号 | 声音频率(Hz) | 占空比(%) | 时长(ms) | 淡出时间(ms)
--------------------------------------------------------------*/
/* 1 */ 3900, 500, 300, 100,
/* 1 */ 3900, 500, 100, 50,
/* 2 */ 0, 0, 0, 0,
/* 3 */ 0, 0, 0, 0,
/* 4 */ 0, 0, 0, 0,
......@@ -85,7 +85,7 @@ static const SndTrackStruct SndTracks[] =
/*--------------------------------------------------------------
音符编号 | 声音频率(Hz) | 占空比(%) | 时长(ms) | 淡出时间(ms)
--------------------------------------------------------------*/
/* 1 */ 2500, 280, 300, 100,
/* 1 */ 2500, 280, 100, 50,
/* 2 */ 0, 0, 0, 0,
/* 3 */ 0, 0, 0, 0,
/* 4 */ 0, 0, 0, 0,
......@@ -103,7 +103,7 @@ static const SndTrackStruct SndTracks[] =
/*--------------------------------------------------------------
音符编号 | 声音频率(Hz) | 占空比(%) | 时长(ms) | 淡出时间(ms)
--------------------------------------------------------------*/
/* 1 */ 3900, 280, 300, 100,
/* 1 */ 3900, 280, 100, 50,
/* 2 */ 0, 0, 0, 0,
/* 3 */ 0, 0, 0, 0,
/* 4 */ 0, 0, 0, 0,
......@@ -121,7 +121,7 @@ static const SndTrackStruct SndTracks[] =
/*--------------------------------------------------------------
音符编号 | 声音频率(Hz) | 占空比(%) | 时长(ms) | 淡出时间(ms)
--------------------------------------------------------------*/
/* 1 */ 3900, 190, 300, 100,
/* 1 */ 3900, 190, 100, 50,
/* 2 */ 0, 0, 0, 0,
/* 3 */ 0, 0, 0, 0,
/* 4 */ 0, 0, 0, 0,
......@@ -139,7 +139,7 @@ static const SndTrackStruct SndTracks[] =
/*--------------------------------------------------------------
音符编号 | 声音频率(Hz) | 占空比(%) | 时长(ms) | 淡出时间(ms)
--------------------------------------------------------------*/
/* 1 */ 2600, 167, 300, 100,
/* 1 */ 2600, 167, 100, 50,
/* 2 */ 0, 0, 0, 0,
/* 3 */ 0, 0, 0, 0,
/* 4 */ 0, 0, 0, 0,
......@@ -157,7 +157,7 @@ static const SndTrackStruct SndTracks[] =
/*--------------------------------------------------------------
音符编号 | 声音频率(Hz) | 占空比(%) | 时长(ms) | 淡出时间(ms)
--------------------------------------------------------------*/
/* 1 */ 2000, 500, 300, 100,
/* 1 */ 2000, 500, 100, 50,
/* 2 */ 0, 0, 0, 0,
/* 3 */ 0, 0, 0, 0,
/* 4 */ 0, 0, 0, 0,
......@@ -175,7 +175,7 @@ static const SndTrackStruct SndTracks[] =
/*--------------------------------------------------------------
音符编号 | 声音频率(Hz) | 占空比(%) | 时长(ms) | 淡出时间(ms)
--------------------------------------------------------------*/
/* 1 */ 800, 500, 300, 100,
/* 1 */ 800, 500, 100, 50,
/* 2 */ 0, 0, 0, 0,
/* 3 */ 0, 0, 0, 0,
/* 4 */ 0, 0, 0, 0,
......
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