Skip to content

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

调整报警调度，报警显示

parent 958922ea
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 31259 additions and 31158 deletions
ghs/group/Application.gpj
View file @ bc1ecddc
......@@ -23,6 +23,7 @@
.\Alarm\Popup_Scheduler.h
.\Alarm\Popup_Message_List.h
.\Alarm\Popup_List.h
.\Alarm\Popup_List.c
.\Alarm\Popups.c
.\Alarm\Popups.h
.\Sound_Alarm\PCM_Sound_Tracks.c
......
source/Application/Alarm/Popups.c
View file @ bc1ecddc
......@@ -8,6 +8,8 @@
#include "CAN_Communication_Matrix.h"
#include "Popup_List.h"
#include "Popup_Message_List.h"
#include "Sound_List.h"
#include "Telltales.h"
#include "Data_Gear.h"
......@@ -17,109 +19,62 @@
#include "Data_Voltmeter.h"
#include "Data_Fuel_User.h"
uint8_t PopupSeatBeltDrReq;
uint8_t PopupSeatBeltPaReq;
uint8_t PopupESCStatBackup;
GUIRadarFlashCtrlStruct GUIRADARSysFailureFlash;
uint16_t StartupAnimationTimer;
void GUI_RADAR_Sys_Failure_Flash_Reset(void);
void GUI_RADAR_Sys_Failure_Flash_Reset(void)
{
if ( GUIRADARSysFailureFlash.Cnt == 0xFF )
{
GUIRADARSysFailureFlash.Backup = 0;
GUIRADARSysFailureFlash.Cnt = 0;
}
else if ( GUIRADARSysFailureFlash.Cnt != 0 )
{
GUIRADARSysFailureFlash.Cnt = 0xFF;
}
}
uint8_t wbytest = 0 ;
uint8_t wbyTrigger[6] = {0};
void Popups_Management_Service(void)
{
/* uint8_t PopupMsg = 0u;
uint8_t PopupSnd = 0u;*/
//Popups_Polling( );
uint8_t i = 0 ;
for (i = 0 ; i < POPUP_MAX ; i ++)
{
if (i == wbytest )
Popup_Request(i);
else
Popup_Delete(i);
}
//wbytest = Popup_Get_Current_Message();
/* PopupMsg = Popup_Get_Current_Message();
PopupSnd = Popup_Get_Current_Sound();
Popups_Displaying(PopupMsg);*/
}
uint8_t Get_wbyPopupTest(void)
{
return wbytest ;
Popups_Polling( );
}
uint16_t hyq = 0u;
void Popups_Polling(void)
{
uint32_t Ign_Time ;
uint8_t EOL = 0x00 ;
COMMON_PowerStatus_t PowerSts ;
//共用参数
uint8_t V_Speed = 0 ;//车速
uint8_t E_Speed = 0 ;//转速
uint8_t variable_1 , variable_2, variable_3, variable_4, variable_5;
uint16_t i = 0u;
uint32_t u32IG_OFF_Timer = 0u;
uint32_t u32IG_ON_Timer = 0u;
uint16_t KL30_Volt = 0 ;
COMMON_PowerStatus_t u8IG_st;
uint8_t Can_BusOFF = 0u;
if (Get_Voltmeter_Valid())
{
KL30_Volt = Get_Voltmeter_AvrVoltage();
}
u32IG_ON_Timer = Common_GetIgnOnTime( );
u32IG_OFF_Timer = Common_GetIgnOffTime( );
if (Common_Get_IG_Sts_Valid())
{
Ign_Time = Common_GetIgnOnTime();
PowerSts = Common_Get_IG_Sts();
}
else
{
Ign_Time = 0 ;
PowerSts = COMMON_POWER_OFF ;
}
u8IG_st = Common_Get_IG_Sts( );
//车速有效判定
if (Common_Get_Act_V_Speed_Valid())
{
V_Speed = Common_Get_Act_V_Speed();
}
else
/*CAN 通讯异常*/
for ( i = 0u; i < ID_TOTAL_MAX; i++ )
{
V_Speed = 0 ;
if ( CAN_MSG_Status(i) == CAN_SIG_LOST )
{
Can_BusOFF++;
}
}
//转速有效判定
if (Common_Get_Act_E_Speed_Valid())
if (( u32IG_ON_Timer <= PopupStart ) && (u32IG_ON_Timer >= 2u ))
{
E_Speed = Common_Get_Act_E_Speed();
}
else
{
E_Speed = 0 ;
if ( u8IG_st == COMMON_POWER_ON )
{
/*----第一组---------------------------------------------------------------------*/
/*0.紧急警报-刹车*/
if (hyq)
{
Popup_Request(POPUP1_BRAKE_BLACK);
}
else
{
Popup_Delete(POPUP1_BRAKE_BLACK);
}
}
else /*ig off*/
{
Popup_Clear(POPUP1_BRAKE_BLACK);
}
}
#if 0
//0.紧急警报-刹车
variable_1 = Get_ID_CF02F2A_Sig_Advanced_Emerg_Braking_Sys_Sta();
variable_2 = Get_ID_CF02FA0_Sig_Advanced_Emerg_Braking_Sys_Sta();
......@@ -1096,11 +1051,27 @@ void Popups_Polling(void)
//94.更换轮胎・轮胎位置
#endif
}
void Popups_Displaying(uint8_t PopupMsg)
{
if ( PopupMsg < POPUP_MSG_NUMBER_TOTAL )
{
switch ( PopupMsgAttributeTable [ PopupMsg ].Type )
{
case POPUP_TYPE_GENERAL:
GUI_General_Popup_Display(PopupMsg);
break;
default:
break;
}
}
}
void Popups_Sound_Playing(uint8_t PopupSnd)
{
uint8_t ReqCode = 0u;
......@@ -1109,74 +1080,6 @@ void Popups_Sound_Playing(uint8_t PopupSnd)
switch ( PopupSnd )
{
/*
case SND_RADAR :
if ( RADAR_SOUND == RADAR_SND_2Hz )
{
Sound_Delete ( SND_RADAR_4Hz );
Sound_Delete ( SND_RADAR_CONTINUOUS );
Sound_Request ( SND_RADAR_2Hz, ReqCode );
}
else if ( RADAR_SOUND == RADAR_SND_4Hz )
{
Sound_Delete ( SND_RADAR_2Hz );
Sound_Delete ( SND_RADAR_CONTINUOUS );
Sound_Request ( SND_RADAR_4Hz, ReqCode );
}
else if ( RADAR_SOUND == RADAR_SND_CONTINUOUS )
{
Sound_Delete ( SND_RADAR_2Hz );
Sound_Delete ( SND_RADAR_4Hz );
Sound_Request ( SND_RADAR_CONTINUOUS, ReqCode );
}
else
{
Sound_Delete ( SND_RADAR_2Hz );
Sound_Delete ( SND_RADAR_4Hz );
Sound_Delete ( SND_RADAR_CONTINUOUS );
}
break;
case SND_FASTEN_SEATBELT :
if ( PopupSeatBeltDrReq == 1 )
Sound_Request ( SND_FASTEN_SEATBELT_DR_Level_1, ReqCode );
else if ( PopupSeatBeltDrReq == 2 )
Sound_Request ( SND_FASTEN_SEATBELT_DR_Level_2, ReqCode );
else if ( PopupSeatBeltDrReq == 3 )
Sound_Request ( SND_FASTEN_SEATBELT_DR_Level_3, ReqCode );
else
{
Sound_Delete ( SND_FASTEN_SEATBELT_DR_Level_1 );
Sound_Delete ( SND_FASTEN_SEATBELT_DR_Level_2 );
Sound_Delete ( SND_FASTEN_SEATBELT_DR_Level_3 );
}
if ( PopupSeatBeltPaReq == 1 )
Sound_Request ( SND_FASTEN_SEATBELT_PA_Level_1, ReqCode );
else if ( PopupSeatBeltPaReq == 2 )
Sound_Request ( SND_FASTEN_SEATBELT_PA_Level_2, ReqCode );
else if ( PopupSeatBeltPaReq == 3 )
Sound_Request ( SND_FASTEN_SEATBELT_PA_Level_3, ReqCode );
else
{
Sound_Delete ( SND_FASTEN_SEATBELT_PA_Level_1 );
Sound_Delete ( SND_FASTEN_SEATBELT_PA_Level_2 );
Sound_Delete ( SND_FASTEN_SEATBELT_PA_Level_3 );
}
break;
case SND_DOOR_OPEN_HI_SPEED :
case SND_DOOR_OPEN_LOW_SPEED :
if ( ReqCode )
{
if ( WARNING_DOOR_OPEN_SND_EN == 0 )
ReqCode = 0;
Sound_Request ( PopupSnd, ReqCode );
}
else
Sound_Delete ( PopupSnd );
break;
*/
default:
if ( ReqCode )
Sound_Request(PopupSnd, ReqCode);
......
source/Application/Alarm/Popups.h
View file @ bc1ecddc
......@@ -4,10 +4,6 @@
#define _POPUPS_H_
#include "Popup_Scheduler.h"
/*#include "Sound_Scheduler.h"*/
/*#include "Sound_Player.h"*/
#include "CAN_Lib.h"
#define POPUP_UNIT_FL 0x01
......@@ -19,11 +15,13 @@
typedef struct
{
uint8_t Backup;
uint8_t Cnt;
}GUIRadarFlashCtrlStruct;
void GUI_RADAR_Sys_Failure_Flash_Reset(void);
uint8_t Backup;
uint8_t Cnt;
} GUIRadarFlashCtrlStruct;
void Popups_Management_Service ( void );
void Popups_Polling ( void );
extern uint8_t Get_wbyPopupTest(void);
void Popups_Displaying ( uint8_t PopupID );
void Popups_Sound_Playing ( uint8_t PopupID );
#endif
\ No newline at end of file
source/Application/Graphic/GUI/GUI.c
View file @ bc1ecddc
......@@ -26,6 +26,9 @@
#include "key.h"
#include "Data_Voltmeter.h"
#include "Data_AirPressure.h"
#include "Popup_Message_List.h"
#include "Popup_Scheduler.h"
#include "Popups.h"
uint32_t HYQ_TEST = 3;
......@@ -238,7 +241,7 @@ void GUI_OftenShow_Display(void)
/*-------------------------------------------------------------------------
* Function Name : GUI_Dynamic_DIsplay
* Description : 常显界面
* Description :
* Input : None
* Output : None
* Return : None
......@@ -5880,3 +5883,57 @@ void Common_EOL_User_Server(void)
}
/******************************************************************************
GUI_General_Popup
功 能：
参 数：
返回值：无
******************************************************************************/
void GUI_General_Popup(void)
{
uint16_t PopupMsg = 0u;
uint8_t PopupSnd = 0u;
PopupMsg = Popup_Get_Current_Message();
PopupSnd = Popup_Get_Current_Sound();
GUI_OftenShow_Display();
Popups_Displaying(PopupMsg);
Popups_Sound_Playing(PopupSnd);
}
/******************************************************************************
函数名：GUI_General_Popup_Display
功 能：通用弹出信息显示程序
参 数：PopupID：弹出信息名称
返回值：无
******************************************************************************/
void GUI_General_Popup_Display(uint16_t PopupMsg)
{
uint16_t V_Speed = 0u;
//if (PopupMsg >= POPUP_MSG_NUMBER_TOTAL)
//{
// return;
//}
V_Speed = Common_Get_Act_V_Speed();
if (V_Speed > 66u) /*有车速*/
{
GUI_General_Display(MultiPurpose_Sprite, CN_Alarm_01_image, GUI_BLENDMODE_SRC_OVER); /*红*/
//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);
}
else
{
GUI_General_Display(MultiPurpose_Sprite, CN_Alarm_01_image, GUI_BLENDMODE_SRC_OVER); /*红*/
//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);
}
}
\ No newline at end of file
source/Application/Graphic/GUI/GUI.h
View file @ bc1ecddc
......@@ -138,6 +138,123 @@ typedef struct
} _TPMS;
extern _TPMS TPMS_Matching;
/******************************************************************************
报警
******************************************************************************/
typedef struct
{
uint16_t PICIcon;
uint16_t HImageCN1;
uint16_t HImageCN2;
uint16_t HImageCN3;
uint16_t HImageCN4;
} GUIGeneralPopupStruct;
/*************************************************************************************************************
报警显示表
*************************************************************************************************************/
static const GUIGeneralPopupStruct GUIGeneralPopupTable[] =
{
/*----图标--------有车速--------------------------------无车速--------------*/ /* 第一组*/
{SpriteSize , CN_Alarm_01_wenzi1 , SpriteSize, CN_Alarm_01_wenzi1 , SpriteSize}, /*00.紧急警报-刹车*/
{SpriteSize , CN_Alarm_01_wenzi4 , SpriteSize, CN_Alarm_01_wenzi4 , SpriteSize}, /*01.紧急警报-紧急制动*/
{SpriteSize , CN_Alarm_01_wenzi2 , SpriteSize, CN_Alarm_01_wenzi2 , SpriteSize}, /*02.车间距警报-刹车(红字)*/
{SpriteSize , CN_Alarm_01_wenzi5 , SpriteSize, CN_Alarm_01_wenzi5 , SpriteSize}, /*03.车间距警报-碰撞报警*/
{SpriteSize , CN_Alarm_01_wenzi3 , SpriteSize, CN_Alarm_01_wenzi3 , SpriteSize}, /*04.车间距警报-刹车(黄字)*/
{CN_Alarm_drive_04_image, CN_Alarm_drive_04_wenzi, SpriteSize, CN_Alarm_drive_04_wenzi, SpriteSize}, /*05.ASR工作*/
{CN_Alarm_drive_05_image, CN_Alarm_drive_05_wenzi, SpriteSize, SpriteSize , SpriteSize}, /*06.PTO紧急警报-刹车*/
{CN_Alarm_drive_06_image, CN_Alarm_drive_06_wenzi, SpriteSize, SpriteSize , SpriteSize}, /*07.忘记松手刹车*/
{CN_Alarm_drive_10_image, CN_Alarm_drive_10_wenzi, SpriteSize, SpriteSize , SpriteSize}, /*08.遥控调整车辆高度(有车速)*/
{0, 0, 0, 0, 0}, /*09.自动巡航模式*/
{0, 0, 0, 0, 0}, /*10.可变SLD 模式*/
{0, 0, 0, 0, 0}, /*11.充电异常（系统检测）*/
{0, 0, 0, 0, 0}, /*12.油压（系统检测）*/
{0, 0, 0, 0, 0}, /*13.AMT初始化异常*/
{0, 0, 0, 0, 0}, /*14.尿素品质异常（系统检测）*/
{0, 0, 0, 0, 0}, /*15.尿素喷射异常（系统检测）*/
{0, 0, 0, 0, 0}, /*16.尿素水补给（系统检测）*/
{0, 0, 0, 0, 0}, /*17.AMT初始化结束*/
{0, 0, 0, 0, 0}, /*18.DPD自动再生*/
{0, 0, 0, 0, 0}, /*19.过热（过热，请在安全的场所停车）*/
{0, 0, 0, 0, 0}, /*20.过热（冷却液温度过高）*/
{0, 0, 0, 0, 0}, /*21.冷却水（冷却液不足）*/
{0, 0, 0, 0, 0}, /*22.冷却水（冷却水不足）*/
{0, 0, 0, 0, 0}, /*23.油压(机油)请在安全场所停车*/
{0, 0, 0, 0, 0}, /*24.油压异常*/
{0, 0, 0, 0, 0}, /*25.仪表故障-请在安全场所停车*/
{0, 0, 0, 0, 0}, /*26.仪表故障-请与五十铃公司联系*/
{0, 0, 0, 0, 0}, /*27.通信系统-请在安全场所停车*/
{0, 0, 0, 0, 0}, /*28.通信系统-请与五十铃公司联系*/
{0, 0, 0, 0, 0}, /*29.车速限制-图1*/
{0, 0, 0, 0, 0}, /*30.车速限制-图2*/
{0, 0, 0, 0, 0}, /*31.扭矩限制-图1*/
{0, 0, 0, 0, 0}, /*32.扭矩限制-图2*/
{0, 0, 0, 0, 0}, /*33.扭矩限制、车速限制 交互 显示-->扭矩限制*/
{0, 0, 0, 0, 0}, /*34.尿素品质异常-图1*/
{0, 0, 0, 0, 0}, /*35.尿素品质异常-图2*/
{0, 0, 0, 0, 0}, /*36.临界排放故障-图1*/
{0, 0, 0, 0, 0}, /*37.临界排放故障-图2*/
{0, 0, 0, 0, 0}, /*38.AMT异常-图1*/
{0, 0, 0, 0, 0}, /*39.AMT异常-请重启发动机*/
{0, 0, 0, 0, 0}, /*40.AMT异常(气压低下)-图1*/
{0, 0, 0, 0, 0}, /*41.AMT异常(气压低下)-图2*/
{0, 0, 0, 0, 0}, /*42.低圧警報-轮胎漏气警告*/
{0, 0, 0, 0, 0}, /*43.同——44*/
{0, 0, 0, 0, 0}, /*44.尿素补给-补充尿素溶液-图1*/
{0, 0, 0, 0, 0}, /*45.尿素补给-补充尿素溶液-图2*/
{0, 0, 0, 0, 0}, /*46.尿素余量少-有车速-图1*/
{0, 0, 0, 0, 0}, /*47.尿素余量少-无车速-图2*/
{0, 0, 0, 0, 0}, /*48.低圧警報（低下）*/
{0, 0, 0, 0, 0}, /*49.同——50*/
{0, 0, 0, 0, 0}, /*50.摄像头有污染-图1*/
{0, 0, 0, 0, 0}, /*51.摄像头有污染-请与五十铃公司联系*/
{0, 0, 0, 0, 0}, /*52.尿素喷射异常（停止）-图1*/
{0, 0, 0, 0, 0}, /*53.尿素喷射异常（停止）-图2*/
{0, 0, 0, 0, 0}, /*54.尿素喷射异常（消耗量）-图1*/
{0, 0, 0, 0, 0}, /*55.尿素喷射异常（消耗量）-图2*/
{0, 0, 0, 0, 0}, /*56.高圧警報-轮胎高压警告*/
{0, 0, 0, 0, 0}, /*57.高温警報-轮胎高温警告*/
{0, 0, 0, 0, 0}, /*58.尿素喷射异常(停止、消耗量)交互显示*/
{0, 0, 0, 0, 0}, /*59.DPD手动再生要求1-DPD需要再生*/
{0, 0, 0, 0, 0}, /*60.DPD手动再生要求1-请按下DPD开关*/
{0, 0, 0, 0, 0}, /*61.DPD手动再生要求2-DPD需要再生*/
{0, 0, 0, 0, 0}, /*62.DPD手动再生要求2-请按下DPD开关*/
{0, 0, 0, 0, 0}, /*63.TPMS故障-轮胎监控失败*/
{0, 0, 0, 0, 0}, /*64.TPMS電池低下-轮胎监控传感器电压下降*/
{0, 0, 0, 0, 0}, /*65.DPD手动再生中*/
{0, 0, 0, 0, 0}, /*66.遥控车辆高度调整中(无车速)*/
{0, 0, 0, 0, 0}, /*67.PTO(停车中)*/
{0, 0, 0, 0, 0}, /*68.充电异常-请在安全的场所停车*/
{0, 0, 0, 0, 0}, /*69.充电异常-请与五十铃公司联系*/
{0, 0, 0, 0, 0}, /*70.AMT異常-AMT异常*/
{0, 0, 0, 0, 0}, /*71.AMT異常-请联系经销商*/
{0, 0, 0, 0, 0}, /*72.补充燃料-油箱单位*/
{0, 0, 0, 0, 0}, /*73.过热-离合器过载*/
{0, 0, 0, 0, 0}, /*74.过热-选择合适的档位*/
{0, 0, 0, 0, 0}, /*75.AMT磨耗-离合器磨损*/
{0, 0, 0, 0, 0}, /*76.低电压报警*/
{0, 0, 0, 0, 0}, /*77.过电压报警*/
{0, 0, 0, 0, 0}, /*78.DPD自动再生-DPD自动再生中*/
{0, 0, 0, 0, 0}, /*79.DPD自动再生-再生将自动完成，不需要操作开关*/
{0, 0, 0, 0, 0}, /*80.气压过低-气压过低请注意*/
{0, 0, 0, 0, 0}, /*81.气压过低-请冲入空气*/
{0, 0, 0, 0, 0}, /*82.EBS故障（红）-请在安全的场所停车*/
{0, 0, 0, 0, 0}, /*83.EBS故障（红）-请与五十铃公司联系*/
{0, 0, 0, 0, 0}, /*84.省油耗建议-急加速*/
{0, 0, 0, 0, 0}, /*85.省油耗建议-急减速*/
{0, 0, 0, 0, 0}, /*86.省油耗建议-请降低发动机转速*/
{0, 0, 0, 0, 0}, /*87.省油耗建议-请降低速度*/
{0, 0, 0, 0, 0}, /*88.发动机机油＆滤清器*/
{0, 0, 0, 0, 0}, /*89.燃油滤清器*/
{0, 0, 0, 0, 0}, /*90.变速箱油*/
{0, 0, 0, 0, 0}, /*91.差速器油*/
{0, 0, 0, 0, 0}, /*92.顺畅系统离合器油*/
{0, 0, 0, 0, 0}, /*93.动力转向液*/
{0, 0, 0, 0, 0}, /*94.更换轮胎・轮胎位置*/
};
static const uint32_t GUIWedk[7u] = {CN_xingqiri, CN_xingqiyi, CN_xingqier, CN_xingqisan, CN_xingqisi, CN_xingqiwu, CN_xingqiliu};
static const uint32_t GUIMenuWedk[7u] = {CN_ri, CN_Mon, CN_Tue, CN_Wed, CN_Thu, CN_Fri, CN_Sat};
static const uint32_t GUIGear[12u] = {CN_dangwei_1, CN_dangwei_2, CN_dangwei_3, CN_dangwei_4, CN_dangwei_5, CN_dangwei_6, CN_dangwei_7, CN_dangwei_8, CN_dangwei_9, CN_dangwei_10, CN_dangwei_11, CN_dangwei_12};
......@@ -307,4 +424,8 @@ void GUI_BG_Enter_Return_Display(uint8_t Mode); /**/
void Common_EOL_User_Server(void);
/*-----报警--------------------------------------------------------*/
void GUI_General_Popup(void);
void GUI_General_Popup_Display(uint16_t PopupMsg);
#endif
\ No newline at end of file
source/Application/Graphic/UE/DisplaySch_user.c
View file @ bc1ecddc
......@@ -81,10 +81,7 @@ void DisplayServices(void)
}
else
{
//if (DisplayIdx < MENU_ITEM_PassWord_1)
{
popupID = Popup_Get_Current_Message( );
}
popupID = Popup_Get_Current_Message( );
if ( popupID != 0xffffu )
{
......@@ -93,6 +90,7 @@ void DisplayServices(void)
else
{
UE_EN [ Display_Alarm ] = UE_Disable;
if ( PowerStatus == COMMON_POWER_ON )
{
UE_EN [ Display_Menu ] = UE_Enable;
......@@ -202,6 +200,10 @@ void Display_AlarmService(void)
void GUI_DisplayServices(void)
{
UElib_uint16_t HMI_MENU_Sta = 0u;
HMI_MENU_Sta = Get_Cur_HMI();
if (BG_display_flag == 0)
{
BG_display_flag = 1;
......@@ -210,25 +212,40 @@ void GUI_DisplayServices(void)
}
else
{
if ((bCurMenuIDX > _MN_DSP_LEVEPOPUP) && (bCurMenuIDX < _MN_DSP_LEVEL3_5_MENU_1))
if (HMI_MENU_Sta == Display_Alarm)
{
loc_Del_Sprite(ADAS_Sprite, Gear_Sprite);
if (Common_Get_window_Sta() != 0u)
loc_Del_Sprite(MENU_Sprite, MENU_Sprite);
if (Common_Get_window_Sta() != 1u)
{
JCUA_Disable_window();
JCUA_Enable_window();
}
GUI_General_Popup();
GUI_Dynamic_DIsplay();
}
else
{
loc_Del_Sprite(MENU_Sprite, MENU_Sprite);
if (Common_Get_window_Sta() != 1u)
if ((bCurMenuIDX > _MN_DSP_LEVEPOPUP) && (bCurMenuIDX < _MN_DSP_LEVEL3_5_MENU_1))
{
JCUA_Enable_window();
loc_Del_Sprite(ADAS_Sprite, Gear_Sprite);
if (Common_Get_window_Sta() != 0u)
{
JCUA_Disable_window();
}
}
else
{
loc_Del_Sprite(MENU_Sprite, MENU_Sprite);
if (Common_Get_window_Sta() != 1u)
{
JCUA_Enable_window();
}
}
}
MenuManage();
//BG_display_flag = 0;
MenuManage();
//BG_display_flag = 0;
}
}
}
......
source/Driver/Graphic/han00002ce20.h
View file @ bc1ecddc
This diff is collapsed.
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