Skip to content

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

调整胎压显示相关

parent f7898c9f
Hide whitespace changes
Inline Side-by-side
Showing with 23200 additions and 23139 deletions
ghs/project
View file @ 649b6b58
No preview for this file type
ghs/project.hex
View file @ 649b6b58
This source diff could not be displayed because it is too large. You can view the blob instead.
ghs/project.siz
View file @ 649b6b58
project .intvect 1536 project .intvect 1536
project .text 311500 project .text 311836
project .rodata 410815 project .rodata 410815
project .secinfo 120 project .secinfo 120
project .syscall 6 project .syscall 6
......
source/Application/APP/Data_TPMS/Service_TPMS.c
View file @ 649b6b58
...@@ -403,17 +403,6 @@ uint8_t Get_DataTPMS_Lowpressure_Value(TPMSNUM_t TPMSTyreID) ...@@ -403,17 +403,6 @@ uint8_t Get_DataTPMS_Lowpressure_Value(TPMSNUM_t TPMSTyreID)
return (uint8_t)Lowpressure_Value ; return (uint8_t)Lowpressure_Value ;
} }
/******************************************************************************
Function：
Description：获取某个编号轮胎传感器故障信息
Input:输入枚举编号
Output:
******************************************************************************/
uint8_t Get_DataTPMS_SensorErrorWarningSig_Value(TPMSNUM_t TPMSTyreID)
{
return (uint8_t)TPMS_Out[TPMSTyreID].TPMSSensorfault ;
}
/****************************************************************************** /******************************************************************************
Function： Function：
Description：获取某个编号轮胎轮胎被盗报警信号 Description：获取某个编号轮胎轮胎被盗报警信号
...@@ -425,17 +414,6 @@ uint8_t Get_DataTPMS_TyresLostWarningSig_Value(TPMSNUM_t TPMSTyreID) ...@@ -425,17 +414,6 @@ uint8_t Get_DataTPMS_TyresLostWarningSig_Value(TPMSNUM_t TPMSTyreID)
//return (uint8_t)TPMS_Out[TPMSTyreID].TPMSLostWarningSig ; //return (uint8_t)TPMS_Out[TPMSTyreID].TPMSLostWarningSig ;
} }
/******************************************************************************
Function：
Description：获取某个编号轮胎低气压报警
Input:输入枚举编号
Output:
******************************************************************************/
uint8_t Get_DataTPMS_SensorVoltWarningSig_Value(TPMSNUM_t TPMSTyreID)
{
return (uint8_t)TPMS_Out[TPMSTyreID].TPMSLowpressure ;
}
/****************************************************************************** /******************************************************************************
Function： Function：
Description：获取某个编号轮胎标准温度设置状态 Description：获取某个编号轮胎标准温度设置状态
...@@ -447,28 +425,6 @@ uint8_t Get_DataTPMS_TireStandarTemperatureSettingSts_Value(TPMSNUM_t TPMSTyreID ...@@ -447,28 +425,6 @@ uint8_t Get_DataTPMS_TireStandarTemperatureSettingSts_Value(TPMSNUM_t TPMSTyreID
return (uint8_t)TPMS_Out[TPMSTyreID].TPMSStandarTempSetSts ; return (uint8_t)TPMS_Out[TPMSTyreID].TPMSStandarTempSetSts ;
} }
/******************************************************************************
Function：
Description：获取某个编号轮胎快速漏气报警
Input:输入枚举编号
Output:
******************************************************************************/
uint8_t Get_DataTPMS_RapidLeakWarningSig_Value(TPMSNUM_t TPMSTyreID)
{
return (uint8_t)TPMS_Out[TPMSTyreID].TPMSRapidleakage ;
}
/******************************************************************************
Function：
Description：获取某个编号轮胎高温报警
Input:输入枚举编号
Output:
******************************************************************************/
uint8_t Get_DataTPMS_TyreTempWarningSig_Value(TPMSNUM_t TPMSTyreID)
{
return (uint8_t)TPMS_Out[TPMSTyreID].TPMSHightemperature ;
}
/****************************************************************************** /******************************************************************************
Function： Function：
Description：获取某个编号轮胎短时无信号 Description：获取某个编号轮胎短时无信号
...@@ -584,3 +540,98 @@ uint8_t Get_PairSuccess(TPMSNUM_t TPMSTyreID) ...@@ -584,3 +540,98 @@ uint8_t Get_PairSuccess(TPMSNUM_t TPMSTyreID)
} }
/******************************************************************************
Function：
Description：获取某个编号轮胎低气压报警
Input:输入枚举编号
Output:
******************************************************************************/
uint8_t Get_TPMSLowpressure_Sta(TPMSNUM_t TPMSTyreID)
{
return (uint8_t)TPMS_Out[TPMSTyreID].TPMSLowpressure ;
}
/******************************************************************************
Function：
Description：获取某个编号轮胎高气压报警
Input:输入枚举编号
Output:
******************************************************************************/
uint8_t Get_TPMSHighpressure_Sta(TPMSNUM_t TPMSTyreID)
{
return (uint8_t)TPMS_Out[TPMSTyreID].TPMSHighpressure ;
}
/******************************************************************************
Function：
Description：获取某个编号轮胎快速漏气报警
Input:输入枚举编号
Output:
******************************************************************************/
uint8_t Get_DataTPMS_RapidLeakWarningSig_Value(TPMSNUM_t TPMSTyreID)
{
return (uint8_t)TPMS_Out[TPMSTyreID].TPMSRapidleakage ;
}
/******************************************************************************
Function：
Description：获取某个编号轮胎高温报警
Input:输入枚举编号
Output:
******************************************************************************/
uint8_t Get_DataTPMS_TyreTempWarningSig_Value(TPMSNUM_t TPMSTyreID)
{
return (uint8_t)TPMS_Out[TPMSTyreID].TPMSHightemperature ;
}
/******************************************************************************
Function：
Description：获取某个编号轮胎无信号报警
Input:输入枚举编号
Output:
******************************************************************************/
uint8_t Get_TPMSNosignal_Sta(TPMSNUM_t TPMSTyreID)
{
return (uint8_t)TPMS_Out[TPMSTyreID].TPMSNosignal ;
}
/******************************************************************************
Function：
Description：获取某个编号轮胎传感器故障信息 7 8 9
Input:输入枚举编号
Output:
******************************************************************************/
uint8_t Get_DataTPMS_SensorErrorWarningSig_Value(TPMSNUM_t TPMSTyreID)
{
return (uint8_t)TPMS_Out[TPMSTyreID].TPMSSensorfault ;
}
/******************************************************************************
Function：
Description：获取某个编号轮胎压力报警
Input:输入枚举编号
Output:
******************************************************************************/
uint8_t Get_TPMSPresure_Alarm(TPMSNUM_t TPMSTyreID)
{
uint8_t TPMSLowpressure = 0u;
uint8_t TPMSHighpressure = 0u;
uint8_t TPMSRapidleakage = 0u;
uint8_t Ret = 0;
TPMSLowpressure = TPMS_Out[TPMSTyreID].TPMSLowpressure;
TPMSHighpressure = TPMS_Out[TPMSTyreID].TPMSHighpressure;
TPMSRapidleakage = TPMS_Out[TPMSTyreID].TPMSRapidleakage;
if ((TPMSLowpressure == 1u) || (TPMSHighpressure == 1u) || (TPMSRapidleakage == 1u))
{
Ret = 1u;
}
else
{
Ret = 0u;
}
return Ret ;
}
source/Application/APP/Data_TPMS/Service_TPMS.h
View file @ 649b6b58
...@@ -135,13 +135,17 @@ uint8_t Get_DataTPMS_Highpressure_Value(TPMSNUM_t TPMSTyreID); ...@@ -135,13 +135,17 @@ uint8_t Get_DataTPMS_Highpressure_Value(TPMSNUM_t TPMSTyreID);
uint8_t Get_DataTPMS_Lowpressure_Value(TPMSNUM_t TPMSTyreID); uint8_t Get_DataTPMS_Lowpressure_Value(TPMSNUM_t TPMSTyreID);
uint8_t Get_DataTPMS_SensorErrorWarningSig_Value(TPMSNUM_t TPMSTyreID); uint8_t Get_DataTPMS_SensorErrorWarningSig_Value(TPMSNUM_t TPMSTyreID);
uint8_t Get_DataTPMS_TyresLostWarningSig_Value(TPMSNUM_t TPMSTyreID); uint8_t Get_DataTPMS_TyresLostWarningSig_Value(TPMSNUM_t TPMSTyreID);
uint8_t Get_DataTPMS_SensorVoltWarningSig_Value(TPMSNUM_t TPMSTyreID);
uint8_t Get_DataTPMS_TireStandarPressureSettingSts_Value(TPMSNUM_t TPMSTyreID); uint8_t Get_DataTPMS_TireStandarPressureSettingSts_Value(TPMSNUM_t TPMSTyreID);
uint8_t Get_DataTPMS_TireStandarTemperatureSettingSts_Value(TPMSNUM_t TPMSTyreID); uint8_t Get_DataTPMS_TireStandarTemperatureSettingSts_Value(TPMSNUM_t TPMSTyreID);
uint8_t Get_DataTPMS_RapidLeakWarningSig_Value(TPMSNUM_t TPMSTyreID); uint8_t Get_DataTPMS_RapidLeakWarningSig_Value(TPMSNUM_t TPMSTyreID);
uint8_t Get_DataTPMS_TyreTempWarningSig_Value(TPMSNUM_t TPMSTyreID); uint8_t Get_DataTPMS_TyreTempWarningSig_Value(TPMSNUM_t TPMSTyreID);
uint8_t Get_DataTPMS_TemporaryNoSignal_Value(TPMSNUM_t TPMSTyreID); uint8_t Get_DataTPMS_TemporaryNoSignal_Value(TPMSNUM_t TPMSTyreID);
uint8_t Get_TPMSLowpressure_Sta(TPMSNUM_t TPMSTyreID);
uint8_t Get_TPMSHighpressure_Sta(TPMSNUM_t TPMSTyreID);
uint8_t Get_TPMSNosignal_Sta(TPMSNUM_t TPMSTyreID);
uint8_t Get_TPMSPresure_Alarm(TPMSNUM_t TPMSTyreID);
uint8_t Get_DataTPMS_Tyre_Red_Sta(TPMSNUM_t TPMSTyreID); uint8_t Get_DataTPMS_Tyre_Red_Sta(TPMSNUM_t TPMSTyreID);
uint8_t Get_DataTPMS_Tyre_FLASH_Sta(TPMSNUM_t TPMSTyreID); uint8_t Get_DataTPMS_Tyre_FLASH_Sta(TPMSNUM_t TPMSTyreID);
......
source/Application/APP/Telltales/Telltales_user.c
View file @ 649b6b58
...@@ -1158,6 +1158,7 @@ uint8_t LED_TPMS_L_Judgement(void) ...@@ -1158,6 +1158,7 @@ uint8_t LED_TPMS_L_Judgement(void)
m_Condition4 = (uint8_t)Get_ID_18011733_Sig_No_signal_Alarm(); m_Condition4 = (uint8_t)Get_ID_18011733_Sig_No_signal_Alarm();
m_Condition5 = (uint8_t)Get_ID_18011733_Sig_Sensor_fault_information(); m_Condition5 = (uint8_t)Get_ID_18011733_Sig_Sensor_fault_information();
if ((m_Condition1 == 1u) || (m_Condition2 == 1u) || (m_Condition3 == 1u)) if ((m_Condition1 == 1u) || (m_Condition2 == 1u) || (m_Condition3 == 1u))
{ {
u8Result = 1u; u8Result = 1u;
......
source/Application/Graphic/GUI/GUI.c
View file @ 649b6b58
...@@ -24,15 +24,15 @@ ...@@ -24,15 +24,15 @@
#include "Data_Fuel_User.h" #include "Data_Fuel_User.h"
#include "CAN_FUNC.h" #include "CAN_FUNC.h"
#define TRAPA 0u #define TRAPA 0u
#define TRAPB 1u #define TRAPB 1u
uint32_t HYQ_TEST = 3; uint32_t HYQ_TEST = 3;
volatile _Display_State_Flag State_Flag; volatile _Display_State_Flag State_Flag;
_TPMS TPMS_Matching; _TPMS TPMS_Matching;
_UserSet User_set_Num; _UserSet User_set_Num;
_UserSet User_App; _UserSet User_App;
/*------------------------------------------------------------------------- /*-------------------------------------------------------------------------
* Function Name : GUI_Display_KL15_ON_Init * Function Name : GUI_Display_KL15_ON_Init
...@@ -481,12 +481,12 @@ void GUI_AdBlue_Dispaly(uint8_t Mode) ...@@ -481,12 +481,12 @@ void GUI_AdBlue_Dispaly(uint8_t Mode)
GUI_Translate_Display(AdBlue_Sprite, CN_tianlanyezouge_01, (152u + 31u * 0x01u), 450u, GUI_BLENDMODE_SRC_OVER); GUI_Translate_Display(AdBlue_Sprite, CN_tianlanyezouge_01, (152u + 31u * 0x01u), 450u, GUI_BLENDMODE_SRC_OVER);
case 0x02u: case 0x02u:
GUI_General_Display(AdBlue_Sprite, CN_tianlanye, GUI_BLENDMODE_SRC_OVER); /*框*/ GUI_General_Display(AdBlue_Sprite, CN_tianlanye, GUI_BLENDMODE_SRC_OVER); /*框*/
GUI_Translate_Display(AdBlue_Sprite, CN_tianlanyezouge_01, (152u + 31u * 0x00u), 450u, GUI_BLENDMODE_SRC_OVER); GUI_Translate_Display(AdBlue_Sprite, CN_tianlanyezouge_01, (152u + 31u * 0x00u), 450u, GUI_BLENDMODE_SRC_OVER);
break; break;
case 0x01u: case 0x01u:
GUI_General_Display(AdBlue_Sprite, CN_tianlanye, GUI_BLENDMODE_SRC_OVER); /*框*/ GUI_General_Display(AdBlue_Sprite, CN_tianlanye, GUI_BLENDMODE_SRC_OVER); /*框*/
GUI_General_Display(AdBlue_Sprite, SpriteSize, GUI_BLENDMODE_SRC_OVER); GUI_General_Display(AdBlue_Sprite, SpriteSize, GUI_BLENDMODE_SRC_OVER);
break; break;
...@@ -624,9 +624,9 @@ void Gui_ADAS_Display(uint8_t Mode) ...@@ -624,9 +624,9 @@ void Gui_ADAS_Display(uint8_t Mode)
{ {
if (K_Line_Set.K_Line_LID28 == 0x01) if (K_Line_Set.K_Line_LID28 == 0x01)
{ {
CanStatusA1 = CAN_MSG_Status(ID_CanMsg0CF02FA1_Msg_Count); CanStatusA1 = CAN_MSG_Status(ID_CanMsg0CF02FA1_Msg_Count);
CanStatus2A = CAN_MSG_Status(ID_CanMsg0CF02F2A_Msg_Count); CanStatus2A = CAN_MSG_Status(ID_CanMsg0CF02F2A_Msg_Count);
CanStatusA0 = CAN_MSG_Status(ID_CanMsg0CF02FA0_Msg_Count); CanStatusA0 = CAN_MSG_Status(ID_CanMsg0CF02FA0_Msg_Count);
if ((CanStatusA1 == CAN_SIG_LOST) && (CanStatus2A == CAN_SIG_LOST) && (CanStatusA0 == CAN_SIG_LOST)) if ((CanStatusA1 == CAN_SIG_LOST) && (CanStatus2A == CAN_SIG_LOST) && (CanStatusA0 == CAN_SIG_LOST))
{ {
...@@ -651,8 +651,8 @@ void Gui_ADAS_Display(uint8_t Mode) ...@@ -651,8 +651,8 @@ void Gui_ADAS_Display(uint8_t Mode)
GUI_General_Display(ADAS_Sprite, CN_jiao4, GUI_BLENDMODE_SRC_OVER); GUI_General_Display(ADAS_Sprite, CN_jiao4, GUI_BLENDMODE_SRC_OVER);
if ((((Sys_Sta_A1 == 0u) || (Sys_Sta_A1 == 4u)) && (CanStatusA1 == CAN_SIG_NORMAL)) || if ((((Sys_Sta_A1 == 0u) || (Sys_Sta_A1 == 4u)) && (CanStatusA1 == CAN_SIG_NORMAL)) ||
(((Sys_Sta_2A == 0u) || (Sys_Sta_2A == 4u)) && (CanStatus2A == CAN_SIG_NORMAL)) || (((Sys_Sta_2A == 0u) || (Sys_Sta_2A == 4u)) && (CanStatus2A == CAN_SIG_NORMAL)) ||
(((Sys_Sta_A0 == 0u) || (Sys_Sta_A0 == 4u)) && (CanStatusA0 == CAN_SIG_NORMAL))) (((Sys_Sta_A0 == 0u) || (Sys_Sta_A0 == 4u)) && (CanStatusA0 == CAN_SIG_NORMAL)))
{ {
if (FLASH_SYNC_1Hz) if (FLASH_SYNC_1Hz)
{ {
...@@ -774,7 +774,7 @@ void Gui_ADAS_Display(uint8_t Mode) ...@@ -774,7 +774,7 @@ void Gui_ADAS_Display(uint8_t Mode)
if (FLASH_SYNC_2_5_Hz == 1u) if (FLASH_SYNC_2_5_Hz == 1u)
{ {
GUI_Translate_Display(ADAS_Sprite, CN_tanhao1, 125u, 257u, GUI_BLENDMODE_CUSTOM);/*左叹号*/ GUI_Translate_Display(ADAS_Sprite, CN_tanhao1, 125u, 257u, GUI_BLENDMODE_CUSTOM); /*左叹号*/
} }
else else
{ {
...@@ -843,7 +843,7 @@ void Gui_DrivingSupport_Display(uint8_t Mode) ...@@ -843,7 +843,7 @@ void Gui_DrivingSupport_Display(uint8_t Mode)
{ {
/*定速巡航图标*/ /*定速巡航图标*/
VariableSLD_Status = Get_ID_18FF4100_Sig_Cruise_VariableSLD_Cont_Staus(); /*3-5*/ VariableSLD_Status = Get_ID_18FF4100_Sig_Cruise_VariableSLD_Cont_Staus(); /*3-5*/
VariableSLD_Disp = Get_ID_18FF4100_Sig_Cruise_VariableSLD_Disp();/*6-8*/ VariableSLD_Disp = Get_ID_18FF4100_Sig_Cruise_VariableSLD_Disp(); /*6-8*/
if ((VariableSLD_Disp == 1u) && (K_Line_Set.K_Line_LID29 == 0x01)) if ((VariableSLD_Disp == 1u) && (K_Line_Set.K_Line_LID29 == 0x01))
{ {
...@@ -1125,15 +1125,15 @@ void GUI_Drive_Info_Avg_Speed_Display(uint16_t Speed) ...@@ -1125,15 +1125,15 @@ void GUI_Drive_Info_Avg_Speed_Display(uint16_t Speed)
/*单位切换*/ /*单位切换*/
if (1) if (1)
{ {
GUI_General_Display(MultiPurpose_Sprite, CN_PJchesu_kmh, GUI_BLENDMODE_SRC_OVER);/*km/H*/ GUI_General_Display(MultiPurpose_Sprite, CN_PJchesu_kmh, GUI_BLENDMODE_SRC_OVER); /*km/H*/
} }
else else
{ {
if (Speed == TRAPB) /*Trip B*/ if (Speed == TRAPB) /*Trip B*/
{ {
GUI_General_Display(MultiPurpose_Sprite, CN_PJchesu_kmh, GUI_BLENDMODE_SRC_OVER); /*MPH*/ GUI_General_Display(MultiPurpose_Sprite, CN_PJchesu_kmh, GUI_BLENDMODE_SRC_OVER); /*MPH*/
} }
else /*Trip A ODO*/ else /*Trip A ODO*/
{ {
GUI_General_Display(MultiPurpose_Sprite, CN_PJchesu_kmh, GUI_BLENDMODE_SRC_OVER); /*MPH*/ GUI_General_Display(MultiPurpose_Sprite, CN_PJchesu_kmh, GUI_BLENDMODE_SRC_OVER); /*MPH*/
} }
...@@ -1142,11 +1142,11 @@ void GUI_Drive_Info_Avg_Speed_Display(uint16_t Speed) ...@@ -1142,11 +1142,11 @@ void GUI_Drive_Info_Avg_Speed_Display(uint16_t Speed)
/*单位切换*/ /*单位切换*/
if (1) if (1)
{ {
if (Speed == TRAPB) /*Trip B*/ if (Speed == TRAPB) /*Trip B*/
{ {
Average_Speed = Common_Data_Get_TripB_Average_Speed(); Average_Speed = Common_Data_Get_TripB_Average_Speed();
if (Average_Speed < 1000u ) if (Average_Speed < 1000u)
{ {
GUI_General_Digit_Display(MultiPurpose_Sprite, (Average_Speed / 10u), Nb_21_0, 4u, 3u, GUIBGAVGSpeedPosX, 305u, GUI_BLENDMODE_SRC_OVER); GUI_General_Digit_Display(MultiPurpose_Sprite, (Average_Speed / 10u), Nb_21_0, 4u, 3u, GUIBGAVGSpeedPosX, 305u, GUI_BLENDMODE_SRC_OVER);
} }
...@@ -1160,7 +1160,7 @@ void GUI_Drive_Info_Avg_Speed_Display(uint16_t Speed) ...@@ -1160,7 +1160,7 @@ void GUI_Drive_Info_Avg_Speed_Display(uint16_t Speed)
{ {
Average_Speed = Common_Data_Get_TripA_Average_Speed(); Average_Speed = Common_Data_Get_TripA_Average_Speed();
if (Average_Speed < 1000u ) if (Average_Speed < 1000u)
{ {
GUI_General_Digit_Display(MultiPurpose_Sprite, (Average_Speed / 10u), Nb_21_0, 4u, 3u, GUIBGAVGSpeedPosX, 305u, GUI_BLENDMODE_SRC_OVER); GUI_General_Digit_Display(MultiPurpose_Sprite, (Average_Speed / 10u), Nb_21_0, 4u, 3u, GUIBGAVGSpeedPosX, 305u, GUI_BLENDMODE_SRC_OVER);
} }
...@@ -1169,7 +1169,6 @@ void GUI_Drive_Info_Avg_Speed_Display(uint16_t Speed) ...@@ -1169,7 +1169,6 @@ void GUI_Drive_Info_Avg_Speed_Display(uint16_t Speed)
GUI_Translate_Display(MultiPurpose_Sprite, Nb_21_hengxian, 667u, 305u, GUI_BLENDMODE_CUSTOM); GUI_Translate_Display(MultiPurpose_Sprite, Nb_21_hengxian, 667u, 305u, GUI_BLENDMODE_CUSTOM);
GUI_Translate_Display(MultiPurpose_Sprite, Nb_21_hengxian, 642u, 305u, GUI_BLENDMODE_CUSTOM); GUI_Translate_Display(MultiPurpose_Sprite, Nb_21_hengxian, 642u, 305u, GUI_BLENDMODE_CUSTOM);
} }
} }
} }
else else
...@@ -1202,17 +1201,17 @@ void GUI_Drive_Info_Avg_Fuel_Display(uint16_t Fuel) ...@@ -1202,17 +1201,17 @@ void GUI_Drive_Info_Avg_Fuel_Display(uint16_t Fuel)
/*单位切换*/ /*单位切换*/
if (1) if (1)
{ {
GUI_General_Display(MultiPurpose_Sprite, CN_PJyouhao_L100km, GUI_BLENDMODE_SRC_OVER); /*L/km*/ GUI_General_Display(MultiPurpose_Sprite, CN_PJyouhao_L100km, GUI_BLENDMODE_SRC_OVER); /*L/km*/
} }
else else
{ {
if (Fuel == TRAPB) /*Trip B*/ if (Fuel == TRAPB) /*Trip B*/
{ {
GUI_General_Display(MultiPurpose_Sprite, CN_PJyouhao_L100km, GUI_BLENDMODE_SRC_OVER); /*MPG*/ GUI_General_Display(MultiPurpose_Sprite, CN_PJyouhao_L100km, GUI_BLENDMODE_SRC_OVER); /*MPG*/
} }
else /*Trip A ODO*/ else /*Trip A ODO*/
{ {
GUI_General_Display(MultiPurpose_Sprite, CN_PJyouhao_L100km, GUI_BLENDMODE_SRC_OVER); /*L/m*/ GUI_General_Display(MultiPurpose_Sprite, CN_PJyouhao_L100km, GUI_BLENDMODE_SRC_OVER); /*L/m*/
} }
} }
...@@ -1220,7 +1219,7 @@ void GUI_Drive_Info_Avg_Fuel_Display(uint16_t Fuel) ...@@ -1220,7 +1219,7 @@ void GUI_Drive_Info_Avg_Fuel_Display(uint16_t Fuel)
if (1) if (1)
{ {
if (Fuel == TRAPB) /*Trip B*/ if (Fuel == TRAPB) /*Trip B*/
{ {
AVGFuel = Common_Data_Get_TripB_Fuel(); AVGFuel = Common_Data_Get_TripB_Fuel();
...@@ -1253,7 +1252,7 @@ void GUI_Drive_Info_Avg_Fuel_Display(uint16_t Fuel) ...@@ -1253,7 +1252,7 @@ void GUI_Drive_Info_Avg_Fuel_Display(uint16_t Fuel)
} }
else else
{ {
if (Fuel == TRAPB) /*Trip B 系数1.069*/ if (Fuel == TRAPB) /*Trip B 系数1.069*/
{ {
AVGFuel = Common_Data_Get_TripB_Fuel(); AVGFuel = Common_Data_Get_TripB_Fuel();
...@@ -1268,7 +1267,7 @@ void GUI_Drive_Info_Avg_Fuel_Display(uint16_t Fuel) ...@@ -1268,7 +1267,7 @@ void GUI_Drive_Info_Avg_Fuel_Display(uint16_t Fuel)
GUI_Translate_Display(MultiPurpose_Sprite, Nb_21_hengxian, 667u, 262u, GUI_BLENDMODE_CUSTOM); GUI_Translate_Display(MultiPurpose_Sprite, Nb_21_hengxian, 667u, 262u, GUI_BLENDMODE_CUSTOM);
} }
} }
else /*Trip A ODO */ else /*Trip A ODO */
{ {
AVGFuel = Common_Data_Get_TripA_Fuel(); AVGFuel = Common_Data_Get_TripA_Fuel();
...@@ -1365,7 +1364,7 @@ void GUI_DPD_Display_Display(uint8_t Mode) ...@@ -1365,7 +1364,7 @@ void GUI_DPD_Display_Display(uint8_t Mode)
{ {
value = Get_ID_18FED900_Sig_DPF_storage(); value = Get_ID_18FED900_Sig_DPF_storage();
value = value * 20u / 5u; value = value * 20u / 5u;
//Get_ID_18FED900_Sig_DPF_Regeneration_Status();/*8 4-5*/ // Get_ID_18FED900_Sig_DPF_Regeneration_Status();/*8 4-5*/
if (1) if (1)
{ {
GUI_General_Display(MultiPurpose_Sprite, CN_DPD_duijiliang, GUI_BLENDMODE_SRC_OVER); /*DPD堆积绿*/ GUI_General_Display(MultiPurpose_Sprite, CN_DPD_duijiliang, GUI_BLENDMODE_SRC_OVER); /*DPD堆积绿*/
...@@ -1614,7 +1613,7 @@ void GUI_block_NULL_Display(uint8_t Mode) ...@@ -1614,7 +1613,7 @@ void GUI_block_NULL_Display(uint8_t Mode)
{ {
if (Mode == GUI_DISP_MODE_NORMAL) if (Mode == GUI_DISP_MODE_NORMAL)
{ {
//GUI_Translate_Display(MultiPurpose_Sprite, Nb_12_dian, 801u, 481u, GUI_BLENDMODE_CUSTOM); // GUI_Translate_Display(MultiPurpose_Sprite, Nb_12_dian, 801u, 481u, GUI_BLENDMODE_CUSTOM);
GUI_General_Display(MultiPurpose_Sprite, SpriteSize, GUI_BLENDMODE_CUSTOM); GUI_General_Display(MultiPurpose_Sprite, SpriteSize, GUI_BLENDMODE_CUSTOM);
} }
else else
...@@ -2132,19 +2131,19 @@ void GUI_BG_RepSet_Menu_Display(uint8_t Mode) ...@@ -2132,19 +2131,19 @@ void GUI_BG_RepSet_Menu_Display(uint8_t Mode)
GUI_Translate_Display(MENU_Sprite, (CN_User_Menu2_03_04black + State_Flag.WXSD_CSQY), 225u, GUI_DISP_MENU_Y[3u], GUI_BLENDMODE_SRC_OVER); GUI_Translate_Display(MENU_Sprite, (CN_User_Menu2_03_04black + State_Flag.WXSD_CSQY), 225u, GUI_DISP_MENU_Y[3u], GUI_BLENDMODE_SRC_OVER);
} }
} }
else if (bCurMenuIDX == _MN_DSP_LEVEL2_3_MENU_5) else if (bCurMenuIDX == _MN_DSP_LEVEL2_3_MENU_5)
{ {
GUI_Translate_Display(MENU_Sprite, (CN_User_Menu2_03_02black + State_Flag.WXSD_RYLQY), 225u, GUI_DISP_MENU_Y[0u], GUI_BLENDMODE_SRC_OVER); GUI_Translate_Display(MENU_Sprite, (CN_User_Menu2_03_02black + State_Flag.WXSD_RYLQY), 225u, GUI_DISP_MENU_Y[0u], GUI_BLENDMODE_SRC_OVER);
GUI_Translate_Display(MENU_Sprite, (CN_User_Menu2_03_03black + State_Flag.WXSD_BSXY), 225u, GUI_DISP_MENU_Y[1u], GUI_BLENDMODE_SRC_OVER); GUI_Translate_Display(MENU_Sprite, (CN_User_Menu2_03_03black + State_Flag.WXSD_BSXY), 225u, GUI_DISP_MENU_Y[1u], GUI_BLENDMODE_SRC_OVER);
GUI_Translate_Display(MENU_Sprite, (CN_User_Menu2_03_04black + State_Flag.WXSD_CSQY), 225u, GUI_DISP_MENU_Y[2u], GUI_BLENDMODE_SRC_OVER); GUI_Translate_Display(MENU_Sprite, (CN_User_Menu2_03_04black + State_Flag.WXSD_CSQY), 225u, GUI_DISP_MENU_Y[2u], GUI_BLENDMODE_SRC_OVER);
} }
else if (bCurMenuIDX == _MN_DSP_LEVEL2_3_MENU_6) else if (bCurMenuIDX == _MN_DSP_LEVEL2_3_MENU_6)
{ {
GUI_Translate_Display(MENU_Sprite, (CN_User_Menu2_03_03black + State_Flag.WXSD_BSXY), 225u, GUI_DISP_MENU_Y[0u], GUI_BLENDMODE_SRC_OVER); GUI_Translate_Display(MENU_Sprite, (CN_User_Menu2_03_03black + State_Flag.WXSD_BSXY), 225u, GUI_DISP_MENU_Y[0u], GUI_BLENDMODE_SRC_OVER);
GUI_Translate_Display(MENU_Sprite, (CN_User_Menu2_03_04black + State_Flag.WXSD_CSQY), 225u, GUI_DISP_MENU_Y[1u], GUI_BLENDMODE_SRC_OVER); GUI_Translate_Display(MENU_Sprite, (CN_User_Menu2_03_04black + State_Flag.WXSD_CSQY), 225u, GUI_DISP_MENU_Y[1u], GUI_BLENDMODE_SRC_OVER);
GUI_Translate_Display(MENU_Sprite, (CN_User_Menu2_03_05black + State_Flag.WXSD_LHQY), 225u, GUI_DISP_MENU_Y[2u], GUI_BLENDMODE_SRC_OVER); GUI_Translate_Display(MENU_Sprite, (CN_User_Menu2_03_05black + State_Flag.WXSD_LHQY), 225u, GUI_DISP_MENU_Y[2u], GUI_BLENDMODE_SRC_OVER);
} }
else if (bCurMenuIDX == _MN_DSP_LEVEL2_3_MENU_7) else if (bCurMenuIDX == _MN_DSP_LEVEL2_3_MENU_7)
{ {
GUI_Translate_Display(MENU_Sprite, (CN_User_Menu2_03_04black + State_Flag.WXSD_CSQY), 225u, GUI_DISP_MENU_Y[0u], GUI_BLENDMODE_SRC_OVER); GUI_Translate_Display(MENU_Sprite, (CN_User_Menu2_03_04black + State_Flag.WXSD_CSQY), 225u, GUI_DISP_MENU_Y[0u], GUI_BLENDMODE_SRC_OVER);
GUI_Translate_Display(MENU_Sprite, (CN_User_Menu2_03_05black + State_Flag.WXSD_LHQY), 225u, GUI_DISP_MENU_Y[1u], GUI_BLENDMODE_SRC_OVER); GUI_Translate_Display(MENU_Sprite, (CN_User_Menu2_03_05black + State_Flag.WXSD_LHQY), 225u, GUI_DISP_MENU_Y[1u], GUI_BLENDMODE_SRC_OVER);
...@@ -2693,25 +2692,25 @@ void GUI_BG_TPMS_GasPIC_Display(uint8_t Mode) ...@@ -2693,25 +2692,25 @@ void GUI_BG_TPMS_GasPIC_Display(uint8_t Mode)
if (Mode == GUI_DISP_MODE_NORMAL) if (Mode == GUI_DISP_MODE_NORMAL)
{ {
/*低气压-高气压-快速漏气*/ /*低气压-高气压-快速漏气*/
//User_Tpms12 = (); User_Tpms12 = Get_TPMSPresure_Alarm(FirstLOut);
//User_Tpms13 = (); User_Tpms13 = Get_TPMSPresure_Alarm(FirstROut);
//User_Tpms22 = (); User_Tpms22 = Get_TPMSPresure_Alarm(SecondLIn);
//User_Tpms23 = (); User_Tpms23 = Get_TPMSPresure_Alarm(SecondRIn);
//User_Tpms31 = (); User_Tpms31 = Get_TPMSPresure_Alarm(ThirdLOut);
//User_Tpms32 = (); User_Tpms32 = Get_TPMSPresure_Alarm(ThirdLIn);
//User_Tpms33 = (); User_Tpms33 = Get_TPMSPresure_Alarm(ThirdRIn);
//User_Tpms34 = (); User_Tpms34 = Get_TPMSPresure_Alarm(ThirdROut);
//User_Tpms41 = (); User_Tpms41 = Get_TPMSPresure_Alarm(FourthLOut);
//User_Tpms42 = (); User_Tpms42 = Get_TPMSPresure_Alarm(FourthLIn);
//User_Tpms43 = (); User_Tpms43 = Get_TPMSPresure_Alarm(FourthRIn);
//User_Tpms44 = (); User_Tpms44 = Get_TPMSPresure_Alarm(FourthROut);
/*显示*/ /*显示*/
GUI_General_Display(MENU_Sprite, CN_User_Menu3_04_che, GUI_BLENDMODE_SRC_OVER); /*车*/ GUI_General_Display(MENU_Sprite, CN_User_Menu3_04_che, GUI_BLENDMODE_SRC_OVER); /*车*/
GUI_General_Display(MENU_Sprite, CN_User_Menu3_04_kpa, GUI_BLENDMODE_SRC_OVER); /*KPA*/ GUI_General_Display(MENU_Sprite, CN_User_Menu3_04_kpa, GUI_BLENDMODE_SRC_OVER); /*KPA*/
GUI_General_Display(MENU_Sprite, CN_User_Menu3_04_qiya1, GUI_BLENDMODE_SRC_OVER); /*气压*/ GUI_General_Display(MENU_Sprite, CN_User_Menu3_04_qiya1, GUI_BLENDMODE_SRC_OVER); /*气压*/
GUI_General_Display(MENU_Sprite, CN_User_Menu3_04_wendu2, GUI_BLENDMODE_SRC_OVER); /*胎温*/ GUI_General_Display(MENU_Sprite, CN_User_Menu3_04_wendu2, GUI_BLENDMODE_SRC_OVER); /*胎温*/
GUI_General_Display(MENU_Sprite, CN_User_Menu3_04_jiantou1, GUI_BLENDMODE_SRC_OVER); /*箭头*/ GUI_General_Display(MENU_Sprite, CN_User_Menu3_04_jiantou1, GUI_BLENDMODE_SRC_OVER); /*箭头*/
GUI_General_Display(MENU_Sprite, CN_User_Menu3_04_jiantou2, GUI_BLENDMODE_SRC_OVER); /*箭头*/ GUI_General_Display(MENU_Sprite, CN_User_Menu3_04_jiantou2, GUI_BLENDMODE_SRC_OVER); /*箭头*/
...@@ -2722,7 +2721,7 @@ void GUI_BG_TPMS_GasPIC_Display(uint8_t Mode) ...@@ -2722,7 +2721,7 @@ void GUI_BG_TPMS_GasPIC_Display(uint8_t Mode)
} }
else else
{ {
GUI_Translate_Display(MENU_Sprite, CN_User_Menu3_04_luntai, GUI_TPMS_PIC_X[0u], GUI_TPMS_PIC_Y[3u], GUI_BLENDMODE_CUSTOM); GUI_Translate_Display(MENU_Sprite, CN_User_Menu3_04_luntai, GUI_TPMS_PIC_X[0u], GUI_TPMS_PIC_Y[3u], GUI_BLENDMODE_CUSTOM);
} }
/*0x13*/ /*0x13*/
...@@ -2732,7 +2731,7 @@ void GUI_BG_TPMS_GasPIC_Display(uint8_t Mode) ...@@ -2732,7 +2731,7 @@ void GUI_BG_TPMS_GasPIC_Display(uint8_t Mode)
} }
else else
{ {
GUI_Translate_Display(MENU_Sprite, CN_User_Menu3_04_luntai, GUI_TPMS_PIC_X[0u], GUI_TPMS_PIC_Y[0u], GUI_BLENDMODE_CUSTOM); GUI_Translate_Display(MENU_Sprite, CN_User_Menu3_04_luntai, GUI_TPMS_PIC_X[0u], GUI_TPMS_PIC_Y[0u], GUI_BLENDMODE_CUSTOM);
} }
/*0x22*/ /*0x22*/
...@@ -2742,7 +2741,7 @@ void GUI_BG_TPMS_GasPIC_Display(uint8_t Mode) ...@@ -2742,7 +2741,7 @@ void GUI_BG_TPMS_GasPIC_Display(uint8_t Mode)
} }
else else
{ {
GUI_Translate_Display(MENU_Sprite, CN_User_Menu3_04_luntai, GUI_TPMS_PIC_X[1u], GUI_TPMS_PIC_Y[3u], GUI_BLENDMODE_CUSTOM); GUI_Translate_Display(MENU_Sprite, CN_User_Menu3_04_luntai, GUI_TPMS_PIC_X[1u], GUI_TPMS_PIC_Y[3u], GUI_BLENDMODE_CUSTOM);
} }
/*0x23*/ /*0x23*/
...@@ -2752,7 +2751,7 @@ void GUI_BG_TPMS_GasPIC_Display(uint8_t Mode) ...@@ -2752,7 +2751,7 @@ void GUI_BG_TPMS_GasPIC_Display(uint8_t Mode)
} }
else else
{ {
GUI_Translate_Display(MENU_Sprite, CN_User_Menu3_04_luntai, GUI_TPMS_PIC_X[1u], GUI_TPMS_PIC_Y[0u], GUI_BLENDMODE_CUSTOM); GUI_Translate_Display(MENU_Sprite, CN_User_Menu3_04_luntai, GUI_TPMS_PIC_X[1u], GUI_TPMS_PIC_Y[0u], GUI_BLENDMODE_CUSTOM);
} }
/*0x31*/ /*0x31*/
...@@ -2762,7 +2761,7 @@ void GUI_BG_TPMS_GasPIC_Display(uint8_t Mode) ...@@ -2762,7 +2761,7 @@ void GUI_BG_TPMS_GasPIC_Display(uint8_t Mode)
} }
else else
{ {
GUI_Translate_Display(MENU_Sprite, CN_User_Menu3_04_luntai, GUI_TPMS_PIC_X[2u], GUI_TPMS_PIC_Y[3u], GUI_BLENDMODE_CUSTOM); GUI_Translate_Display(MENU_Sprite, CN_User_Menu3_04_luntai, GUI_TPMS_PIC_X[2u], GUI_TPMS_PIC_Y[3u], GUI_BLENDMODE_CUSTOM);
} }
/*0x32*/ /*0x32*/
...@@ -2772,7 +2771,7 @@ void GUI_BG_TPMS_GasPIC_Display(uint8_t Mode) ...@@ -2772,7 +2771,7 @@ void GUI_BG_TPMS_GasPIC_Display(uint8_t Mode)
} }
else else
{ {
GUI_Translate_Display(MENU_Sprite, CN_User_Menu3_04_luntai, GUI_TPMS_PIC_X[2u], GUI_TPMS_PIC_Y[2u], GUI_BLENDMODE_CUSTOM); GUI_Translate_Display(MENU_Sprite, CN_User_Menu3_04_luntai, GUI_TPMS_PIC_X[2u], GUI_TPMS_PIC_Y[2u], GUI_BLENDMODE_CUSTOM);
} }
/*0x33*/ /*0x33*/
...@@ -2782,7 +2781,7 @@ void GUI_BG_TPMS_GasPIC_Display(uint8_t Mode) ...@@ -2782,7 +2781,7 @@ void GUI_BG_TPMS_GasPIC_Display(uint8_t Mode)
} }
else else
{ {
GUI_Translate_Display(MENU_Sprite, CN_User_Menu3_04_luntai, GUI_TPMS_PIC_X[2u], GUI_TPMS_PIC_Y[1u], GUI_BLENDMODE_CUSTOM); GUI_Translate_Display(MENU_Sprite, CN_User_Menu3_04_luntai, GUI_TPMS_PIC_X[2u], GUI_TPMS_PIC_Y[1u], GUI_BLENDMODE_CUSTOM);
} }
/*0x34*/ /*0x34*/
...@@ -2792,7 +2791,7 @@ void GUI_BG_TPMS_GasPIC_Display(uint8_t Mode) ...@@ -2792,7 +2791,7 @@ void GUI_BG_TPMS_GasPIC_Display(uint8_t Mode)
} }
else else
{ {
GUI_Translate_Display(MENU_Sprite, CN_User_Menu3_04_luntai, GUI_TPMS_PIC_X[2u], GUI_TPMS_PIC_Y[0u], GUI_BLENDMODE_CUSTOM); GUI_Translate_Display(MENU_Sprite, CN_User_Menu3_04_luntai, GUI_TPMS_PIC_X[2u], GUI_TPMS_PIC_Y[0u], GUI_BLENDMODE_CUSTOM);
} }
/*0x41*/ /*0x41*/
...@@ -2802,7 +2801,7 @@ void GUI_BG_TPMS_GasPIC_Display(uint8_t Mode) ...@@ -2802,7 +2801,7 @@ void GUI_BG_TPMS_GasPIC_Display(uint8_t Mode)
} }
else else
{ {
GUI_Translate_Display(MENU_Sprite, CN_User_Menu3_04_luntai, GUI_TPMS_PIC_X[3u], GUI_TPMS_PIC_Y[3u], GUI_BLENDMODE_CUSTOM); GUI_Translate_Display(MENU_Sprite, CN_User_Menu3_04_luntai, GUI_TPMS_PIC_X[3u], GUI_TPMS_PIC_Y[3u], GUI_BLENDMODE_CUSTOM);
} }
/*0x42*/ /*0x42*/
...@@ -2812,7 +2811,7 @@ void GUI_BG_TPMS_GasPIC_Display(uint8_t Mode) ...@@ -2812,7 +2811,7 @@ void GUI_BG_TPMS_GasPIC_Display(uint8_t Mode)
} }
else else
{ {
GUI_Translate_Display(MENU_Sprite, CN_User_Menu3_04_luntai, GUI_TPMS_PIC_X[3u], GUI_TPMS_PIC_Y[2u], GUI_BLENDMODE_CUSTOM); GUI_Translate_Display(MENU_Sprite, CN_User_Menu3_04_luntai, GUI_TPMS_PIC_X[3u], GUI_TPMS_PIC_Y[2u], GUI_BLENDMODE_CUSTOM);
} }
/*0x43*/ /*0x43*/
...@@ -2822,7 +2821,7 @@ void GUI_BG_TPMS_GasPIC_Display(uint8_t Mode) ...@@ -2822,7 +2821,7 @@ void GUI_BG_TPMS_GasPIC_Display(uint8_t Mode)
} }
else else
{ {
GUI_Translate_Display(MENU_Sprite, CN_User_Menu3_04_luntai, GUI_TPMS_PIC_X[3u], GUI_TPMS_PIC_Y[1u], GUI_BLENDMODE_CUSTOM); GUI_Translate_Display(MENU_Sprite, CN_User_Menu3_04_luntai, GUI_TPMS_PIC_X[3u], GUI_TPMS_PIC_Y[1u], GUI_BLENDMODE_CUSTOM);
} }
/*0x44*/ /*0x44*/
...@@ -2832,7 +2831,7 @@ void GUI_BG_TPMS_GasPIC_Display(uint8_t Mode) ...@@ -2832,7 +2831,7 @@ void GUI_BG_TPMS_GasPIC_Display(uint8_t Mode)
} }
else else
{ {
GUI_Translate_Display(MENU_Sprite, CN_User_Menu3_04_luntai, GUI_TPMS_PIC_X[3u], GUI_TPMS_PIC_Y[0u], GUI_BLENDMODE_CUSTOM); GUI_Translate_Display(MENU_Sprite, CN_User_Menu3_04_luntai, GUI_TPMS_PIC_X[3u], GUI_TPMS_PIC_Y[0u], GUI_BLENDMODE_CUSTOM);
} }
} }
else else
...@@ -2867,25 +2866,25 @@ void GUI_BG_TPMS_TempPIC_Display(uint8_t Mode) ...@@ -2867,25 +2866,25 @@ void GUI_BG_TPMS_TempPIC_Display(uint8_t Mode)
if (Mode == GUI_DISP_MODE_NORMAL) if (Mode == GUI_DISP_MODE_NORMAL)
{ {
/*高温报警*/ /*高温报警*/
//User_Tpms12 = (); User_Tpms12 = Get_DataTPMS_TyreTempWarningSig_Value(FirstLOut);
//User_Tpms13 = (); User_Tpms13 = Get_DataTPMS_TyreTempWarningSig_Value(FirstROut);
//User_Tpms22 = (); User_Tpms22 = Get_DataTPMS_TyreTempWarningSig_Value(SecondLIn);
//User_Tpms23 = (); User_Tpms23 = Get_DataTPMS_TyreTempWarningSig_Value(SecondRIn);
//User_Tpms31 = (); User_Tpms31 = Get_DataTPMS_TyreTempWarningSig_Value(ThirdLOut);
//User_Tpms32 = (); User_Tpms32 = Get_DataTPMS_TyreTempWarningSig_Value(ThirdLIn);
//User_Tpms33 = (); User_Tpms33 = Get_DataTPMS_TyreTempWarningSig_Value(ThirdRIn);
//User_Tpms34 = (); User_Tpms34 = Get_DataTPMS_TyreTempWarningSig_Value(ThirdROut);
//User_Tpms41 = (); User_Tpms41 = Get_DataTPMS_TyreTempWarningSig_Value(FourthLOut);
//User_Tpms42 = (); User_Tpms42 = Get_DataTPMS_TyreTempWarningSig_Value(FourthLIn);
//User_Tpms43 = (); User_Tpms43 = Get_DataTPMS_TyreTempWarningSig_Value(FourthRIn);
//User_Tpms44 = (); User_Tpms44 = Get_DataTPMS_TyreTempWarningSig_Value(FourthROut);
/*显示*/ /*显示*/
GUI_General_Display(MENU_Sprite, CN_User_Menu3_04_che, GUI_BLENDMODE_SRC_OVER); /*车*/ GUI_General_Display(MENU_Sprite, CN_User_Menu3_04_che, GUI_BLENDMODE_SRC_OVER); /*车*/
GUI_General_Display(MENU_Sprite, CN_User_Menu3_04_wendu, GUI_BLENDMODE_SRC_OVER); /*摄氏度*/ GUI_General_Display(MENU_Sprite, CN_User_Menu3_04_wendu, GUI_BLENDMODE_SRC_OVER); /*摄氏度*/
GUI_General_Display(MENU_Sprite, CN_User_Menu3_04_qiya2, GUI_BLENDMODE_SRC_OVER); /*气压*/ GUI_General_Display(MENU_Sprite, CN_User_Menu3_04_qiya2, GUI_BLENDMODE_SRC_OVER); /*气压*/
GUI_General_Display(MENU_Sprite, CN_User_Menu3_04_wendu1, GUI_BLENDMODE_SRC_OVER); /*胎温*/ GUI_General_Display(MENU_Sprite, CN_User_Menu3_04_wendu1, GUI_BLENDMODE_SRC_OVER); /*胎温*/
GUI_General_Display(MENU_Sprite, CN_User_Menu3_04_jiantou1, GUI_BLENDMODE_SRC_OVER); /*箭头*/ GUI_General_Display(MENU_Sprite, CN_User_Menu3_04_jiantou1, GUI_BLENDMODE_SRC_OVER); /*箭头*/
GUI_General_Display(MENU_Sprite, CN_User_Menu3_04_jiantou2, GUI_BLENDMODE_SRC_OVER); /*箭头*/ GUI_General_Display(MENU_Sprite, CN_User_Menu3_04_jiantou2, GUI_BLENDMODE_SRC_OVER); /*箭头*/
...@@ -2896,7 +2895,7 @@ void GUI_BG_TPMS_TempPIC_Display(uint8_t Mode) ...@@ -2896,7 +2895,7 @@ void GUI_BG_TPMS_TempPIC_Display(uint8_t Mode)
} }
else else
{ {
GUI_Translate_Display(MENU_Sprite, CN_User_Menu3_04_luntai, GUI_TPMS_PIC_X[0u], GUI_TPMS_PIC_Y[3u], GUI_BLENDMODE_CUSTOM); GUI_Translate_Display(MENU_Sprite, CN_User_Menu3_04_luntai, GUI_TPMS_PIC_X[0u], GUI_TPMS_PIC_Y[3u], GUI_BLENDMODE_CUSTOM);
} }
/*0x13*/ /*0x13*/
...@@ -2906,7 +2905,7 @@ void GUI_BG_TPMS_TempPIC_Display(uint8_t Mode) ...@@ -2906,7 +2905,7 @@ void GUI_BG_TPMS_TempPIC_Display(uint8_t Mode)
} }
else else
{ {
GUI_Translate_Display(MENU_Sprite, CN_User_Menu3_04_luntai, GUI_TPMS_PIC_X[0u], GUI_TPMS_PIC_Y[0u], GUI_BLENDMODE_CUSTOM); GUI_Translate_Display(MENU_Sprite, CN_User_Menu3_04_luntai, GUI_TPMS_PIC_X[0u], GUI_TPMS_PIC_Y[0u], GUI_BLENDMODE_CUSTOM);
} }
/*0x22*/ /*0x22*/
...@@ -2916,7 +2915,7 @@ void GUI_BG_TPMS_TempPIC_Display(uint8_t Mode) ...@@ -2916,7 +2915,7 @@ void GUI_BG_TPMS_TempPIC_Display(uint8_t Mode)
} }
else else
{ {
GUI_Translate_Display(MENU_Sprite, CN_User_Menu3_04_luntai, GUI_TPMS_PIC_X[1u], GUI_TPMS_PIC_Y[3u], GUI_BLENDMODE_CUSTOM); GUI_Translate_Display(MENU_Sprite, CN_User_Menu3_04_luntai, GUI_TPMS_PIC_X[1u], GUI_TPMS_PIC_Y[3u], GUI_BLENDMODE_CUSTOM);
} }
/*0x23*/ /*0x23*/
...@@ -2926,7 +2925,7 @@ void GUI_BG_TPMS_TempPIC_Display(uint8_t Mode) ...@@ -2926,7 +2925,7 @@ void GUI_BG_TPMS_TempPIC_Display(uint8_t Mode)
} }
else else
{ {
GUI_Translate_Display(MENU_Sprite, CN_User_Menu3_04_luntai, GUI_TPMS_PIC_X[1u], GUI_TPMS_PIC_Y[0u], GUI_BLENDMODE_CUSTOM); GUI_Translate_Display(MENU_Sprite, CN_User_Menu3_04_luntai, GUI_TPMS_PIC_X[1u], GUI_TPMS_PIC_Y[0u], GUI_BLENDMODE_CUSTOM);
} }
/*0x31*/ /*0x31*/
...@@ -2936,7 +2935,7 @@ void GUI_BG_TPMS_TempPIC_Display(uint8_t Mode) ...@@ -2936,7 +2935,7 @@ void GUI_BG_TPMS_TempPIC_Display(uint8_t Mode)
} }
else else
{ {
GUI_Translate_Display(MENU_Sprite, CN_User_Menu3_04_luntai, GUI_TPMS_PIC_X[2u], GUI_TPMS_PIC_Y[3u], GUI_BLENDMODE_CUSTOM); GUI_Translate_Display(MENU_Sprite, CN_User_Menu3_04_luntai, GUI_TPMS_PIC_X[2u], GUI_TPMS_PIC_Y[3u], GUI_BLENDMODE_CUSTOM);
} }
/*0x32*/ /*0x32*/
...@@ -2946,7 +2945,7 @@ void GUI_BG_TPMS_TempPIC_Display(uint8_t Mode) ...@@ -2946,7 +2945,7 @@ void GUI_BG_TPMS_TempPIC_Display(uint8_t Mode)
} }
else else
{ {
GUI_Translate_Display(MENU_Sprite, CN_User_Menu3_04_luntai, GUI_TPMS_PIC_X[2], GUI_TPMS_PIC_Y[2u], GUI_BLENDMODE_CUSTOM); GUI_Translate_Display(MENU_Sprite, CN_User_Menu3_04_luntai, GUI_TPMS_PIC_X[2], GUI_TPMS_PIC_Y[2u], GUI_BLENDMODE_CUSTOM);
} }
/*0x33*/ /*0x33*/
...@@ -2956,7 +2955,7 @@ void GUI_BG_TPMS_TempPIC_Display(uint8_t Mode) ...@@ -2956,7 +2955,7 @@ void GUI_BG_TPMS_TempPIC_Display(uint8_t Mode)
} }
else else
{ {
GUI_Translate_Display(MENU_Sprite, CN_User_Menu3_04_luntai, GUI_TPMS_PIC_X[2u], GUI_TPMS_PIC_Y[1u], GUI_BLENDMODE_CUSTOM); GUI_Translate_Display(MENU_Sprite, CN_User_Menu3_04_luntai, GUI_TPMS_PIC_X[2u], GUI_TPMS_PIC_Y[1u], GUI_BLENDMODE_CUSTOM);
} }
/*0x34*/ /*0x34*/
...@@ -2966,7 +2965,7 @@ void GUI_BG_TPMS_TempPIC_Display(uint8_t Mode) ...@@ -2966,7 +2965,7 @@ void GUI_BG_TPMS_TempPIC_Display(uint8_t Mode)
} }
else else
{ {
GUI_Translate_Display(MENU_Sprite, CN_User_Menu3_04_luntai, GUI_TPMS_PIC_X[2u], GUI_TPMS_PIC_Y[0u], GUI_BLENDMODE_CUSTOM); GUI_Translate_Display(MENU_Sprite, CN_User_Menu3_04_luntai, GUI_TPMS_PIC_X[2u], GUI_TPMS_PIC_Y[0u], GUI_BLENDMODE_CUSTOM);
} }
/*0x41*/ /*0x41*/
...@@ -2976,7 +2975,7 @@ void GUI_BG_TPMS_TempPIC_Display(uint8_t Mode) ...@@ -2976,7 +2975,7 @@ void GUI_BG_TPMS_TempPIC_Display(uint8_t Mode)
} }
else else
{ {
GUI_Translate_Display(MENU_Sprite, CN_User_Menu3_04_luntai, GUI_TPMS_PIC_X[3u], GUI_TPMS_PIC_Y[3u], GUI_BLENDMODE_CUSTOM); GUI_Translate_Display(MENU_Sprite, CN_User_Menu3_04_luntai, GUI_TPMS_PIC_X[3u], GUI_TPMS_PIC_Y[3u], GUI_BLENDMODE_CUSTOM);
} }
/*0x42*/ /*0x42*/
...@@ -2986,7 +2985,7 @@ void GUI_BG_TPMS_TempPIC_Display(uint8_t Mode) ...@@ -2986,7 +2985,7 @@ void GUI_BG_TPMS_TempPIC_Display(uint8_t Mode)
} }
else else
{ {
GUI_Translate_Display(MENU_Sprite, CN_User_Menu3_04_luntai, GUI_TPMS_PIC_X[3u], GUI_TPMS_PIC_Y[2u], GUI_BLENDMODE_CUSTOM); GUI_Translate_Display(MENU_Sprite, CN_User_Menu3_04_luntai, GUI_TPMS_PIC_X[3u], GUI_TPMS_PIC_Y[2u], GUI_BLENDMODE_CUSTOM);
} }
/*0x43*/ /*0x43*/
...@@ -2996,7 +2995,7 @@ void GUI_BG_TPMS_TempPIC_Display(uint8_t Mode) ...@@ -2996,7 +2995,7 @@ void GUI_BG_TPMS_TempPIC_Display(uint8_t Mode)
} }
else else
{ {
GUI_Translate_Display(MENU_Sprite, CN_User_Menu3_04_luntai, GUI_TPMS_PIC_X[3u], GUI_TPMS_PIC_Y[1u], GUI_BLENDMODE_CUSTOM); GUI_Translate_Display(MENU_Sprite, CN_User_Menu3_04_luntai, GUI_TPMS_PIC_X[3u], GUI_TPMS_PIC_Y[1u], GUI_BLENDMODE_CUSTOM);
} }
/*0x44*/ /*0x44*/
...@@ -3006,9 +3005,8 @@ void GUI_BG_TPMS_TempPIC_Display(uint8_t Mode) ...@@ -3006,9 +3005,8 @@ void GUI_BG_TPMS_TempPIC_Display(uint8_t Mode)
} }
else else
{ {
GUI_Translate_Display(MENU_Sprite, CN_User_Menu3_04_luntai, GUI_TPMS_PIC_X[3u], GUI_TPMS_PIC_Y[0u], GUI_BLENDMODE_CUSTOM); GUI_Translate_Display(MENU_Sprite, CN_User_Menu3_04_luntai, GUI_TPMS_PIC_X[3u], GUI_TPMS_PIC_Y[0u], GUI_BLENDMODE_CUSTOM);
} }
} }
else else
{ {
...@@ -3053,19 +3051,43 @@ void GUI_BG_TPMS_GasNUM_Display(uint8_t Mode) ...@@ -3053,19 +3051,43 @@ void GUI_BG_TPMS_GasNUM_Display(uint8_t Mode)
Gas_Value_0x43 = Get_DataTPMS_Pressure_Value(FourthRIn); Gas_Value_0x43 = Get_DataTPMS_Pressure_Value(FourthRIn);
Gas_Value_0x44 = Get_DataTPMS_Pressure_Value(FourthROut); Gas_Value_0x44 = Get_DataTPMS_Pressure_Value(FourthROut);
/*0x12*/GUI_General_Digit_Display(MENU_Sprite, Gas_Value_0x12, Nb_12_0, 3u, 2u, GUI_TPMS_NUM1_X, GUI_TPMS_NUM_Y[3u], GUI_BLENDMODE_SRC_OVER); /*0x12*/
/*0x13*/GUI_General_Digit_Display(MENU_Sprite, Gas_Value_0x13, Nb_12_0, 3u, 2u, GUI_TPMS_NUM1_X, GUI_TPMS_NUM_Y[0u], GUI_BLENDMODE_SRC_OVER); GUI_General_Digit_Display(MENU_Sprite, Gas_Value_0x12, Nb_12_0, 3u, 2u, GUI_TPMS_NUM1_X, GUI_TPMS_NUM_Y[3u], GUI_BLENDMODE_SRC_OVER);
/*0x22*/GUI_General_Digit_Display(MENU_Sprite, Gas_Value_0x22, Nb_12_0, 3u, 2u, GUI_TPMS_NUM2_X, GUI_TPMS_NUM_Y[3u], GUI_BLENDMODE_SRC_OVER);
/*0x23*/GUI_General_Digit_Display(MENU_Sprite, Gas_Value_0x23, Nb_12_0, 3u, 2u, GUI_TPMS_NUM2_X, GUI_TPMS_NUM_Y[0u], GUI_BLENDMODE_SRC_OVER); /*0x13*/
/*0x31*/GUI_General_Digit_Display(MENU_Sprite, Gas_Value_0x31, Nb_12_0, 3u, 2u, GUI_TPMS_NUM3_X, GUI_TPMS_NUM_Y[3u], GUI_BLENDMODE_SRC_OVER); GUI_General_Digit_Display(MENU_Sprite, Gas_Value_0x13, Nb_12_0, 3u, 2u, GUI_TPMS_NUM1_X, GUI_TPMS_NUM_Y[0u], GUI_BLENDMODE_SRC_OVER);
/*0x32*/GUI_General_Digit_Display(MENU_Sprite, Gas_Value_0x32, Nb_12_0, 3u, 2u, GUI_TPMS_NUM3_X, GUI_TPMS_NUM_Y[2u], GUI_BLENDMODE_SRC_OVER);
/*0x33*/GUI_General_Digit_Display(MENU_Sprite, Gas_Value_0x33, Nb_12_0, 3u, 2u, GUI_TPMS_NUM3_X, GUI_TPMS_NUM_Y[1u], GUI_BLENDMODE_SRC_OVER); /*0x22*/
/*0x34*/GUI_General_Digit_Display(MENU_Sprite, Gas_Value_0x34, Nb_12_0, 3u, 2u, GUI_TPMS_NUM3_X, GUI_TPMS_NUM_Y[0u], GUI_BLENDMODE_SRC_OVER); GUI_General_Digit_Display(MENU_Sprite, Gas_Value_0x22, Nb_12_0, 3u, 2u, GUI_TPMS_NUM2_X, GUI_TPMS_NUM_Y[3u], GUI_BLENDMODE_SRC_OVER);
/*0x41*/GUI_General_Digit_Display(MENU_Sprite, Gas_Value_0x41, Nb_12_0, 3u, 2u, GUI_TPMS_NUM4_X, GUI_TPMS_NUM_Y[3u], GUI_BLENDMODE_SRC_OVER);
/*0x42*/GUI_General_Digit_Display(MENU_Sprite, Gas_Value_0x42, Nb_12_0, 3u, 2u, GUI_TPMS_NUM4_X, GUI_TPMS_NUM_Y[2u], GUI_BLENDMODE_SRC_OVER); /*0x23*/
/*0x43*/GUI_General_Digit_Display(MENU_Sprite, Gas_Value_0x43, Nb_12_0, 3u, 2u, GUI_TPMS_NUM4_X, GUI_TPMS_NUM_Y[1u], GUI_BLENDMODE_SRC_OVER); GUI_General_Digit_Display(MENU_Sprite, Gas_Value_0x23, Nb_12_0, 3u, 2u, GUI_TPMS_NUM2_X, GUI_TPMS_NUM_Y[0u], GUI_BLENDMODE_SRC_OVER);
/*0x44*/GUI_General_Digit_Display(MENU_Sprite, Gas_Value_0x44, Nb_12_0, 3u, 2u, GUI_TPMS_NUM4_X, GUI_TPMS_NUM_Y[0u], GUI_BLENDMODE_SRC_OVER);
/*0x31*/
GUI_General_Digit_Display(MENU_Sprite, Gas_Value_0x31, Nb_12_0, 3u, 2u, GUI_TPMS_NUM3_X, GUI_TPMS_NUM_Y[3u], GUI_BLENDMODE_SRC_OVER);
/*0x32*/
GUI_General_Digit_Display(MENU_Sprite, Gas_Value_0x32, Nb_12_0, 3u, 2u, GUI_TPMS_NUM3_X, GUI_TPMS_NUM_Y[2u], GUI_BLENDMODE_SRC_OVER);
/*0x33*/
GUI_General_Digit_Display(MENU_Sprite, Gas_Value_0x33, Nb_12_0, 3u, 2u, GUI_TPMS_NUM3_X, GUI_TPMS_NUM_Y[1u], GUI_BLENDMODE_SRC_OVER);
/*0x34*/
GUI_General_Digit_Display(MENU_Sprite, Gas_Value_0x34, Nb_12_0, 3u, 2u, GUI_TPMS_NUM3_X, GUI_TPMS_NUM_Y[0u], GUI_BLENDMODE_SRC_OVER);
/*0x41*/
GUI_General_Digit_Display(MENU_Sprite, Gas_Value_0x41, Nb_12_0, 3u, 2u, GUI_TPMS_NUM4_X, GUI_TPMS_NUM_Y[3u], GUI_BLENDMODE_SRC_OVER);
/*0x42*/
GUI_General_Digit_Display(MENU_Sprite, Gas_Value_0x42, Nb_12_0, 3u, 2u, GUI_TPMS_NUM4_X, GUI_TPMS_NUM_Y[2u], GUI_BLENDMODE_SRC_OVER);
/*0x43*/
GUI_General_Digit_Display(MENU_Sprite, Gas_Value_0x43, Nb_12_0, 3u, 2u, GUI_TPMS_NUM4_X, GUI_TPMS_NUM_Y[1u], GUI_BLENDMODE_SRC_OVER);
/*0x44*/
GUI_General_Digit_Display(MENU_Sprite, Gas_Value_0x44, Nb_12_0, 3u, 2u, GUI_TPMS_NUM4_X, GUI_TPMS_NUM_Y[0u], GUI_BLENDMODE_SRC_OVER);
} }
else else
{ {
GUI_General_Display(MENU_Sprite, SpriteSize, GUI_BLENDMODE_SRC_OVER); GUI_General_Display(MENU_Sprite, SpriteSize, GUI_BLENDMODE_SRC_OVER);
...@@ -3147,14 +3169,13 @@ void GUI_BG_TPMS_TempNUM_Display(uint8_t Mode) ...@@ -3147,14 +3169,13 @@ void GUI_BG_TPMS_TempNUM_Display(uint8_t Mode)
GUI_General_Digit_Display(MENU_Sprite, Temp_Value_0x12, Nb_12_0, 3u, 2u, GUI_TPMS_NUM1_X, GUI_TPMS_NUM_Y[3u], GUI_BLENDMODE_SRC_OVER); GUI_General_Digit_Display(MENU_Sprite, Temp_Value_0x12, Nb_12_0, 3u, 2u, GUI_TPMS_NUM1_X, GUI_TPMS_NUM_Y[3u], GUI_BLENDMODE_SRC_OVER);
} }
/*0x13*/ /*0x13*/
if (Temp_Sta_0x13 == STATUS_NEGATIVE) if (Temp_Sta_0x13 == STATUS_NEGATIVE)
{ {
GUI_General_Digit_Display(MENU_Sprite, Temp_Value_0x13, Nb_12_0, 2u, 1u, GUI_TPMS_NUM1_X, GUI_TPMS_NUM_Y[0u], GUI_BLENDMODE_SRC_OVER); GUI_General_Digit_Display(MENU_Sprite, Temp_Value_0x13, Nb_12_0, 2u, 1u, GUI_TPMS_NUM1_X, GUI_TPMS_NUM_Y[0u], GUI_BLENDMODE_SRC_OVER);
GUI_Translate_Display(MENU_Sprite, Nb_12_heng, (GUI_TPMS_MIC3_X[0] + 3u), (GUI_TPMS_NUM_Y[0u] + 9u), GUI_BLENDMODE_SRC_OVER); GUI_Translate_Display(MENU_Sprite, Nb_12_heng, (GUI_TPMS_MIC3_X[0] + 3u), (GUI_TPMS_NUM_Y[0u] + 9u), GUI_BLENDMODE_SRC_OVER);
} }
else //if (Temp_Sta_0x13 == STATUS_NONNEGATIVE) else // if (Temp_Sta_0x13 == STATUS_NONNEGATIVE)
{ {
GUI_General_Digit_Display(MENU_Sprite, Temp_Value_0x13, Nb_12_0, 3u, 2u, GUI_TPMS_NUM1_X, GUI_TPMS_NUM_Y[0u], GUI_BLENDMODE_SRC_OVER); GUI_General_Digit_Display(MENU_Sprite, Temp_Value_0x13, Nb_12_0, 3u, 2u, GUI_TPMS_NUM1_X, GUI_TPMS_NUM_Y[0u], GUI_BLENDMODE_SRC_OVER);
} }
...@@ -3165,7 +3186,7 @@ void GUI_BG_TPMS_TempNUM_Display(uint8_t Mode) ...@@ -3165,7 +3186,7 @@ void GUI_BG_TPMS_TempNUM_Display(uint8_t Mode)
GUI_General_Digit_Display(MENU_Sprite, Temp_Value_0x22, Nb_12_0, 2u, 1u, GUI_TPMS_NUM2_X, GUI_TPMS_NUM_Y[3u], GUI_BLENDMODE_SRC_OVER); GUI_General_Digit_Display(MENU_Sprite, Temp_Value_0x22, Nb_12_0, 2u, 1u, GUI_TPMS_NUM2_X, GUI_TPMS_NUM_Y[3u], GUI_BLENDMODE_SRC_OVER);
GUI_Translate_Display(MENU_Sprite, Nb_12_heng, (GUI_TPMS_MIC3_X[1] + 3u), (GUI_TPMS_NUM_Y[3u] + 9u), GUI_BLENDMODE_SRC_OVER); GUI_Translate_Display(MENU_Sprite, Nb_12_heng, (GUI_TPMS_MIC3_X[1] + 3u), (GUI_TPMS_NUM_Y[3u] + 9u), GUI_BLENDMODE_SRC_OVER);
} }
else //if (Temp_Sta_0x22 == STATUS_NONNEGATIVE) else // if (Temp_Sta_0x22 == STATUS_NONNEGATIVE)
{ {
GUI_General_Digit_Display(MENU_Sprite, Temp_Value_0x22, Nb_12_0, 3u, 2u, GUI_TPMS_NUM2_X, GUI_TPMS_NUM_Y[3u], GUI_BLENDMODE_SRC_OVER); GUI_General_Digit_Display(MENU_Sprite, Temp_Value_0x22, Nb_12_0, 3u, 2u, GUI_TPMS_NUM2_X, GUI_TPMS_NUM_Y[3u], GUI_BLENDMODE_SRC_OVER);
} }
...@@ -3176,7 +3197,7 @@ void GUI_BG_TPMS_TempNUM_Display(uint8_t Mode) ...@@ -3176,7 +3197,7 @@ void GUI_BG_TPMS_TempNUM_Display(uint8_t Mode)
GUI_General_Digit_Display(MENU_Sprite, Temp_Value_0x23, Nb_12_0, 2u, 1u, GUI_TPMS_NUM2_X, GUI_TPMS_NUM_Y[0u], GUI_BLENDMODE_SRC_OVER); GUI_General_Digit_Display(MENU_Sprite, Temp_Value_0x23, Nb_12_0, 2u, 1u, GUI_TPMS_NUM2_X, GUI_TPMS_NUM_Y[0u], GUI_BLENDMODE_SRC_OVER);
GUI_Translate_Display(MENU_Sprite, Nb_12_heng, (GUI_TPMS_MIC3_X[1] + 3u), (GUI_TPMS_NUM_Y[0u] + 9u), GUI_BLENDMODE_SRC_OVER); GUI_Translate_Display(MENU_Sprite, Nb_12_heng, (GUI_TPMS_MIC3_X[1] + 3u), (GUI_TPMS_NUM_Y[0u] + 9u), GUI_BLENDMODE_SRC_OVER);
} }
else //if (Temp_Sta_0x23 == STATUS_NONNEGATIVE) else // if (Temp_Sta_0x23 == STATUS_NONNEGATIVE)
{ {
GUI_General_Digit_Display(MENU_Sprite, Temp_Value_0x23, Nb_12_0, 3u, 2u, GUI_TPMS_NUM2_X, GUI_TPMS_NUM_Y[0u], GUI_BLENDMODE_SRC_OVER); GUI_General_Digit_Display(MENU_Sprite, Temp_Value_0x23, Nb_12_0, 3u, 2u, GUI_TPMS_NUM2_X, GUI_TPMS_NUM_Y[0u], GUI_BLENDMODE_SRC_OVER);
} }
...@@ -3187,7 +3208,7 @@ void GUI_BG_TPMS_TempNUM_Display(uint8_t Mode) ...@@ -3187,7 +3208,7 @@ void GUI_BG_TPMS_TempNUM_Display(uint8_t Mode)
GUI_General_Digit_Display(MENU_Sprite, Temp_Value_0x31, Nb_12_0, 2u, 1u, GUI_TPMS_NUM3_X, GUI_TPMS_NUM_Y[3u], GUI_BLENDMODE_SRC_OVER); GUI_General_Digit_Display(MENU_Sprite, Temp_Value_0x31, Nb_12_0, 2u, 1u, GUI_TPMS_NUM3_X, GUI_TPMS_NUM_Y[3u], GUI_BLENDMODE_SRC_OVER);
GUI_Translate_Display(MENU_Sprite, Nb_12_heng, (GUI_TPMS_MIC3_X[2] + 3u), (GUI_TPMS_NUM_Y[3u] + 9u), GUI_BLENDMODE_SRC_OVER); GUI_Translate_Display(MENU_Sprite, Nb_12_heng, (GUI_TPMS_MIC3_X[2] + 3u), (GUI_TPMS_NUM_Y[3u] + 9u), GUI_BLENDMODE_SRC_OVER);
} }
else //if (Temp_Sta_0x31 == STATUS_NONNEGATIVE) else // if (Temp_Sta_0x31 == STATUS_NONNEGATIVE)
{ {
GUI_General_Digit_Display(MENU_Sprite, Temp_Value_0x31, Nb_12_0, 3u, 2u, GUI_TPMS_NUM3_X, GUI_TPMS_NUM_Y[3u], GUI_BLENDMODE_SRC_OVER); GUI_General_Digit_Display(MENU_Sprite, Temp_Value_0x31, Nb_12_0, 3u, 2u, GUI_TPMS_NUM3_X, GUI_TPMS_NUM_Y[3u], GUI_BLENDMODE_SRC_OVER);
} }
...@@ -3198,7 +3219,7 @@ void GUI_BG_TPMS_TempNUM_Display(uint8_t Mode) ...@@ -3198,7 +3219,7 @@ void GUI_BG_TPMS_TempNUM_Display(uint8_t Mode)
GUI_General_Digit_Display(MENU_Sprite, Temp_Value_0x32, Nb_12_0, 2u, 1u, GUI_TPMS_NUM3_X, GUI_TPMS_NUM_Y[2u], GUI_BLENDMODE_SRC_OVER); GUI_General_Digit_Display(MENU_Sprite, Temp_Value_0x32, Nb_12_0, 2u, 1u, GUI_TPMS_NUM3_X, GUI_TPMS_NUM_Y[2u], GUI_BLENDMODE_SRC_OVER);
GUI_Translate_Display(MENU_Sprite, Nb_12_heng, (GUI_TPMS_MIC3_X[2] + 3u), (GUI_TPMS_NUM_Y[2u] + 9u), GUI_BLENDMODE_SRC_OVER); GUI_Translate_Display(MENU_Sprite, Nb_12_heng, (GUI_TPMS_MIC3_X[2] + 3u), (GUI_TPMS_NUM_Y[2u] + 9u), GUI_BLENDMODE_SRC_OVER);
} }
else // if (Temp_Sta_0x32 == STATUS_NONNEGATIVE) else // if (Temp_Sta_0x32 == STATUS_NONNEGATIVE)
{ {
GUI_General_Digit_Display(MENU_Sprite, Temp_Value_0x32, Nb_12_0, 3u, 2u, GUI_TPMS_NUM3_X, GUI_TPMS_NUM_Y[2u], GUI_BLENDMODE_SRC_OVER); GUI_General_Digit_Display(MENU_Sprite, Temp_Value_0x32, Nb_12_0, 3u, 2u, GUI_TPMS_NUM3_X, GUI_TPMS_NUM_Y[2u], GUI_BLENDMODE_SRC_OVER);
} }
...@@ -3209,7 +3230,7 @@ void GUI_BG_TPMS_TempNUM_Display(uint8_t Mode) ...@@ -3209,7 +3230,7 @@ void GUI_BG_TPMS_TempNUM_Display(uint8_t Mode)
GUI_General_Digit_Display(MENU_Sprite, Temp_Value_0x33, Nb_12_0, 2u, 1u, GUI_TPMS_NUM3_X, GUI_TPMS_NUM_Y[1u], GUI_BLENDMODE_SRC_OVER); GUI_General_Digit_Display(MENU_Sprite, Temp_Value_0x33, Nb_12_0, 2u, 1u, GUI_TPMS_NUM3_X, GUI_TPMS_NUM_Y[1u], GUI_BLENDMODE_SRC_OVER);
GUI_Translate_Display(MENU_Sprite, Nb_12_heng, (GUI_TPMS_MIC3_X[2] + 3u), (GUI_TPMS_NUM_Y[1u] + 9u), GUI_BLENDMODE_SRC_OVER); GUI_Translate_Display(MENU_Sprite, Nb_12_heng, (GUI_TPMS_MIC3_X[2] + 3u), (GUI_TPMS_NUM_Y[1u] + 9u), GUI_BLENDMODE_SRC_OVER);
} }
else //if (Temp_Sta_0x33 == STATUS_NONNEGATIVE) else // if (Temp_Sta_0x33 == STATUS_NONNEGATIVE)
{ {
GUI_General_Digit_Display(MENU_Sprite, Temp_Value_0x33, Nb_12_0, 3u, 2u, GUI_TPMS_NUM3_X, GUI_TPMS_NUM_Y[1u], GUI_BLENDMODE_SRC_OVER); GUI_General_Digit_Display(MENU_Sprite, Temp_Value_0x33, Nb_12_0, 3u, 2u, GUI_TPMS_NUM3_X, GUI_TPMS_NUM_Y[1u], GUI_BLENDMODE_SRC_OVER);
} }
...@@ -3220,7 +3241,7 @@ void GUI_BG_TPMS_TempNUM_Display(uint8_t Mode) ...@@ -3220,7 +3241,7 @@ void GUI_BG_TPMS_TempNUM_Display(uint8_t Mode)
GUI_General_Digit_Display(MENU_Sprite, Temp_Value_0x34, Nb_12_0, 2u, 1u, GUI_TPMS_NUM3_X, GUI_TPMS_NUM_Y[0u], GUI_BLENDMODE_SRC_OVER); GUI_General_Digit_Display(MENU_Sprite, Temp_Value_0x34, Nb_12_0, 2u, 1u, GUI_TPMS_NUM3_X, GUI_TPMS_NUM_Y[0u], GUI_BLENDMODE_SRC_OVER);
GUI_Translate_Display(MENU_Sprite, Nb_12_heng, (GUI_TPMS_MIC3_X[2] + 3u), (GUI_TPMS_NUM_Y[0u] + 9u), GUI_BLENDMODE_SRC_OVER); GUI_Translate_Display(MENU_Sprite, Nb_12_heng, (GUI_TPMS_MIC3_X[2] + 3u), (GUI_TPMS_NUM_Y[0u] + 9u), GUI_BLENDMODE_SRC_OVER);
} }
else //if (Temp_Sta_0x34 == STATUS_NONNEGATIVE) else // if (Temp_Sta_0x34 == STATUS_NONNEGATIVE)
{ {
GUI_General_Digit_Display(MENU_Sprite, Temp_Value_0x34, Nb_12_0, 3u, 2u, GUI_TPMS_NUM3_X, GUI_TPMS_NUM_Y[0u], GUI_BLENDMODE_SRC_OVER); GUI_General_Digit_Display(MENU_Sprite, Temp_Value_0x34, Nb_12_0, 3u, 2u, GUI_TPMS_NUM3_X, GUI_TPMS_NUM_Y[0u], GUI_BLENDMODE_SRC_OVER);
} }
...@@ -3231,7 +3252,7 @@ void GUI_BG_TPMS_TempNUM_Display(uint8_t Mode) ...@@ -3231,7 +3252,7 @@ void GUI_BG_TPMS_TempNUM_Display(uint8_t Mode)
GUI_General_Digit_Display(MENU_Sprite, Temp_Value_0x41, Nb_12_0, 2u, 1u, GUI_TPMS_NUM4_X, GUI_TPMS_NUM_Y[3u], GUI_BLENDMODE_SRC_OVER); GUI_General_Digit_Display(MENU_Sprite, Temp_Value_0x41, Nb_12_0, 2u, 1u, GUI_TPMS_NUM4_X, GUI_TPMS_NUM_Y[3u], GUI_BLENDMODE_SRC_OVER);
GUI_Translate_Display(MENU_Sprite, Nb_12_heng, (GUI_TPMS_MIC3_X[3] + 3u), (GUI_TPMS_NUM_Y[3u] + 9u), GUI_BLENDMODE_SRC_OVER); GUI_Translate_Display(MENU_Sprite, Nb_12_heng, (GUI_TPMS_MIC3_X[3] + 3u), (GUI_TPMS_NUM_Y[3u] + 9u), GUI_BLENDMODE_SRC_OVER);
} }
else //if (Temp_Sta_0x41 == STATUS_NONNEGATIVE) else // if (Temp_Sta_0x41 == STATUS_NONNEGATIVE)
{ {
GUI_General_Digit_Display(MENU_Sprite, Temp_Value_0x41, Nb_12_0, 3u, 2u, GUI_TPMS_NUM4_X, GUI_TPMS_NUM_Y[3u], GUI_BLENDMODE_SRC_OVER); GUI_General_Digit_Display(MENU_Sprite, Temp_Value_0x41, Nb_12_0, 3u, 2u, GUI_TPMS_NUM4_X, GUI_TPMS_NUM_Y[3u], GUI_BLENDMODE_SRC_OVER);
} }
...@@ -3242,7 +3263,7 @@ void GUI_BG_TPMS_TempNUM_Display(uint8_t Mode) ...@@ -3242,7 +3263,7 @@ void GUI_BG_TPMS_TempNUM_Display(uint8_t Mode)
GUI_General_Digit_Display(MENU_Sprite, Temp_Value_0x42, Nb_12_0, 2u, 1u, GUI_TPMS_NUM4_X, GUI_TPMS_NUM_Y[2u], GUI_BLENDMODE_SRC_OVER); GUI_General_Digit_Display(MENU_Sprite, Temp_Value_0x42, Nb_12_0, 2u, 1u, GUI_TPMS_NUM4_X, GUI_TPMS_NUM_Y[2u], GUI_BLENDMODE_SRC_OVER);
GUI_Translate_Display(MENU_Sprite, Nb_12_heng, (GUI_TPMS_MIC3_X[3] + 3u), (GUI_TPMS_NUM_Y[2u] + 9u), GUI_BLENDMODE_SRC_OVER); GUI_Translate_Display(MENU_Sprite, Nb_12_heng, (GUI_TPMS_MIC3_X[3] + 3u), (GUI_TPMS_NUM_Y[2u] + 9u), GUI_BLENDMODE_SRC_OVER);
} }
else //if (Temp_Sta_0x42 == STATUS_NONNEGATIVE) else // if (Temp_Sta_0x42 == STATUS_NONNEGATIVE)
{ {
GUI_General_Digit_Display(MENU_Sprite, Temp_Value_0x42, Nb_12_0, 3u, 2u, GUI_TPMS_NUM4_X, GUI_TPMS_NUM_Y[2u], GUI_BLENDMODE_SRC_OVER); GUI_General_Digit_Display(MENU_Sprite, Temp_Value_0x42, Nb_12_0, 3u, 2u, GUI_TPMS_NUM4_X, GUI_TPMS_NUM_Y[2u], GUI_BLENDMODE_SRC_OVER);
} }
...@@ -3253,7 +3274,7 @@ void GUI_BG_TPMS_TempNUM_Display(uint8_t Mode) ...@@ -3253,7 +3274,7 @@ void GUI_BG_TPMS_TempNUM_Display(uint8_t Mode)
GUI_General_Digit_Display(MENU_Sprite, Temp_Value_0x43, Nb_12_0, 2u, 1u, GUI_TPMS_NUM4_X, GUI_TPMS_NUM_Y[1u], GUI_BLENDMODE_SRC_OVER); GUI_General_Digit_Display(MENU_Sprite, Temp_Value_0x43, Nb_12_0, 2u, 1u, GUI_TPMS_NUM4_X, GUI_TPMS_NUM_Y[1u], GUI_BLENDMODE_SRC_OVER);
GUI_Translate_Display(MENU_Sprite, Nb_12_heng, (GUI_TPMS_MIC3_X[3] + 3u), (GUI_TPMS_NUM_Y[1u] + 9u), GUI_BLENDMODE_SRC_OVER); GUI_Translate_Display(MENU_Sprite, Nb_12_heng, (GUI_TPMS_MIC3_X[3] + 3u), (GUI_TPMS_NUM_Y[1u] + 9u), GUI_BLENDMODE_SRC_OVER);
} }
else //if (Temp_Sta_0x43 == STATUS_NONNEGATIVE) else // if (Temp_Sta_0x43 == STATUS_NONNEGATIVE)
{ {
GUI_General_Digit_Display(MENU_Sprite, Temp_Value_0x43, Nb_12_0, 3u, 2u, GUI_TPMS_NUM4_X, GUI_TPMS_NUM_Y[1u], GUI_BLENDMODE_SRC_OVER); GUI_General_Digit_Display(MENU_Sprite, Temp_Value_0x43, Nb_12_0, 3u, 2u, GUI_TPMS_NUM4_X, GUI_TPMS_NUM_Y[1u], GUI_BLENDMODE_SRC_OVER);
} }
...@@ -3264,7 +3285,7 @@ void GUI_BG_TPMS_TempNUM_Display(uint8_t Mode) ...@@ -3264,7 +3285,7 @@ void GUI_BG_TPMS_TempNUM_Display(uint8_t Mode)
GUI_General_Digit_Display(MENU_Sprite, Temp_Value_0x44, Nb_12_0, 2u, 1u, GUI_TPMS_NUM4_X, GUI_TPMS_NUM_Y[0u], GUI_BLENDMODE_SRC_OVER); GUI_General_Digit_Display(MENU_Sprite, Temp_Value_0x44, Nb_12_0, 2u, 1u, GUI_TPMS_NUM4_X, GUI_TPMS_NUM_Y[0u], GUI_BLENDMODE_SRC_OVER);
GUI_Translate_Display(MENU_Sprite, Nb_12_heng, (GUI_TPMS_MIC3_X[3] + 3u), (GUI_TPMS_NUM_Y[0u] + 9u), GUI_BLENDMODE_SRC_OVER); GUI_Translate_Display(MENU_Sprite, Nb_12_heng, (GUI_TPMS_MIC3_X[3] + 3u), (GUI_TPMS_NUM_Y[0u] + 9u), GUI_BLENDMODE_SRC_OVER);
} }
else //if (Temp_Sta_0x44 == STATUS_NONNEGATIVE) else // if (Temp_Sta_0x44 == STATUS_NONNEGATIVE)
{ {
GUI_General_Digit_Display(MENU_Sprite, Temp_Value_0x44, Nb_12_0, 3u, 2u, GUI_TPMS_NUM4_X, GUI_TPMS_NUM_Y[0u], GUI_BLENDMODE_SRC_OVER); GUI_General_Digit_Display(MENU_Sprite, Temp_Value_0x44, Nb_12_0, 3u, 2u, GUI_TPMS_NUM4_X, GUI_TPMS_NUM_Y[0u], GUI_BLENDMODE_SRC_OVER);
} }
...@@ -3315,8 +3336,8 @@ void GUI_BG_RepMenu_3_1_Display(uint8_t Mode) ...@@ -3315,8 +3336,8 @@ void GUI_BG_RepMenu_3_1_Display(uint8_t Mode)
uint16_t User_FDJYLQQ_Value = 0u; uint16_t User_FDJYLQQ_Value = 0u;
uint8_t User_FDJYLQQ_FLAG = 0u; uint8_t User_FDJYLQQ_FLAG = 0u;
User_FDJYLQQ_Value = HYQ_TEST ; User_FDJYLQQ_Value = HYQ_TEST;
User_FDJYLQQ_FLAG = HYQ_TEST_FLAG ; User_FDJYLQQ_FLAG = HYQ_TEST_FLAG;
if (Mode == GUI_DISP_MODE_NORMAL) if (Mode == GUI_DISP_MODE_NORMAL)
{ {
...@@ -3340,11 +3361,11 @@ void GUI_BG_RepMenu_3_1_Display(uint8_t Mode) ...@@ -3340,11 +3361,11 @@ void GUI_BG_RepMenu_3_1_Display(uint8_t Mode)
if (User_FDJYLQQ_FLAG == 1u) if (User_FDJYLQQ_FLAG == 1u)
{ {
GUI_Translate_Display(MENU_Sprite, Nb_15_douhao, 534u, 281u, GUI_BLENDMODE_SRC_OVER); /*逗号*/ GUI_Translate_Display(MENU_Sprite, Nb_15_douhao, 534u, 281u, GUI_BLENDMODE_SRC_OVER); /*逗号*/
GUI_Translate_Display(MENU_Sprite, Nb_15_fuhao, 506u, 279u, GUI_BLENDMODE_SRC_OVER); /*负号*/ GUI_Translate_Display(MENU_Sprite, Nb_15_fuhao, 506u, 279u, GUI_BLENDMODE_SRC_OVER); /*负号*/
GUI_General_Digit_Display(MENU_Sprite, 1000u, Nb_15_0, 4u, 3u, GUI_REP_X, 277u, GUI_BLENDMODE_SRC_OVER); GUI_General_Digit_Display(MENU_Sprite, 1000u, Nb_15_0, 4u, 3u, GUI_REP_X, 277u, GUI_BLENDMODE_SRC_OVER);
} }
else if (User_FDJYLQQ_FLAG == 3u) else if (User_FDJYLQQ_FLAG == 3u)
{ {
GUI_General_Display(MENU_Sprite, SpriteSize, GUI_BLENDMODE_SRC_OVER); GUI_General_Display(MENU_Sprite, SpriteSize, GUI_BLENDMODE_SRC_OVER);
} }
...@@ -3376,7 +3397,6 @@ void GUI_BG_RepMenu_3_2_Display(uint8_t Mode) ...@@ -3376,7 +3397,6 @@ void GUI_BG_RepMenu_3_2_Display(uint8_t Mode)
} }
} }
/*-------------------------------------------------------------------------- /*--------------------------------------------------------------------------
* Function Name : GUI_BG_RepMenu_3_3_Display * Function Name : GUI_BG_RepMenu_3_3_Display
* Description : * Description :
...@@ -3397,7 +3417,6 @@ void GUI_BG_RepMenu_3_3_Display(uint8_t Mode) ...@@ -3397,7 +3417,6 @@ void GUI_BG_RepMenu_3_3_Display(uint8_t Mode)
} }
} }
/*-------------------------------------------------------------------------- /*--------------------------------------------------------------------------
* Function Name : GUI_BG_RepMenu_3_4_Display * Function Name : GUI_BG_RepMenu_3_4_Display
* Description : * Description :
...@@ -3458,7 +3477,6 @@ void GUI_BG_RepMenu_3_7_Display(uint8_t Mode) ...@@ -3458,7 +3477,6 @@ void GUI_BG_RepMenu_3_7_Display(uint8_t Mode)
} }
} }
/*-------------------------------------------------------------------------- /*--------------------------------------------------------------------------
* Function Name : GUI_BG_RepMenu_3_8_Display * Function Name : GUI_BG_RepMenu_3_8_Display
* Description : * Description :
...@@ -3506,7 +3524,7 @@ void GUI_BG_RepSetMenu_3_1_Display(uint8_t Mode) ...@@ -3506,7 +3524,7 @@ void GUI_BG_RepSetMenu_3_1_Display(uint8_t Mode)
{ {
if (Mode == GUI_DISP_MODE_NORMAL) if (Mode == GUI_DISP_MODE_NORMAL)
{ {
//GUI_General_Display(MENU_Sprite, CN_User_Menu3_01_16, GUI_BLENDMODE_SRC_OVER); /*menu*/ // GUI_General_Display(MENU_Sprite, CN_User_Menu3_01_16, GUI_BLENDMODE_SRC_OVER); /*menu*/
} }
else else
{ {
...@@ -3517,7 +3535,7 @@ void GUI_BG_RepSetMenu_3_2_Display(uint8_t Mode) ...@@ -3517,7 +3535,7 @@ void GUI_BG_RepSetMenu_3_2_Display(uint8_t Mode)
{ {
if (Mode == GUI_DISP_MODE_NORMAL) if (Mode == GUI_DISP_MODE_NORMAL)
{ {
//GUI_General_Display(MENU_Sprite, CN_User_Menu3_01_16, GUI_BLENDMODE_SRC_OVER); /*menu*/ // GUI_General_Display(MENU_Sprite, CN_User_Menu3_01_16, GUI_BLENDMODE_SRC_OVER); /*menu*/
} }
else else
{ {
...@@ -3528,7 +3546,7 @@ void GUI_BG_RepSetMenu_3_3_Display(uint8_t Mode) ...@@ -3528,7 +3546,7 @@ void GUI_BG_RepSetMenu_3_3_Display(uint8_t Mode)
{ {
if (Mode == GUI_DISP_MODE_NORMAL) if (Mode == GUI_DISP_MODE_NORMAL)
{ {
//GUI_General_Display(MENU_Sprite, CN_User_Menu3_01_16, GUI_BLENDMODE_SRC_OVER); /*menu*/ // GUI_General_Display(MENU_Sprite, CN_User_Menu3_01_16, GUI_BLENDMODE_SRC_OVER); /*menu*/
} }
else else
{ {
...@@ -3539,7 +3557,7 @@ void GUI_BG_RepSetMenu_3_4_Display(uint8_t Mode) ...@@ -3539,7 +3557,7 @@ void GUI_BG_RepSetMenu_3_4_Display(uint8_t Mode)
{ {
if (Mode == GUI_DISP_MODE_NORMAL) if (Mode == GUI_DISP_MODE_NORMAL)
{ {
//GUI_General_Display(MENU_Sprite, CN_User_Menu3_01_16, GUI_BLENDMODE_SRC_OVER); /*menu*/ // GUI_General_Display(MENU_Sprite, CN_User_Menu3_01_16, GUI_BLENDMODE_SRC_OVER); /*menu*/
} }
else else
{ {
...@@ -3550,7 +3568,7 @@ void GUI_BG_RepSetMenu_3_5_Display(uint8_t Mode) ...@@ -3550,7 +3568,7 @@ void GUI_BG_RepSetMenu_3_5_Display(uint8_t Mode)
{ {
if (Mode == GUI_DISP_MODE_NORMAL) if (Mode == GUI_DISP_MODE_NORMAL)
{ {
//GUI_General_Display(MENU_Sprite, CN_User_Menu3_01_16, GUI_BLENDMODE_SRC_OVER); /*menu*/ // GUI_General_Display(MENU_Sprite, CN_User_Menu3_01_16, GUI_BLENDMODE_SRC_OVER); /*menu*/
} }
else else
{ {
...@@ -3561,7 +3579,7 @@ void GUI_BG_RepSetMenu_3_6_Display(uint8_t Mode) ...@@ -3561,7 +3579,7 @@ void GUI_BG_RepSetMenu_3_6_Display(uint8_t Mode)
{ {
if (Mode == GUI_DISP_MODE_NORMAL) if (Mode == GUI_DISP_MODE_NORMAL)
{ {
//GUI_General_Display(MENU_Sprite, CN_User_Menu3_01_16, GUI_BLENDMODE_SRC_OVER); /*menu*/ // GUI_General_Display(MENU_Sprite, CN_User_Menu3_01_16, GUI_BLENDMODE_SRC_OVER); /*menu*/
} }
else else
{ {
...@@ -3572,7 +3590,7 @@ void GUI_BG_RepSetMenu_3_7_Display(uint8_t Mode) ...@@ -3572,7 +3590,7 @@ void GUI_BG_RepSetMenu_3_7_Display(uint8_t Mode)
{ {
if (Mode == GUI_DISP_MODE_NORMAL) if (Mode == GUI_DISP_MODE_NORMAL)
{ {
//GUI_General_Display(MENU_Sprite, CN_User_Menu3_01_16, GUI_BLENDMODE_SRC_OVER); /*menu*/ // GUI_General_Display(MENU_Sprite, CN_User_Menu3_01_16, GUI_BLENDMODE_SRC_OVER); /*menu*/
} }
else else
{ {
...@@ -3613,7 +3631,7 @@ void GUI_BG_UserSet_Date_Display(uint8_t Mode) ...@@ -3613,7 +3631,7 @@ void GUI_BG_UserSet_Date_Display(uint8_t Mode)
{ {
uint8_t YEAR_Value = 0u; uint8_t YEAR_Value = 0u;
uint8_t MOnth_Value = 0u; uint8_t MOnth_Value = 0u;
uint8_t Data_Value = 0u; uint8_t Data_Value = 0u;
if (Mode == GUI_DISP_MODE_NORMAL) if (Mode == GUI_DISP_MODE_NORMAL)
{ {
...@@ -3641,7 +3659,7 @@ void GUI_BG_UserSet_Date_Display(uint8_t Mode) ...@@ -3641,7 +3659,7 @@ void GUI_BG_UserSet_Date_Display(uint8_t Mode)
GUI_Translate_Display(MENU_Sprite, CN_User_Menu3_03_yellowkuang, 541u, 214u, GUI_BLENDMODE_SRC_OVER); GUI_Translate_Display(MENU_Sprite, CN_User_Menu3_03_yellowkuang, 541u, 214u, GUI_BLENDMODE_SRC_OVER);
break; break;
default : default:
break; break;
} }
...@@ -3673,7 +3691,7 @@ void GUI_BG_UserSet_Time_Display(uint8_t Mode) ...@@ -3673,7 +3691,7 @@ void GUI_BG_UserSet_Time_Display(uint8_t Mode)
if (Mode == GUI_DISP_MODE_NORMAL) if (Mode == GUI_DISP_MODE_NORMAL)
{ {
GUI_Translate_Display(MENU_Sprite, Nb_20_maohao, 440u, 218u, GUI_BLENDMODE_SRC_OVER);/*冒号*/ GUI_Translate_Display(MENU_Sprite, Nb_20_maohao, 440u, 218u, GUI_BLENDMODE_SRC_OVER); /*冒号*/
switch (bCurMenuIDX) switch (bCurMenuIDX)
{ {
...@@ -3756,7 +3774,7 @@ void GUI_BG_UserSet_SYSD_Display(uint8_t Mode) ...@@ -3756,7 +3774,7 @@ void GUI_BG_UserSet_SYSD_Display(uint8_t Mode)
{ {
GUI_General_Display(MENU_Sprite, CN_User_Menu3_03_wenzi, GUI_BLENDMODE_SRC_OVER); /*menu*/ GUI_General_Display(MENU_Sprite, CN_User_Menu3_03_wenzi, GUI_BLENDMODE_SRC_OVER); /*menu*/
GUI_General_Display(MENU_Sprite, CN_fengexian, GUI_BLENDMODE_SRC_OVER); /*line*/ GUI_General_Display(MENU_Sprite, CN_fengexian, GUI_BLENDMODE_SRC_OVER); /*line*/
GUI_General_Display(MENU_Sprite, CN_gundongtiao, GUI_BLENDMODE_SRC_OVER); /*长度条*/ GUI_General_Display(MENU_Sprite, CN_gundongtiao, GUI_BLENDMODE_SRC_OVER); /*长度条*/
if (bCurMenuIDX <= _MN_DSP_LEVEL3_4_MENU_44) if (bCurMenuIDX <= _MN_DSP_LEVEL3_4_MENU_44)
{ {
...@@ -3777,13 +3795,13 @@ void GUI_BG_UserSet_SYSD_Display(uint8_t Mode) ...@@ -3777,13 +3795,13 @@ void GUI_BG_UserSet_SYSD_Display(uint8_t Mode)
GUI_Translate_Display(MENU_Sprite, CN_User_Menu3_03_10white, 225u, GUI_DISP_MENU_Y[3u], GUI_BLENDMODE_SRC_OVER); GUI_Translate_Display(MENU_Sprite, CN_User_Menu3_03_10white, 225u, GUI_DISP_MENU_Y[3u], GUI_BLENDMODE_SRC_OVER);
} }
} }
else if (bCurMenuIDX == _MN_DSP_LEVEL3_4_MENU_45) else if (bCurMenuIDX == _MN_DSP_LEVEL3_4_MENU_45)
{ {
GUI_Translate_Display(MENU_Sprite, CN_User_Menu3_03_8white, 225u, GUI_DISP_MENU_Y[0u], GUI_BLENDMODE_SRC_OVER); GUI_Translate_Display(MENU_Sprite, CN_User_Menu3_03_8white, 225u, GUI_DISP_MENU_Y[0u], GUI_BLENDMODE_SRC_OVER);
GUI_Translate_Display(MENU_Sprite, CN_User_Menu3_03_9white, 225u, GUI_DISP_MENU_Y[1u], GUI_BLENDMODE_SRC_OVER); GUI_Translate_Display(MENU_Sprite, CN_User_Menu3_03_9white, 225u, GUI_DISP_MENU_Y[1u], GUI_BLENDMODE_SRC_OVER);
GUI_Translate_Display(MENU_Sprite, CN_User_Menu3_03_10white, 225u, GUI_DISP_MENU_Y[2u], GUI_BLENDMODE_SRC_OVER); GUI_Translate_Display(MENU_Sprite, CN_User_Menu3_03_10white, 225u, GUI_DISP_MENU_Y[2u], GUI_BLENDMODE_SRC_OVER);
} }
else if (bCurMenuIDX == _MN_DSP_LEVEL3_4_MENU_46) else if (bCurMenuIDX == _MN_DSP_LEVEL3_4_MENU_46)
{ {
GUI_Translate_Display(MENU_Sprite, CN_User_Menu3_03_9white, 225u, GUI_DISP_MENU_Y[0u], GUI_BLENDMODE_SRC_OVER); GUI_Translate_Display(MENU_Sprite, CN_User_Menu3_03_9white, 225u, GUI_DISP_MENU_Y[0u], GUI_BLENDMODE_SRC_OVER);
GUI_Translate_Display(MENU_Sprite, CN_User_Menu3_03_10white, 225u, GUI_DISP_MENU_Y[1u], GUI_BLENDMODE_SRC_OVER); GUI_Translate_Display(MENU_Sprite, CN_User_Menu3_03_10white, 225u, GUI_DISP_MENU_Y[1u], GUI_BLENDMODE_SRC_OVER);
...@@ -3949,7 +3967,6 @@ void GUI_BG_UserSet_SYSD_7_Display(uint8_t Mode) ...@@ -3949,7 +3967,6 @@ void GUI_BG_UserSet_SYSD_7_Display(uint8_t Mode)
} }
} }
/*-------------------------------------------------------------------------- /*--------------------------------------------------------------------------
* Function Name : GUI_BG_UserSet_SYSD_7_Display * Function Name : GUI_BG_UserSet_SYSD_7_Display
* Description : * Description :
...@@ -3962,10 +3979,10 @@ void GUI_BG_TPMS_PictureSet_Display(uint8_t Mode) ...@@ -3962,10 +3979,10 @@ void GUI_BG_TPMS_PictureSet_Display(uint8_t Mode)
{ {
if (Mode == GUI_DISP_MODE_NORMAL) if (Mode == GUI_DISP_MODE_NORMAL)
{ {
GUI_General_Display(MENU_Sprite, CN_User_Menu3_03_che, GUI_BLENDMODE_SRC_OVER);/*车*/ GUI_General_Display(MENU_Sprite, CN_User_Menu3_03_che, GUI_BLENDMODE_SRC_OVER); /*车*/
/*0x12*/ /*0x12*/
GUI_General_Display(MENU_Sprite, CN_User_Menu3_03_0x12, GUI_BLENDMODE_SRC_OVER);/*0x12*/ GUI_General_Display(MENU_Sprite, CN_User_Menu3_03_0x12, GUI_BLENDMODE_SRC_OVER); /*0x12*/
if (User_set_Num.User_Tpms == 1u) if (User_set_Num.User_Tpms == 1u)
{ {
...@@ -4011,7 +4028,7 @@ void GUI_BG_TPMS_PictureSet_Display(uint8_t Mode) ...@@ -4011,7 +4028,7 @@ void GUI_BG_TPMS_PictureSet_Display(uint8_t Mode)
} }
/*0x13*/ /*0x13*/
GUI_General_Display(MENU_Sprite, CN_User_Menu3_03_0x13, GUI_BLENDMODE_SRC_OVER);/*0x13*/ GUI_General_Display(MENU_Sprite, CN_User_Menu3_03_0x13, GUI_BLENDMODE_SRC_OVER); /*0x13*/
if (User_set_Num.User_Tpms == 2u) if (User_set_Num.User_Tpms == 2u)
{ {
...@@ -4057,7 +4074,7 @@ void GUI_BG_TPMS_PictureSet_Display(uint8_t Mode) ...@@ -4057,7 +4074,7 @@ void GUI_BG_TPMS_PictureSet_Display(uint8_t Mode)
} }
/*0x22*/ /*0x22*/
GUI_General_Display(MENU_Sprite, CN_User_Menu3_03_0x22, GUI_BLENDMODE_SRC_OVER);/*0x22*/ GUI_General_Display(MENU_Sprite, CN_User_Menu3_03_0x22, GUI_BLENDMODE_SRC_OVER); /*0x22*/
if (User_set_Num.User_Tpms == 3u) if (User_set_Num.User_Tpms == 3u)
{ {
...@@ -4103,7 +4120,7 @@ void GUI_BG_TPMS_PictureSet_Display(uint8_t Mode) ...@@ -4103,7 +4120,7 @@ void GUI_BG_TPMS_PictureSet_Display(uint8_t Mode)
} }
/*0x23*/ /*0x23*/
GUI_General_Display(MENU_Sprite, CN_User_Menu3_03_0x23, GUI_BLENDMODE_SRC_OVER);/*0x23*/ GUI_General_Display(MENU_Sprite, CN_User_Menu3_03_0x23, GUI_BLENDMODE_SRC_OVER); /*0x23*/
if (User_set_Num.User_Tpms == 4u) if (User_set_Num.User_Tpms == 4u)
{ {
...@@ -4149,7 +4166,7 @@ void GUI_BG_TPMS_PictureSet_Display(uint8_t Mode) ...@@ -4149,7 +4166,7 @@ void GUI_BG_TPMS_PictureSet_Display(uint8_t Mode)
} }
/*0x31*/ /*0x31*/
GUI_General_Display(MENU_Sprite, CN_User_Menu3_03_0x31, GUI_BLENDMODE_SRC_OVER);/*0x31*/ GUI_General_Display(MENU_Sprite, CN_User_Menu3_03_0x31, GUI_BLENDMODE_SRC_OVER); /*0x31*/
if (User_set_Num.User_Tpms == 5u) if (User_set_Num.User_Tpms == 5u)
{ {
...@@ -4195,7 +4212,7 @@ void GUI_BG_TPMS_PictureSet_Display(uint8_t Mode) ...@@ -4195,7 +4212,7 @@ void GUI_BG_TPMS_PictureSet_Display(uint8_t Mode)
} }
/*0x32*/ /*0x32*/
GUI_General_Display(MENU_Sprite, CN_User_Menu3_03_0x32, GUI_BLENDMODE_SRC_OVER);/*0x32*/ GUI_General_Display(MENU_Sprite, CN_User_Menu3_03_0x32, GUI_BLENDMODE_SRC_OVER); /*0x32*/
if (User_set_Num.User_Tpms == 6u) if (User_set_Num.User_Tpms == 6u)
{ {
...@@ -4241,7 +4258,7 @@ void GUI_BG_TPMS_PictureSet_Display(uint8_t Mode) ...@@ -4241,7 +4258,7 @@ void GUI_BG_TPMS_PictureSet_Display(uint8_t Mode)
} }
/*0x33*/ /*0x33*/
GUI_General_Display(MENU_Sprite, CN_User_Menu3_03_0x33, GUI_BLENDMODE_SRC_OVER);/*0x33*/ GUI_General_Display(MENU_Sprite, CN_User_Menu3_03_0x33, GUI_BLENDMODE_SRC_OVER); /*0x33*/
if (User_set_Num.User_Tpms == 7u) if (User_set_Num.User_Tpms == 7u)
{ {
...@@ -4287,7 +4304,7 @@ void GUI_BG_TPMS_PictureSet_Display(uint8_t Mode) ...@@ -4287,7 +4304,7 @@ void GUI_BG_TPMS_PictureSet_Display(uint8_t Mode)
} }
/*0x34*/ /*0x34*/
GUI_General_Display(MENU_Sprite, CN_User_Menu3_03_0x34, GUI_BLENDMODE_SRC_OVER);/*0x34*/ GUI_General_Display(MENU_Sprite, CN_User_Menu3_03_0x34, GUI_BLENDMODE_SRC_OVER); /*0x34*/
if (User_set_Num.User_Tpms == 8u) if (User_set_Num.User_Tpms == 8u)
{ {
...@@ -4333,7 +4350,7 @@ void GUI_BG_TPMS_PictureSet_Display(uint8_t Mode) ...@@ -4333,7 +4350,7 @@ void GUI_BG_TPMS_PictureSet_Display(uint8_t Mode)
} }
/*0x41*/ /*0x41*/
GUI_General_Display(MENU_Sprite, CN_User_Menu3_03_0x41, GUI_BLENDMODE_SRC_OVER);/*0x41*/ GUI_General_Display(MENU_Sprite, CN_User_Menu3_03_0x41, GUI_BLENDMODE_SRC_OVER); /*0x41*/
if (User_set_Num.User_Tpms == 9u) if (User_set_Num.User_Tpms == 9u)
{ {
...@@ -4379,7 +4396,7 @@ void GUI_BG_TPMS_PictureSet_Display(uint8_t Mode) ...@@ -4379,7 +4396,7 @@ void GUI_BG_TPMS_PictureSet_Display(uint8_t Mode)
} }
/*0x42*/ /*0x42*/
GUI_General_Display(MENU_Sprite, CN_User_Menu3_03_0x42, GUI_BLENDMODE_SRC_OVER);/*0x42*/ GUI_General_Display(MENU_Sprite, CN_User_Menu3_03_0x42, GUI_BLENDMODE_SRC_OVER); /*0x42*/
if (User_set_Num.User_Tpms == 10u) if (User_set_Num.User_Tpms == 10u)
{ {
...@@ -4425,7 +4442,7 @@ void GUI_BG_TPMS_PictureSet_Display(uint8_t Mode) ...@@ -4425,7 +4442,7 @@ void GUI_BG_TPMS_PictureSet_Display(uint8_t Mode)
} }
/*0x43*/ /*0x43*/
GUI_General_Display(MENU_Sprite, CN_User_Menu3_03_0x43, GUI_BLENDMODE_SRC_OVER);/*0x43*/ GUI_General_Display(MENU_Sprite, CN_User_Menu3_03_0x43, GUI_BLENDMODE_SRC_OVER); /*0x43*/
if (User_set_Num.User_Tpms == 11u) if (User_set_Num.User_Tpms == 11u)
{ {
...@@ -4471,7 +4488,7 @@ void GUI_BG_TPMS_PictureSet_Display(uint8_t Mode) ...@@ -4471,7 +4488,7 @@ void GUI_BG_TPMS_PictureSet_Display(uint8_t Mode)
} }
/*0x44*/ /*0x44*/
GUI_General_Display(MENU_Sprite, CN_User_Menu3_03_0x44, GUI_BLENDMODE_SRC_OVER);/*0x44*/ GUI_General_Display(MENU_Sprite, CN_User_Menu3_03_0x44, GUI_BLENDMODE_SRC_OVER); /*0x44*/
if (User_set_Num.User_Tpms == 12u) if (User_set_Num.User_Tpms == 12u)
{ {
...@@ -4521,7 +4538,6 @@ void GUI_BG_TPMS_PictureSet_Display(uint8_t Mode) ...@@ -4521,7 +4538,6 @@ void GUI_BG_TPMS_PictureSet_Display(uint8_t Mode)
{ {
GUI_General_Display(MENU_Sprite, SpriteSize, GUI_BLENDMODE_SRC_OVER); GUI_General_Display(MENU_Sprite, SpriteSize, GUI_BLENDMODE_SRC_OVER);
} }
} }
else else
{ {
...@@ -4529,25 +4545,6 @@ void GUI_BG_TPMS_PictureSet_Display(uint8_t Mode) ...@@ -4529,25 +4545,6 @@ void GUI_BG_TPMS_PictureSet_Display(uint8_t Mode)
} }
} }
/*-------------------------------------------------------------------------- /*--------------------------------------------------------------------------
* Function Name : GUI_BG_Enter_Return_Display * Function Name : GUI_BG_Enter_Return_Display
* Description : * Description :
......
source/Application/Graphic/GUI/GUI.h
View file @ 649b6b58
...@@ -6,8 +6,8 @@ ...@@ -6,8 +6,8 @@
#include "images.h" #include "images.h"
#include "TYW_stdint.h" #include "TYW_stdint.h"
#define Language_En 0u #define Language_En 0u
#define Language_Cn 1u #define Language_Cn 1u
typedef struct typedef struct
{ {
...@@ -63,65 +63,64 @@ typedef struct ...@@ -63,65 +63,64 @@ typedef struct
extern volatile _Display_State_Flag State_Flag; extern volatile _Display_State_Flag State_Flag;
typedef struct typedef struct
{ {
uint16_t Year ; uint16_t Year;
uint8_t Month ; uint8_t Month;
uint8_t Date ; uint8_t Date;
uint8_t Hour ; uint8_t Hour;
uint8_t Minute ; uint8_t Minute;
uint8_t SetDate ; /* 设置日期标识*/ uint8_t SetDate; /* 设置日期标识*/
uint8_t SetTime ; /* 设置解耦睡觉哦考吗脑婆睡觉哦*/ uint8_t SetTime; /* 设置解耦睡觉哦考吗脑婆睡觉哦*/
uint8_t Language ; /* 当前语言标识*/ uint8_t Language; /* 当前语言标识*/
uint8_t LeapYear ; /* 设置闰年标识*/ uint8_t LeapYear; /* 设置闰年标识*/
uint8_t User_Gsl ; /* 速度设定-高速路*/ uint8_t User_Gsl; /* 速度设定-高速路*/
uint8_t User_Ybl ; /* 速度设定-一般路*/ uint8_t User_Ybl; /* 速度设定-一般路*/
uint8_t User_Speed ; /* 发动机转速设定*/ uint8_t User_Speed; /* 发动机转速设定*/
uint8_t User_JADD ; /* 急加速设定*/ uint8_t User_JADD; /* 急加速设定*/
uint8_t User_JSUB ; /* 急减速设定*/ uint8_t User_JSUB; /* 急减速设定*/
uint8_t User_Date ; /* 日期设置格式切换标识*/ uint8_t User_Date; /* 日期设置格式切换标识*/
uint8_t User_Time ; /* 时间设置格式切换标识*/ uint8_t User_Time; /* 时间设置格式切换标识*/
uint8_t Date_Time ; /* 显示时间日期标识*/ uint8_t Date_Time; /* 显示时间日期标识*/
uint8_t Date_Format ; /* 显示日期格式标识*/ uint8_t Date_Format; /* 显示日期格式标识*/
uint8_t Time_Format ; /* 显示时间格式标识*/ uint8_t Time_Format; /* 显示时间格式标识*/
uint8_t User_HSASET ; /* HSA调整*/ uint8_t User_HSASET; /* HSA调整*/
uint8_t User_Language; /* 语言设置*/ uint8_t User_Language; /* 语言设置*/
uint8_t User_Company ; /* 单位设定*/ uint8_t User_Company; /* 单位设定*/
uint8_t User_Light ; /* 亮度调节*/ uint8_t User_Light; /* 亮度调节*/
uint8_t User_CarJL ; /* 车间距离报警*/ uint8_t User_CarJL; /* 车间距离报警*/
uint32_t User_FDJYLQQ ; /* 发送机油 0 未设定 1-50000 数值*/ uint32_t User_FDJYLQQ; /* 发送机油 0 未设定 1-50000 数值*/
uint32_t User_RYLQQ ; /* 燃油滤清器 0 未设定 1-50000 数值*/ uint32_t User_RYLQQ; /* 燃油滤清器 0 未设定 1-50000 数值*/
uint32_t User_BSXY ; /* 变速箱油 */ uint32_t User_BSXY; /* 变速箱油 */
uint32_t User_CSQY ; /* 差速器油*/ uint32_t User_CSQY; /* 差速器油*/
uint32_t User_KQGZJ ; /* 空气干燥剂*/ uint32_t User_KQGZJ; /* 空气干燥剂*/
uint32_t User_DLZXY ; /* 动力转向油*/ uint32_t User_DLZXY; /* 动力转向油*/
uint32_t User_LT ; /* 轮胎*/ uint32_t User_LT; /* 轮胎*/
uint32_t User_QDJ ; /* 起动机*/ uint32_t User_QDJ; /* 起动机*/
uint8_t User_Tpms ; /* 当前是哪个轮子 0-12*/ uint8_t User_Tpms; /* 当前是哪个轮子 0-12*/
uint8_t User_TpmsStatus; /* 当前胎压匹配界面 0 胎压未配置状态， 1 轮胎选中界面， 2 轮胎正在配置*/ uint8_t User_TpmsStatus; /* 当前胎压匹配界面 0 胎压未配置状态， 1 轮胎选中界面， 2 轮胎正在配置*/
uint8_t User_Temp_Return; /* 取消胎压配置 0 1 取消配对标记*/ uint8_t User_Temp_Return; /* 取消胎压配置 0 1 取消配对标记*/
uint8_t User_TpmsSend; /* 胎压匹配报文发送请求次数3 0 不发*/ uint8_t User_TpmsSend; /* 胎压匹配报文发送请求次数3 0 不发*/
} _UserSet; } _UserSet;
extern _UserSet User_set_Num; extern _UserSet User_set_Num;
extern _UserSet User_App; extern _UserSet User_App;
typedef struct typedef struct
{ {
uint8_t T01 ; uint8_t T01;
uint8_t T02 ; uint8_t T02;
uint8_t T03 ; uint8_t T03;
uint8_t T04 ; uint8_t T04;
uint8_t T05 ; uint8_t T05;
uint8_t T06 ; uint8_t T06;
uint8_t T07 ; uint8_t T07;
uint8_t T08 ; uint8_t T08;
uint8_t T09 ; uint8_t T09;
uint8_t T10 ; uint8_t T10;
uint8_t T11 ; uint8_t T11;
uint8_t T12 ; uint8_t T12;
uint8_t FLAG ; uint8_t FLAG;
} _TPMS; } _TPMS;
extern _TPMS TPMS_Matching; extern _TPMS TPMS_Matching;
static const uint32_t GUIWedk[7u] = {CN_xingqiyi, CN_xingqier, CN_xingqisan, CN_xingqisi, CN_xingqiwu, CN_xingqiliu, CN_xingqiri}; static const uint32_t GUIWedk[7u] = {CN_xingqiyi, CN_xingqier, CN_xingqisan, CN_xingqisi, CN_xingqiwu, CN_xingqiliu, CN_xingqiri};
static const uint32_t GUIMenuWedk[7u] = {CN_Mon, CN_Tue, CN_Wed, CN_Thu, CN_Fri, CN_Sat, CN_ri}; static const uint32_t GUIMenuWedk[7u] = {CN_Mon, CN_Tue, CN_Wed, CN_Thu, CN_Fri, CN_Sat, CN_ri};
...@@ -261,17 +260,16 @@ void GUI_BG_RepSetMenu_3_7_Display(uint8_t Mode); /**/ ...@@ -261,17 +260,16 @@ void GUI_BG_RepSetMenu_3_7_Display(uint8_t Mode); /**/
void GUI_BG_UserSet_Display(uint8_t Mode); /**/ void GUI_BG_UserSet_Display(uint8_t Mode); /**/
void GUI_BG_UserSet_Date_Display(uint8_t Mode); /**/ void GUI_BG_UserSet_Date_Display(uint8_t Mode); /**/
void GUI_BG_UserSet_Time_Display(uint8_t Mode); /**/ void GUI_BG_UserSet_Time_Display(uint8_t Mode); /**/
void GUI_BG_UserSet_Language_Display(uint8_t Mode); /*语言设定*/ void GUI_BG_UserSet_Language_Display(uint8_t Mode); /*语言设定*/
void GUI_BG_UserSet_SYSD_Display(uint8_t Mode); /*省油设置*/ void GUI_BG_UserSet_SYSD_Display(uint8_t Mode); /*省油设置*/
void GUI_BG_UserSet_SYSD_1_Display(uint8_t Mode); /**/ void GUI_BG_UserSet_SYSD_1_Display(uint8_t Mode); /**/
void GUI_BG_UserSet_SYSD_2_Display(uint8_t Mode); /**/ void GUI_BG_UserSet_SYSD_2_Display(uint8_t Mode); /**/
void GUI_BG_UserSet_SYSD_3_Display(uint8_t Mode); /**/ void GUI_BG_UserSet_SYSD_3_Display(uint8_t Mode); /**/
void GUI_BG_UserSet_SYSD_4_Display(uint8_t Mode); /**/ void GUI_BG_UserSet_SYSD_4_Display(uint8_t Mode); /**/
void GUI_BG_UserSet_SYSD_5_Display(uint8_t Mode); /**/ void GUI_BG_UserSet_SYSD_5_Display(uint8_t Mode); /**/
void GUI_BG_UserSet_SYSD_6_Display(uint8_t Mode); /**/ void GUI_BG_UserSet_SYSD_6_Display(uint8_t Mode); /**/
void GUI_BG_UserSet_SYSD_7_Display(uint8_t Mode); /**/ void GUI_BG_UserSet_SYSD_7_Display(uint8_t Mode); /**/
void GUI_BG_TPMS_PictureSet_Display(uint8_t Mode);/**/ void GUI_BG_TPMS_PictureSet_Display(uint8_t Mode); /**/
void GUI_BG_Enter_Return_Display(uint8_t Mode); /**/ void GUI_BG_Enter_Return_Display(uint8_t Mode); /**/
......
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