Skip to content

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

调整GUI新版数字显示

parent 72e115d2
Hide whitespace changes
Inline Side-by-side
Showing with 74 additions and 31 deletions
source/Application/APP/Data_TPMS/Service_TPMS.c
View file @ 1687e182
......@@ -391,7 +391,7 @@ uint8_t Get_DataTPMS_SensorErrorWarningSig_Value(TPMSNUM_t TPMSTyreID)
/******************************************************************************
Function：
Description：获取某个编号轮胎压力报警
Description：获取某个编号轮胎压力报警状态
Input:输入枚举编号
Output:
******************************************************************************/
......@@ -418,6 +418,12 @@ uint8_t Get_TPMSPresure_Alarm(TPMSNUM_t TPMSTyreID)
return Ret;
}
/******************************************************************************
Function： Get_TPMSLow_Presure_Sta
Description：获取所有轮胎胎压低状态
Input:
Output:
******************************************************************************/
uint8_t Get_TPMSLow_Presure_Sta(void)
{
uint8_t Low_Presure = 0u;
......@@ -445,6 +451,12 @@ uint8_t Get_TPMSLow_Presure_Sta(void)
return Low_Presure;
}
/******************************************************************************
Function： Get_TPMSHigh_Presure_Sta
Description：获取所有轮胎胎压高状态
Input:
Output:
******************************************************************************/
uint8_t Get_TPMSHigh_Presure_Sta(void)
{
uint8_t High_Presure = 8u;
......@@ -472,6 +484,12 @@ uint8_t Get_TPMSHigh_Presure_Sta(void)
return High_Presure;
}
/******************************************************************************
Function： Get_TPMSHigh_Temperature_Sta
Description：获取所有轮胎胎温高状态
Input:
Output:
******************************************************************************/
uint8_t Get_TPMSHigh_Temperature_Sta(void)
{
uint8_t High_Temperature = 0u;
......@@ -499,6 +517,12 @@ uint8_t Get_TPMSHigh_Temperature_Sta(void)
return High_Temperature ;
}
/******************************************************************************
Function： Get_TPMSFast_air_leakage
Description：
Input:
Output:
******************************************************************************/
uint8_t Get_TPMSFast_air_leakage(void)
{
uint8_t Fast_air_leakage = 0u;
......@@ -526,6 +550,13 @@ uint8_t Get_TPMSFast_air_leakage(void)
return Fast_air_leakage ;
}
/******************************************************************************
Function： Get_TPMSLow_Voltage_Sta
Description：
Input:
Output:
******************************************************************************/
uint8_t Get_TPMSLow_Voltage_Sta(void)
{
uint8_t Low_Voltage = 0x00u;
......@@ -553,6 +584,12 @@ uint8_t Get_TPMSLow_Voltage_Sta(void)
return Low_Voltage ;
}
/******************************************************************************
Function： Get_TPMSNo_signal_Sta
Description：
Input:
Output:
******************************************************************************/
uint8_t Get_TPMSNo_signal_Sta(void)
{
uint8_t No_signal = 0x00u;
......@@ -580,6 +617,12 @@ uint8_t Get_TPMSNo_signal_Sta(void)
return No_signal;
}
/******************************************************************************
Function： Get_TPMSSensor_fault_Sta
Description：
Input:
Output:
******************************************************************************/
uint8_t Get_TPMSSensor_fault_Sta(void)
{
uint8_t Sensor_fault = 0x00u;
......
source/Application/Graphic/GUI/GUI.c
View file @ 1687e182
......@@ -311,20 +311,20 @@ void GUI_Time_Dispaly(uint8_t Mode)
{
if (Time_Hours == 0)
{
GUI_General_Digit_Display(Time_Sprite, (Time_Hours + 12u), Nb_21_0, 2u, 1u, GUI_DISP_Hours, 37, GUI_BLENDMODE_SRC_OVER);
GUI_General_Digit_Display(Time_Sprite, (Time_Hours + 12u), CN_RC_Nb_21_0, 2u, 1u, GUI_DISP_Hours, 37, GUI_BLENDMODE_SRC_OVER);
}
else if (Time_Hours > 12u)
{
GUI_General_Digit_Display(Time_Sprite, (Time_Hours - 12u), Nb_21_0, 2u, 1u, GUI_DISP_Hours, 37, GUI_BLENDMODE_SRC_OVER); /* PM */
GUI_General_Digit_Display(Time_Sprite, (Time_Hours - 12u), CN_RC_Nb_21_0, 2u, 1u, GUI_DISP_Hours, 37, GUI_BLENDMODE_SRC_OVER); /* PM */
}
else
{
GUI_General_Digit_Display(Time_Sprite, Time_Hours, Nb_21_0, 2u, 1u, GUI_DISP_Hours, 37, GUI_BLENDMODE_SRC_OVER); /* AM */
GUI_General_Digit_Display(Time_Sprite, Time_Hours, CN_RC_Nb_21_0, 2u, 1u, GUI_DISP_Hours, 37, GUI_BLENDMODE_SRC_OVER); /* AM */
}
}
else
{
GUI_General_Digit_Display(Time_Sprite, Time_Hours, Nb_21_0, 2u, 0u, GUI_DISP_Hours, 37, GUI_BLENDMODE_SRC_OVER); /*显示小时*/
GUI_General_Digit_Display(Time_Sprite, Time_Hours, CN_RC_Nb_21_0, 2u, 0u, GUI_DISP_Hours, 37, GUI_BLENDMODE_SRC_OVER); /*显示小时*/
}
/*分钟*/
......@@ -339,7 +339,7 @@ void GUI_Time_Dispaly(uint8_t Mode)
Time_Minutes = Get_RTC_MINUTE();
GUI_General_Digit_Display(Time_Sprite, Time_Minutes, Nb_21_0, 2u, 0u, GUI_DISP_Minutes, 37, GUI_BLENDMODE_SRC_OVER); /*显示分钟*/
GUI_General_Digit_Display(Time_Sprite, Time_Minutes, CN_RC_Nb_21_0, 2u, 0u, GUI_DISP_Minutes, 37, GUI_BLENDMODE_SRC_OVER); /*显示分钟*/
}
else
......@@ -373,9 +373,9 @@ void GUI_Data_Dispaly(uint8_t Mode)
GUI_Translate_Display(Calendar_Sprite, Nb_14_dian, 591u, 64u, GUI_BLENDMODE_SRC_OVER); /*显示年份后面的 “ . ” */
GUI_Translate_Display(Calendar_Sprite, Nb_14_dian, 642u, 64u, GUI_BLENDMODE_SRC_OVER); /*显示月份后面的 “ . ” */
GUI_General_Digit_Display(Calendar_Sprite, Year, Nb_14_0, 4u, 0u, GUI_DISP_Year, 48, GUI_BLENDMODE_SRC_OVER); /*显示年*/
GUI_General_Digit_Display(Calendar_Sprite, Month, Nb_14_0, 2u, 0u, GUI_DISP_Month, 48, GUI_BLENDMODE_SRC_OVER); /*显示月*/
GUI_General_Digit_Display(Calendar_Sprite, Date, Nb_14_0, 2u, 0u, GUI_DISP_Date, 48, GUI_BLENDMODE_SRC_OVER); /*显示日*/
GUI_General_Digit_Display(Calendar_Sprite, Year, CN_RC_Nb_14_0, 4u, 0u, GUI_DISP_Year, 48, GUI_BLENDMODE_SRC_OVER); /*显示年*/
GUI_General_Digit_Display(Calendar_Sprite, Month, CN_RC_Nb_14_0, 2u, 0u, GUI_DISP_Month, 48, GUI_BLENDMODE_SRC_OVER); /*显示月*/
GUI_General_Digit_Display(Calendar_Sprite, Date, CN_RC_Nb_14_0, 2u, 0u, GUI_DISP_Date, 48, GUI_BLENDMODE_SRC_OVER); /*显示日*/
GUI_General_Display(Calendar_Sprite, GUIWedk[Week], GUI_BLENDMODE_SRC_OVER); /*星期 */
}
......@@ -640,7 +640,7 @@ void Gui_TRIPA_Display(uint8_t Mode)
GUI_Translate_Display(TRIP_Sprite, Nb_19_dian, 668u, 410u, GUI_BLENDMODE_SRC_OVER); /*显示 小数点*/
/*显示 TRIP A 的数值*/
GUI_General_Digit_Display(TRIP_Sprite, TRIPA_value, Nb_19_0, 5u, 3u, GUI_DISP_TRIPA, 389, GUI_BLENDMODE_SRC_OVER);
GUI_General_Digit_Display(TRIP_Sprite, TRIPA_value, CN_RC_Nb_19_0, 5u, 3u, GUI_DISP_TRIPA, 389, GUI_BLENDMODE_SRC_OVER);
GUI_Translate_Display(TRIP_Sprite, CN_ODO_danwei, 699u, 400u, GUI_BLENDMODE_SRC_OVER); /*显示文字 “ km ”*/
}
......@@ -664,7 +664,7 @@ void Gui_TRIPB_Display(uint8_t Mode)
GUI_Translate_Display(TRIP_Sprite, Nb_19_dian, 668u, 410u, GUI_BLENDMODE_SRC_OVER); /*显示 小数点*/
/*显示 TRIP B 的数值*/
GUI_General_Digit_Display(TRIP_Sprite, TRIPB_value, Nb_19_0, 5u, 3u, GUI_DISP_TRIPA, 389, GUI_BLENDMODE_SRC_OVER);
GUI_General_Digit_Display(TRIP_Sprite, TRIPB_value, CN_RC_Nb_19_0, 5u, 3u, GUI_DISP_TRIPA, 389, GUI_BLENDMODE_SRC_OVER);
GUI_Translate_Display(TRIP_Sprite, CN_ODO_danwei, 699u, 400u, GUI_BLENDMODE_SRC_OVER); /*显示文字 “ km ”*/
}
......@@ -692,7 +692,7 @@ void Gui_ODO_Display(uint8_t Mode)
GUI_General_Display(ODO_Sprite, CN_ODO, GUI_BLENDMODE_SRC_OVER); /*显示文/*字 “ ODO ”*/
GUI_Translate_Display(ODO_Sprite, CN_ODO_danwei, 699u, 436u, GUI_BLENDMODE_SRC_OVER); /*显示文字 “ km ”*/
GUI_General_Digit_Display(ODO_Sprite, ODO_value, Nb_19_0, 7u, 6u, GUI_DISP_ODO, 425u, GUI_BLENDMODE_SRC_OVER); /*显示ODO的数值*/
GUI_General_Digit_Display(ODO_Sprite, ODO_value, CN_RC_Nb_19_0, 7u, 6u, GUI_DISP_ODO, 425u, GUI_BLENDMODE_SRC_OVER); /*显示ODO的数值*/
}
else
{
......@@ -1041,7 +1041,7 @@ void Gui_DrivingSupport_Display(uint8_t Mode)
else if (Var_SpeedValue <= 250u)
{
/*显示文字 “ km/h ”*/
GUI_General_Digit_Display(Cruise_Sprite, Var_SpeedValue, Nb_21_0, 3u, 2u, GUI_DISP_DrivingSupport, 104u, GUI_BLENDMODE_SRC_OVER); /*显示 定速巡航设定车速 的数值*/
GUI_General_Digit_Display(Cruise_Sprite, Var_SpeedValue, CN_RC_Nb_21_0, 3u, 2u, GUI_DISP_DrivingSupport, 104u, GUI_BLENDMODE_SRC_OVER); /*显示 定速巡航设定车速 的数值*/
GUI_General_Display(Cruise_Sprite, CN_dingsuxunhangdanwei, GUI_BLENDMODE_SRC_OVER);
}
else
......@@ -1262,7 +1262,7 @@ void GUI_Drive_Info_Avg_Speed_Display(uint16_t Speed)
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), CN_RC_Nb_21_0, 4u, 3u, GUIBGAVGSpeedPosX, 305u, GUI_BLENDMODE_SRC_OVER);
}
else
{
......@@ -1276,7 +1276,7 @@ void GUI_Drive_Info_Avg_Speed_Display(uint16_t Speed)
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), CN_RC_Nb_21_0, 4u, 3u, GUIBGAVGSpeedPosX, 305u, GUI_BLENDMODE_SRC_OVER);
}
else
{
......@@ -1339,7 +1339,7 @@ void GUI_Drive_Info_Avg_Fuel_Display(uint16_t Fuel)
if (AVGFuel > 1000u)
{
GUI_General_Digit_Display(MultiPurpose_Sprite, (1000000u / AVGFuel), Nb_21_0, 4u, 2u, GUIBGAVGFuelPosX, 262u, GUI_BLENDMODE_SRC_OVER);
GUI_General_Digit_Display(MultiPurpose_Sprite, (1000000u / AVGFuel), CN_RC_Nb_21_0, 4u, 2u, GUIBGAVGFuelPosX, 262u, GUI_BLENDMODE_SRC_OVER);
}
else
{
......@@ -1354,7 +1354,7 @@ void GUI_Drive_Info_Avg_Fuel_Display(uint16_t Fuel)
if (AVGFuel > 1000u)
{
GUI_General_Digit_Display(MultiPurpose_Sprite, (1000000u / AVGFuel), Nb_21_0, 4u, 2u, GUIBGAVGFuelPosX, 262u, GUI_BLENDMODE_SRC_OVER);
GUI_General_Digit_Display(MultiPurpose_Sprite, (1000000u / AVGFuel), CN_RC_Nb_21_0, 4u, 2u, GUIBGAVGFuelPosX, 262u, GUI_BLENDMODE_SRC_OVER);
}
else
{
......@@ -1372,7 +1372,7 @@ void GUI_Drive_Info_Avg_Fuel_Display(uint16_t Fuel)
if (AVGFuel > 1000u)
{
GUI_General_Digit_Display(MultiPurpose_Sprite, ((1000000u / AVGFuel) * 1069u / 1000u), Nb_21_0, 4u, 2u, GUIBGAVGFuelPosX, 262u, GUI_BLENDMODE_SRC_OVER);
GUI_General_Digit_Display(MultiPurpose_Sprite, ((1000000u / AVGFuel) * 1069u / 1000u), CN_RC_Nb_21_0, 4u, 2u, GUIBGAVGFuelPosX, 262u, GUI_BLENDMODE_SRC_OVER);
}
else
{
......@@ -1387,7 +1387,7 @@ void GUI_Drive_Info_Avg_Fuel_Display(uint16_t Fuel)
if (AVGFuel > 1000u)
{
GUI_General_Digit_Display(MultiPurpose_Sprite, (10u / AVGFuel), Nb_21_0, 4u, 2u, GUIBGAVGFuelPosX, 262u, GUI_BLENDMODE_SRC_OVER);
GUI_General_Digit_Display(MultiPurpose_Sprite, (10u / AVGFuel), CN_RC_Nb_21_0, 4u, 2u, GUIBGAVGFuelPosX, 262u, GUI_BLENDMODE_SRC_OVER);
}
else
{
......@@ -3248,40 +3248,40 @@ void GUI_BG_TPMS_GasNUM_Display(uint8_t Mode)
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);
GUI_General_Digit_Display(MENU_Sprite, Gas_Value_0x12, CN_RC_Nb_12_0, 3u, 2u, GUI_TPMS_NUM1_X, GUI_TPMS_NUM_Y[3u], GUI_BLENDMODE_SRC_OVER);
/*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_0x13, CN_RC_Nb_12_0, 3u, 2u, GUI_TPMS_NUM1_X, GUI_TPMS_NUM_Y[0u], 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);
GUI_General_Digit_Display(MENU_Sprite, Gas_Value_0x22, CN_RC_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);
GUI_General_Digit_Display(MENU_Sprite, Gas_Value_0x23, CN_RC_Nb_12_0, 3u, 2u, GUI_TPMS_NUM2_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);
GUI_General_Digit_Display(MENU_Sprite, Gas_Value_0x31, CN_RC_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);
GUI_General_Digit_Display(MENU_Sprite, Gas_Value_0x32, CN_RC_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);
GUI_General_Digit_Display(MENU_Sprite, Gas_Value_0x33, CN_RC_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);
GUI_General_Digit_Display(MENU_Sprite, Gas_Value_0x34, CN_RC_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);
GUI_General_Digit_Display(MENU_Sprite, Gas_Value_0x41, CN_RC_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);
GUI_General_Digit_Display(MENU_Sprite, Gas_Value_0x42, CN_RC_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);
GUI_General_Digit_Display(MENU_Sprite, Gas_Value_0x43, CN_RC_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);
GUI_General_Digit_Display(MENU_Sprite, Gas_Value_0x44, CN_RC_Nb_12_0, 3u, 2u, GUI_TPMS_NUM4_X, GUI_TPMS_NUM_Y[0u], GUI_BLENDMODE_SRC_OVER);
}
else
......
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