Skip to content

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

调整胎压显示相关

parent f7898c9f
Expand all 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 diff is collapsed.
ghs/project.siz
View file @ 649b6b58
project .intvect 1536
project .text 311500
project .text 311836
project .rodata 410815
project .secinfo 120
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)
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：
Description：获取某个编号轮胎轮胎被盗报警信号
......@@ -425,17 +414,6 @@ uint8_t Get_DataTPMS_TyresLostWarningSig_Value(TPMSNUM_t TPMSTyreID)
//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：
Description：获取某个编号轮胎标准温度设置状态
......@@ -447,28 +425,6 @@ uint8_t Get_DataTPMS_TireStandarTemperatureSettingSts_Value(TPMSNUM_t TPMSTyreID
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：
Description：获取某个编号轮胎短时无信号
......@@ -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);
uint8_t Get_DataTPMS_Lowpressure_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_SensorVoltWarningSig_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_RapidLeakWarningSig_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_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_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)
m_Condition4 = (uint8_t)Get_ID_18011733_Sig_No_signal_Alarm();
m_Condition5 = (uint8_t)Get_ID_18011733_Sig_Sensor_fault_information();
if ((m_Condition1 == 1u) || (m_Condition2 == 1u) || (m_Condition3 == 1u))
{
u8Result = 1u;
......
source/Application/Graphic/GUI/GUI.c
View file @ 649b6b58
This diff is collapsed.
source/Application/Graphic/GUI/GUI.h
View file @ 649b6b58
......@@ -6,8 +6,8 @@
#include "images.h"
#include "TYW_stdint.h"
#define Language_En 0u
#define Language_Cn 1u
#define Language_En 0u
#define Language_Cn 1u
typedef struct
{
......@@ -63,65 +63,64 @@ typedef struct
extern volatile _Display_State_Flag State_Flag;
typedef struct
{
uint16_t Year ;
uint8_t Month ;
uint8_t Date ;
uint8_t Hour ;
uint8_t Minute ;
uint8_t SetDate ; /* 设置日期标识*/
uint8_t SetTime ; /* 设置解耦睡觉哦考吗脑婆睡觉哦*/
uint8_t Language ; /* 当前语言标识*/
uint8_t LeapYear ; /* 设置闰年标识*/
uint8_t User_Gsl ; /* 速度设定-高速路*/
uint8_t User_Ybl ; /* 速度设定-一般路*/
uint8_t User_Speed ; /* 发动机转速设定*/
uint8_t User_JADD ; /* 急加速设定*/
uint8_t User_JSUB ; /* 急减速设定*/
uint8_t User_Date ; /* 日期设置格式切换标识*/
uint8_t User_Time ; /* 时间设置格式切换标识*/
uint8_t Date_Time ; /* 显示时间日期标识*/
uint8_t Date_Format ; /* 显示日期格式标识*/
uint8_t Time_Format ; /* 显示时间格式标识*/
uint8_t User_HSASET ; /* HSA调整*/
uint8_t User_Language; /* 语言设置*/
uint8_t User_Company ; /* 单位设定*/
uint8_t User_Light ; /* 亮度调节*/
uint8_t User_CarJL ; /* 车间距离报警*/
uint32_t User_FDJYLQQ ; /* 发送机油 0 未设定 1-50000 数值*/
uint32_t User_RYLQQ ; /* 燃油滤清器 0 未设定 1-50000 数值*/
uint32_t User_BSXY ; /* 变速箱油 */
uint32_t User_CSQY ; /* 差速器油*/
uint32_t User_KQGZJ ; /* 空气干燥剂*/
uint32_t User_DLZXY ; /* 动力转向油*/
uint32_t User_LT ; /* 轮胎*/
uint32_t User_QDJ ; /* 起动机*/
uint8_t User_Tpms ; /* 当前是哪个轮子 0-12*/
uint8_t User_TpmsStatus; /* 当前胎压匹配界面 0 胎压未配置状态， 1 轮胎选中界面， 2 轮胎正在配置*/
uint8_t User_Temp_Return; /* 取消胎压配置 0 1 取消配对标记*/
uint8_t User_TpmsSend; /* 胎压匹配报文发送请求次数3 0 不发*/
uint16_t Year;
uint8_t Month;
uint8_t Date;
uint8_t Hour;
uint8_t Minute;
uint8_t SetDate; /* 设置日期标识*/
uint8_t SetTime; /* 设置解耦睡觉哦考吗脑婆睡觉哦*/
uint8_t Language; /* 当前语言标识*/
uint8_t LeapYear; /* 设置闰年标识*/
uint8_t User_Gsl; /* 速度设定-高速路*/
uint8_t User_Ybl; /* 速度设定-一般路*/
uint8_t User_Speed; /* 发动机转速设定*/
uint8_t User_JADD; /* 急加速设定*/
uint8_t User_JSUB; /* 急减速设定*/
uint8_t User_Date; /* 日期设置格式切换标识*/
uint8_t User_Time; /* 时间设置格式切换标识*/
uint8_t Date_Time; /* 显示时间日期标识*/
uint8_t Date_Format; /* 显示日期格式标识*/
uint8_t Time_Format; /* 显示时间格式标识*/
uint8_t User_HSASET; /* HSA调整*/
uint8_t User_Language; /* 语言设置*/
uint8_t User_Company; /* 单位设定*/
uint8_t User_Light; /* 亮度调节*/
uint8_t User_CarJL; /* 车间距离报警*/
uint32_t User_FDJYLQQ; /* 发送机油 0 未设定 1-50000 数值*/
uint32_t User_RYLQQ; /* 燃油滤清器 0 未设定 1-50000 数值*/
uint32_t User_BSXY; /* 变速箱油 */
uint32_t User_CSQY; /* 差速器油*/
uint32_t User_KQGZJ; /* 空气干燥剂*/
uint32_t User_DLZXY; /* 动力转向油*/
uint32_t User_LT; /* 轮胎*/
uint32_t User_QDJ; /* 起动机*/
uint8_t User_Tpms; /* 当前是哪个轮子 0-12*/
uint8_t User_TpmsStatus; /* 当前胎压匹配界面 0 胎压未配置状态， 1 轮胎选中界面， 2 轮胎正在配置*/
uint8_t User_Temp_Return; /* 取消胎压配置 0 1 取消配对标记*/
uint8_t User_TpmsSend; /* 胎压匹配报文发送请求次数3 0 不发*/
} _UserSet;
extern _UserSet User_set_Num;
extern _UserSet User_App;
extern _UserSet User_set_Num;
extern _UserSet User_App;
typedef struct
{
uint8_t T01 ;
uint8_t T02 ;
uint8_t T03 ;
uint8_t T04 ;
uint8_t T05 ;
uint8_t T06 ;
uint8_t T07 ;
uint8_t T08 ;
uint8_t T09 ;
uint8_t T10 ;
uint8_t T11 ;
uint8_t T12 ;
uint8_t FLAG ;
uint8_t T01;
uint8_t T02;
uint8_t T03;
uint8_t T04;
uint8_t T05;
uint8_t T06;
uint8_t T07;
uint8_t T08;
uint8_t T09;
uint8_t T10;
uint8_t T11;
uint8_t T12;
uint8_t FLAG;
} _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 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); /**/
void GUI_BG_UserSet_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_Language_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_2_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_5_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_TPMS_PictureSet_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_1_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_4_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_7_Display(uint8_t Mode); /**/
void GUI_BG_TPMS_PictureSet_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