Skip to content

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

调整弹出报警显示状态，调整声音报警，调整OFF档可唤醒指示灯

parent 7f3b7937
Hide whitespace changes
Inline Side-by-side
Showing with 51 additions and 17 deletions
source/Application/APP/Telltales/Telltales_user.c
View file @ a0cb28b0
......@@ -29,8 +29,8 @@ const LED_Attribute_st LED_Attribute[LED_Max] =
{ em_LED_FOUR_MUL_FOUR_T , NoSelfCheck , NoExterNalCheck , LED_IGN_ON , 2500u, 4500ul, LED_FOUR_MUL_FOUR_T_Judgement , LED_FOUR_MUL_FOUR_T_Execution },
{ em_LED_EXH_BRAKE_T , NoSelfCheck , NoExterNalCheck , LED_IGN_ON , 2500u, 4500ul, LED_EXH_BRAKE_T_Judgement , LED_EXH_BRAKE_T_Execution },
{ em_LED_QOS_GLOW_T , SelfCheck , NoExterNalCheck , LED_IGN_ON , 2500u, 4500ul, LED_QOS_GLOW_T_Judgement , LED_QOS_GLOW_T_Execution },
{ em_LED_HI_BEAM_T , NoSelfCheck , NoExterNalCheck , LED_IGN_ON , 2500u, 4500ul, LED_HI_BEAM_T_Judgement , LED_HI_BEAM_T_Execution },
{ em_LED_Rr_FOG_LAMP_T , NoSelfCheck , NoExterNalCheck , LED_IGN_ON , 2500u, 4500ul, LED_Rr_FOG_LAMP_T_Judgement , LED_Rr_FOG_LAMP_T_Execution },
{ em_LED_HI_BEAM_T , NoSelfCheck , NoExterNalCheck , LED_IGN_ON_OFF , 2500u, 4500ul, LED_HI_BEAM_T_Judgement , LED_HI_BEAM_T_Execution },
{ em_LED_Rr_FOG_LAMP_T , NoSelfCheck , NoExterNalCheck , LED_IGN_ON_OFF , 2500u, 4500ul, LED_Rr_FOG_LAMP_T_Judgement , LED_Rr_FOG_LAMP_T_Execution },
{ em_LED_MIL_T , SelfCheck , NoExterNalCheck , LED_IGN_ON , 2500u, 4500ul, LED_MIL_T_Judgement , LED_MIL_T_Execution },
{ em_LED_SVS_T , SelfCheck , NoExterNalCheck , LED_IGN_ON , 2500u, 4500ul, LED_SVS_T_Judgement , LED_SVS_T_Execution },
{ em_LED_H_S_A__T , NoSelfCheck , NoExterNalCheck , LED_IGN_ON , 2500u, 4500ul, LED_H_S_A_T_Judgement , LED_H_S_A_T_Execution },
......
source/Application/Graphic/GUI/GUI.c
View file @ a0cb28b0
......@@ -4022,7 +4022,7 @@ void GUI_BG_RepMenu_3_1_Display(uint8_t Mode)
GUI_General_Digit_Display(MENU_Sprite, User_Value, Nb_15_0, 6u, 5u, GUI_REP1_X, 277u, GUI_BLENDMODE_SRC_OVER);
}
else if ((Sig_Engine_Oil == 0u) && (Sig_Starter_OH == 0u)) /*无报警*/
else if ((Sig_Engine_Oil == 0u) || (Sig_Starter_OH == 0u)) /*无报警*/
{
GUI_General_Display(MENU_Sprite, CN_User_Menu3_01_12, GUI_BLENDMODE_SRC_OVER);/*距离更换*/
......@@ -4037,7 +4037,7 @@ void GUI_BG_RepMenu_3_1_Display(uint8_t Mode)
GUI_General_Digit_Display(MENU_Sprite, User_Value, Nb_15_0, 6u, 5u, GUI_REP1_X, 277u, GUI_BLENDMODE_SRC_OVER);
}
else if ((Sig_Engine_Oil == 2u) && (Sig_Starter_OH == 2u)) /*本报警*/
else if ((Sig_Engine_Oil == 2u) || (Sig_Starter_OH == 2u)) /*本报警*/
{
GUI_General_Display(MENU_Sprite, CN_User_Menu3_01_13, GUI_BLENDMODE_SRC_OVER); /*请更换*/
......@@ -4053,7 +4053,7 @@ void GUI_BG_RepMenu_3_1_Display(uint8_t Mode)
GUI_General_Digit_Display(MENU_Sprite, User_Value, Nb_15_0, 6u, 5u, GUI_REP1_X, 277u, GUI_BLENDMODE_SRC_OVER);
}
else if ((Sig_Engine_Oil == 3u) && (Sig_Starter_OH == 3u))/*空白*/
else if ((Sig_Engine_Oil == 3u) || (Sig_Starter_OH == 3u))/*空白*/
{
GUI_General_Display(MENU_Sprite, CN_User_Menu3_01_12, GUI_BLENDMODE_SRC_OVER); /*距离更换*/
GUI_General_Display(MENU_Sprite, SpriteSize, GUI_BLENDMODE_SRC_OVER);
......@@ -6537,9 +6537,26 @@ void GUI_General_Popup_Display(uint16_t PopupMsg)
;//GUI_General_Display(MultiPurpose_Sprite, CN_Alarm_01_imageblack, GUI_BLENDMODE_SRC_OVER); /*黑底*/
}
GUI_General_Display(MultiPurpose_Sprite, GUIGeneralPopupTable[PopupMsg].PICIcon, GUI_BLENDMODE_CUSTOM);
GUI_General_Display(MultiPurpose_Sprite, GUIGeneralPopupTable[PopupMsg].HImageCN1, GUI_BLENDMODE_CUSTOM);
GUI_General_Display(MultiPurpose_Sprite, GUIGeneralPopupTable[PopupMsg].HImageCN2, GUI_BLENDMODE_CUSTOM);
if (PopupMsg == POPUP5_MSG_PUSH_DPD_SWITCH2)
{
if (FLASH_SYNC_1Hz)
{
GUI_General_Display(MultiPurpose_Sprite, GUIGeneralPopupTable[PopupMsg].PICIcon, GUI_BLENDMODE_CUSTOM);
}
else
{
GUI_General_Display(MultiPurpose_Sprite, SpriteSize, GUI_BLENDMODE_SRC_OVER);
}
GUI_General_Display(MultiPurpose_Sprite, GUIGeneralPopupTable[PopupMsg].HImageCN1, GUI_BLENDMODE_CUSTOM);
GUI_General_Display(MultiPurpose_Sprite, GUIGeneralPopupTable[PopupMsg].HImageCN2, GUI_BLENDMODE_CUSTOM);
}
else
{
GUI_General_Display(MultiPurpose_Sprite, GUIGeneralPopupTable[PopupMsg].PICIcon, GUI_BLENDMODE_CUSTOM);
GUI_General_Display(MultiPurpose_Sprite, GUIGeneralPopupTable[PopupMsg].HImageCN1, GUI_BLENDMODE_CUSTOM);
GUI_General_Display(MultiPurpose_Sprite, GUIGeneralPopupTable[PopupMsg].HImageCN2, GUI_BLENDMODE_CUSTOM);
}
}
else
{
......@@ -6553,9 +6570,26 @@ void GUI_General_Popup_Display(uint16_t PopupMsg)
;//GUI_General_Display(MultiPurpose_Sprite, CN_Alarm_01_imageblack, GUI_BLENDMODE_SRC_OVER); /*黑底*/
}
GUI_General_Display(MultiPurpose_Sprite, GUIGeneralPopupTable[PopupMsg].PICIcon, GUI_BLENDMODE_CUSTOM);
GUI_General_Display(MultiPurpose_Sprite, GUIGeneralPopupTable[PopupMsg].HImageCN3, GUI_BLENDMODE_CUSTOM);
GUI_General_Display(MultiPurpose_Sprite, GUIGeneralPopupTable[PopupMsg].HImageCN4, GUI_BLENDMODE_CUSTOM);
if (PopupMsg == POPUP5_MSG_PUSH_DPD_SWITCH2)
{
if (FLASH_SYNC_1Hz)
{
GUI_General_Display(MultiPurpose_Sprite, GUIGeneralPopupTable[PopupMsg].PICIcon, GUI_BLENDMODE_CUSTOM);
}
else
{
GUI_General_Display(MultiPurpose_Sprite, SpriteSize, GUI_BLENDMODE_SRC_OVER);
}
GUI_General_Display(MultiPurpose_Sprite, GUIGeneralPopupTable[PopupMsg].HImageCN3, GUI_BLENDMODE_CUSTOM);
GUI_General_Display(MultiPurpose_Sprite, GUIGeneralPopupTable[PopupMsg].HImageCN4, GUI_BLENDMODE_CUSTOM);
}
else
{
GUI_General_Display(MultiPurpose_Sprite, GUIGeneralPopupTable[PopupMsg].PICIcon, GUI_BLENDMODE_CUSTOM);
GUI_General_Display(MultiPurpose_Sprite, GUIGeneralPopupTable[PopupMsg].HImageCN3, GUI_BLENDMODE_CUSTOM);
GUI_General_Display(MultiPurpose_Sprite, GUIGeneralPopupTable[PopupMsg].HImageCN4, GUI_BLENDMODE_CUSTOM);
}
}
}
......
source/Application/Graphic/GUI/GUI.h
View file @ a0cb28b0
......@@ -220,8 +220,8 @@ static const GUIGeneralPopupStruct GUIGeneralPopupTable[] =
{CN_Alarm_G5_17_18_21_image, CN_Alarm_G5_17_18_21_wenzi3, SpriteSize, CN_Alarm_G5_17_18_21_wenzi5, SpriteSize}, /*36. 尿素喷射异常（消耗量）*/
{CN_Alarm_G5_12_25_image, CN_Alarm_G5_12_25_wenzi4, SpriteSize, CN_Alarm_G5_12_25_wenzi4, SpriteSize}, /*37. 高圧警報-轮胎高压警告*/
{CN_Alarm_G5_12_25_image, CN_Alarm_G5_12_25_wenzi9, SpriteSize, CN_Alarm_G5_12_25_wenzi9, SpriteSize}, /*38. 高温警報-轮胎高温警告*/
{CN_Alarm_G5_12_23_image, CN_Alarm_G5_12_23_wenzi2, CN_Alarm_G5_17_18_21_wenzi4,CN_Alarm_G5_12_23_wenzi1, SpriteSize}, /*39. DPD手动再生要求1-请按下DPD开关*/
{CN_Alarm_G5_12_23_image, CN_Alarm_G5_12_23_wenzi2, SpriteSize, CN_Alarm_G5_12_23_wenzi1, SpriteSize}, /*40. DPD手动再生要求2-请按下DPD开关*/
{CN_Alarm_G5_12_23_image, CN_Alarm_G5_12_23_wenzi2, SpriteSize, CN_Alarm_G5_12_23_wenzi1, SpriteSize}, /*39. DPD手动再生要求1-请按下DPD开关*/
{CN_Alarm_G5_12_23_image, CN_Alarm_G5_12_23_wenzi2, CN_Alarm_G5_17_18_21_wenzi4,CN_Alarm_G5_12_23_wenzi1, SpriteSize}, /*40. DPD手动再生要求2-请按下DPD开关*/
{CN_Alarm_G5_12_25_image, CN_Alarm_G5_12_25_wenzi7, SpriteSize, CN_Alarm_G5_12_25_wenzi7, SpriteSize}, /*41. TPMS故障*/
{CN_Alarm_G5_12_25_image, CN_Alarm_G5_12_25_wenzi6, SpriteSize, CN_Alarm_G5_12_25_wenzi6, SpriteSize}, /*42. TPMS電池低下-轮胎监控传感器电压下降*/
{CN_Alarm_stop_31_image, SpriteSize, SpriteSize, CN_Alarm_stop_31_wenzi1, SpriteSize}, /*43.第六组 遥控车辆高度调整中(无车速)*/
......
source/Application/Sound_Alarm/Sound_Source.h
View file @ a0cb28b0
......@@ -97,7 +97,7 @@ static const SndAttributeStruct SndAttributeTable[SND_SRC_INDEX_MAX] =
{/*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 */
{/*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, SND_CYCLE_NONSTOP, 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 手动再生 */
{/*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 */
......
source/Application/UDS_M/TP_Layer.c
View file @ a0cb28b0
......@@ -650,7 +650,7 @@ void TP_TransmitPDU(void)
//g_bReturn = bsp_CANSendFrame(g_txCanMsg.id, txResNum, (uint8_t *)&g_txCanMsg.msg[0], 8);
/*重新赋值----20220326----*/
canMag.MsgID = g_txCanMsg.id;
canMag.MsgID = 0x7E0;//g_txCanMsg.id;
canMag.MsgDLC = 8u;
canMag.MsgPro = 0u;
canMag.MsgStd = 0u;
......
source/Application/UDS_M/UDS_CFG.h
View file @ a0cb28b0
......@@ -16,9 +16,9 @@
#define ID_BCM_PhyAddr 0x7E0
#define ID_BCM_ResAddr 0x7E8 //BCM物理响应
//#define ID_PhyAddr 0x7E8
#define ID_PhyAddr 0x7E8
#define ID_ResAddr 0x7E0 //物理响应
//#define ID_FunAddr 0x7df
#define ID_FunAddr 0x7df
#define N_FILL 0x00
......
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