Skip to content

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

调整界面

parent ef452250
Hide whitespace changes
Inline Side-by-side
Showing with 23345 additions and 22942 deletions
ghs/project
View file @ 00ddd6b9
No preview for this file type
ghs/project.hex
View file @ 00ddd6b9
This source diff could not be displayed because it is too large. You can view the blob instead.
ghs/project.siz
View file @ 00ddd6b9
project .intvect 1536 project .intvect 1536
project .text 314684 project .text 315628
project .rodata 410775 project .rodata 410791
project .secinfo 120 project .secinfo 120
project .syscall 6 project .syscall 6
project .romdata 9029 project .romdata 9029
......
source/Application/APP/Key/Key.h
View file @ 00ddd6b9
...@@ -3,6 +3,9 @@ ...@@ -3,6 +3,9 @@
#include "TYW_stdint.h" #include "TYW_stdint.h"
#define K_Line_User_RYLQQ 100
#define K_Line_User_KQGZJ 100
/* /*
说明： 说明：
1、按键类型分为两类： 1、按键类型分为两类：
...@@ -17,12 +20,12 @@ ...@@ -17,12 +20,12 @@
/*所有按键枚举，目前最多支持8个按键*/ /*所有按键枚举，目前最多支持8个按键*/
typedef enum typedef enum
{ {
KEY_UP = 0U, KEY_UP = 0U,
KEY_DOWN, KEY_DOWN,
KEY_ENTER, KEY_ENTER,
KEY_RETURN, KEY_RETURN,
KEY_MENU, KEY_MENU,
KEY_NUM_MAX, KEY_NUM_MAX,
} Key_Num_en_t; } Key_Num_en_t;
...@@ -31,67 +34,67 @@ typedef enum ...@@ -31,67 +34,67 @@ typedef enum
/*--------------------------Do not modify the following--------------------------------*/ /*--------------------------Do not modify the following--------------------------------*/
typedef enum typedef enum
{ {
// KEY_TYPE_CAN = 0U, /*CAN按键。按键不需要消抖*/ // KEY_TYPE_CAN = 0U, /*CAN按键。按键不需要消抖*/
// KEY_TYPE_LINE, /*硬线按键，包含AD按键。按键需要消抖*/ // KEY_TYPE_LINE, /*硬线按键，包含AD按键。按键需要消抖*/
/*按键检测方式选择*/ /*按键检测方式选择*/
KEY_NO_DEBOUNCE_RISE = 0U, /*按键不需要消抖，并且在无效状态切换到有效状态的上升沿触发按键动作*/ KEY_NO_DEBOUNCE_RISE = 0U, /*按键不需要消抖，并且在无效状态切换到有效状态的上升沿触发按键动作*/
KEY_NO_DEBOUNCE_FALL, /*按键不需要消抖，并且在有效状态切换到无效状态的下降沿触发按键动作*/ KEY_NO_DEBOUNCE_FALL, /*按键不需要消抖，并且在有效状态切换到无效状态的下降沿触发按键动作*/
KEY_NEED_DEBOUNCE_NORMAL, /*按键需要消抖，短按松手触发，长按，超超按，按住即可触发*/ KEY_NEED_DEBOUNCE_NORMAL, /*按键需要消抖，短按松手触发，长按，超超按，按住即可触发*/
KEY_TYPE_MAX, KEY_TYPE_MAX,
} Key_Type_en_t; } Key_Type_en_t;
/*按键相关设置返回状态*/ /*按键相关设置返回状态*/
typedef enum typedef enum
{ {
KEY_SET_OK = 0U, KEY_SET_OK = 0U,
KEY_SET_ERROR, KEY_SET_ERROR,
KEY_SET_MAX, KEY_SET_MAX,
} Key_Set_en_t; } Key_Set_en_t;
/*按键IG状态*/ /*按键IG状态*/
typedef enum typedef enum
{ {
KEY_IG_INVALID = 0U, KEY_IG_INVALID = 0U,
KEY_IG_OFF, KEY_IG_OFF,
KEY_IG_ON, KEY_IG_ON,
} Key_IGN_en_t; } Key_IGN_en_t;
/*-----实时传入的键值--------*/ /*-----实时传入的键值--------*/
typedef enum typedef enum
{ {
KEY_CAN_NONE = 0U, /*CAN按键时，按键无动作*/ KEY_CAN_NONE = 0U, /*CAN按键时，按键无动作*/
KEY_CAN_SHORT_PRESS, /*CAN按键时，按键短按动作*/ KEY_CAN_SHORT_PRESS, /*CAN按键时，按键短按动作*/
KEY_CAN_LONG_PRESS, /*CAN按键时，按键长按动作*/ KEY_CAN_LONG_PRESS, /*CAN按键时，按键长按动作*/
KEY_CAN_LONG_PRESS_NOT_RELEASE, /*CAN按键时，按键长按不松手动作，触发动作超长按*/ KEY_CAN_LONG_PRESS_NOT_RELEASE, /*CAN按键时，按键长按不松手动作，触发动作超长按*/
KEY_LINE_PRESS, /*硬线按键时，按键按下*/ KEY_LINE_PRESS, /*硬线按键时，按键按下*/
KEY_LINE_LOOSEN, /*硬线按键时，按键松开*/ KEY_LINE_LOOSEN, /*硬线按键时，按键松开*/
KEY_REAL_STATUS_MAX, KEY_REAL_STATUS_MAX,
} Key_Real_Status_en_t; } Key_Real_Status_en_t;
/*按键支持的具体动作*/ /*按键支持的具体动作*/
typedef enum typedef enum
{ {
KEY_EVENT_NONE = 0U, KEY_EVENT_NONE = 0U,
KEY_EVENT_SHORT_PRESS, KEY_EVENT_SHORT_PRESS,
KEY_EVENT_LONG_PRESS, KEY_EVENT_LONG_PRESS,
KEY_EVENT_SUPER_LONG_PRESS, KEY_EVENT_SUPER_LONG_PRESS,
KEY_EVENT_OFF_TO_ON, KEY_EVENT_OFF_TO_ON,
KEY_EVENT_ON_TO_OFF, KEY_EVENT_ON_TO_OFF,
KEY_EVENT_MAX, KEY_EVENT_MAX,
} Key_Event_en_t; } Key_Event_en_t;
typedef struct typedef struct
{ {
uint32_t u32KeyRAMAddr; /* 数据缓冲地址 */ uint32_t u32KeyRAMAddr; /* 数据缓冲地址 */
uint16_t u16KeyRAMLen; /* 数据缓冲大小：以uint32_t为单位*/ uint16_t u16KeyRAMLen; /* 数据缓冲大小：以uint32_t为单位*/
} Key_RAM_Attribute_st_t; } Key_RAM_Attribute_st_t;
typedef Key_Real_Status_en_t (*Key_Real_Status_Read)(void); typedef Key_Real_Status_en_t (*Key_Real_Status_Read)(void);
...@@ -100,12 +103,12 @@ typedef void (*Key_Operation)(Key_Event_en_t enKeyEvent); ...@@ -100,12 +103,12 @@ typedef void (*Key_Operation)(Key_Event_en_t enKeyEvent);
/*每个按键的属性*/ /*每个按键的属性*/
typedef struct typedef struct
{ {
/*按键类型，是CAN的还是硬线的*/ /*按键类型，是CAN的还是硬线的*/
Key_Type_en_t enKeyType; Key_Type_en_t enKeyType;
/*获取按键实时状态的回调函数*/ /*获取按键实时状态的回调函数*/
Key_Real_Status_Read pfnKeyReadStatusCallBack; Key_Real_Status_Read pfnKeyReadStatusCallBack;
/*按键触发动作的回调函数*/ /*按键触发动作的回调函数*/
Key_Operation pfnKeyOperationCallBack; Key_Operation pfnKeyOperationCallBack;
} Key_Attribute_st_t; } Key_Attribute_st_t;
......
source/Application/APP/Key/Key_user.c
View file @ 00ddd6b9
...@@ -15,8 +15,6 @@ ...@@ -15,8 +15,6 @@
/*无车速限制值*/ /*无车速限制值*/
#define DISPSPEEDNULLMAX 66 #define DISPSPEEDNULLMAX 66
#define K_Line_User_RYLQQ 100
#define K_Line_User_KQGZJ 100
/*----------按键具体功能执行的回调函数-----------------------*/ /*----------按键具体功能执行的回调函数-----------------------*/
......
source/Application/Graphic/GUI/GUI.c
View file @ 00ddd6b9
...@@ -23,6 +23,7 @@ ...@@ -23,6 +23,7 @@
#include "Popups.h" #include "Popups.h"
#include "Data_Fuel_User.h" #include "Data_Fuel_User.h"
#include "CAN_FUNC.h" #include "CAN_FUNC.h"
#include "key.h"
#define TRAPA 0u #define TRAPA 0u
#define TRAPB 1u #define TRAPB 1u
...@@ -77,56 +78,294 @@ void GUI_Display_background(void) ...@@ -77,56 +78,294 @@ void GUI_Display_background(void)
void GUI_Display_Value_Init(void) void GUI_Display_Value_Init(void)
{ {
/*菜单状态初始化*/
State_Flag.FState_GZM = 1u; State_Flag.FState_GZM = 1u ;
State_Flag.FState_WXTZ = 2u; State_Flag.FState_WXTZ = 2u ;
State_Flag.FState_WXSD = 2u; State_Flag.FState_WXSD = 2u ;
State_Flag.FState_YHSD = 2u; State_Flag.FState_YHSD = 2u ;
State_Flag.FState_TPMS = 2u; State_Flag.FState_TPMS = 2u ;
State_Flag.FState_ECO = 1u; State_Flag.FState_ECO = 1u ;
State_Flag.FState_SYSYS = 1u; State_Flag.FState_SYSYS = 1u ;
State_Flag.WXTZ_FDJY = 2u; State_Flag.WXTZ_FDJY = 2u ;
State_Flag.WXTZ_RYLQY = 2u; State_Flag.WXTZ_RYLQY = 2u ;
State_Flag.WXTZ_BSXY = 2u; State_Flag.WXTZ_BSXY = 2u ;
State_Flag.WXTZ_CSQY = 2u; State_Flag.WXTZ_CSQY = 2u ;
State_Flag.WXTZ_LHQY = 1u; State_Flag.WXTZ_LHQY = 1u ;
State_Flag.WXTZ_KQGZJ = 2u; State_Flag.WXTZ_KQGZJ = 2u ;
State_Flag.WXTZ_DLZXY = 2u; State_Flag.WXTZ_DLZXY = 2u ;
State_Flag.WXTZ_LT = 2u; State_Flag.WXTZ_LT = 2u ;
State_Flag.WXTZ_QDJ = 2u; State_Flag.WXTZ_QDJ = 2u ;
State_Flag.WXSD_FDJY = 2u; State_Flag.WXSD_FDJY = 2u ;
State_Flag.WXSD_RYLQY = 2u; State_Flag.WXSD_RYLQY = 2u ;
State_Flag.WXSD_BSXY = 2u; State_Flag.WXSD_BSXY = 2u ;
State_Flag.WXSD_CSQY = 2u; State_Flag.WXSD_CSQY = 2u ;
State_Flag.WXSD_LHQY = 1u; State_Flag.WXSD_LHQY = 1u ;
State_Flag.WXSD_KQGZJ = 2u; State_Flag.WXSD_KQGZJ = 2u ;
State_Flag.WXSD_DLZXY = 2u; State_Flag.WXSD_DLZXY = 2u ;
State_Flag.WXSD_LT = 2u; State_Flag.WXSD_LT = 2u ;
State_Flag.WXSD_QDJ = 2u; State_Flag.WXSD_QDJ = 2u ;
State_Flag.USER_DATE = 2u; State_Flag.USER_DATE = 2u ;
State_Flag.USER_TIME = 2u; State_Flag.USER_TIME = 2u ;
State_Flag.USER_DISPLAY = 2u; State_Flag.USER_DISPLAY = 2u ;
State_Flag.USER_PROPOSAL = 2u; State_Flag.USER_PROPOSAL = 2u ;
State_Flag.USER_HSA = 1u; State_Flag.USER_HSA = 1u ;
State_Flag.USER_VOLUEM = 1u; State_Flag.USER_VOLUEM = 1u ;
State_Flag.USER_LANGUAGE = 2u; State_Flag.USER_LANGUAGE = 1u ;
State_Flag.USER_COMPANY = 2u; State_Flag.USER_COMPANY = 2u ;
State_Flag.USER_LIGHT = 2u; State_Flag.USER_LIGHT = 2u ;
State_Flag.USER_SETIC = 2u; State_Flag.FState_TPMSSET = 2u ;
State_Flag.FState_TPMSSET = 2u;
State_Flag.DEMO_LDWS = 2u;
State_Flag.DEMO_AEBS1 = 2u;
State_Flag.DEMO_AEBS2 = 2u;
State_Flag.DEMO_AEBS3 = 2u;
State_Flag.FState_ClearOilTx = 0u; State_Flag.FState_ClearOilTx = 0u;
State_Flag.FState_ClearOilRx = 1u; State_Flag.FState_ClearOilRx = 1u;
State_Flag.FState_COilTimeOut = FState_COilTimeOutNum; State_Flag.FState_COilTimeOut = FState_COilTimeOutNum;
/*应用*/
User_App.User_Language = 1u ;
User_App.User_Company = 1u ;
User_App.User_Light = 10u ; //背光初始化
/*保养状态标识*/
if (K_Line_Set.K_Line_LID4F)
State_Flag.User_FDJYLQQ_FLAG = 0u;
else
State_Flag.User_FDJYLQQ_FLAG = 3u;
if (K_Line_User_RYLQQ)
State_Flag.User_RYLQQ_FLAG = 0u;
else
State_Flag.User_RYLQQ_FLAG = 3u;
if (K_Line_Set.K_Line_LID4A)
State_Flag.User_BSXY_FLAG = 0u;
else
State_Flag.User_BSXY_FLAG = 3u;
if (K_Line_Set.K_Line_LID4B)
State_Flag.User_CSQY_FLAG = 0u;
else
State_Flag.User_CSQY_FLAG = 3u;
if (K_Line_User_KQGZJ)
State_Flag.User_KQGZJ_FLAG = 0u;
else
State_Flag.User_KQGZJ_FLAG = 3u;
if (K_Line_Set.K_Line_LID4D)
State_Flag.User_DLZXY_FLAG = 0u;
else
State_Flag.User_DLZXY_FLAG = 3u;
if (K_Line_Set.K_Line_LID4E)
State_Flag.User_LT_FLAG = 0u;
else
State_Flag.User_LT_FLAG = 3u;
User_App.User_FDJYLQQ = (uint32_t)K_Line_Set.K_Line_LID4F * 1000u ; /*发动机油*/
User_App.User_RYLQQ = (uint32_t)K_Line_User_RYLQQ * 1000u ; /*燃油滤清器*/
User_App.User_BSXY = (uint32_t)K_Line_Set.K_Line_LID4A * 1000u ; /*变速箱油*/
User_App.User_CSQY = (uint32_t)K_Line_Set.K_Line_LID4B * 1000u ; /*差速器油*/
User_App.User_KQGZJ = (uint32_t)K_Line_User_KQGZJ * 1000u ; /*空气干燥剂*/
User_App.User_DLZXY = (uint32_t)K_Line_Set.K_Line_LID4D * 1000u ; /*动力转向油*/
User_App.User_LT = (uint32_t)K_Line_Set.K_Line_LID4E * 1000u ; /*轮胎*/
User_set_Num.User_FDJYLQQ = User_App.User_FDJYLQQ ;
User_set_Num.User_RYLQQ = User_App.User_RYLQQ ;
User_set_Num.User_BSXY = User_App.User_BSXY ;
User_set_Num.User_CSQY = User_App.User_CSQY ;
User_set_Num.User_KQGZJ = User_App.User_KQGZJ ;
User_set_Num.User_DLZXY = User_App.User_DLZXY ;
User_set_Num.User_LT = User_App.User_LT ;
/*用户设定*/
User_set_Num.User_Language = User_App.User_Language ;
User_set_Num.User_Company = User_App.User_Company ;
User_set_Num.User_Light = User_App.User_Light ;
User_App.User_Gsl = 0xFFu;
User_App.User_Ybl = 0xFFu;
User_App.User_Speed = K_Line_Set.K_Line_LID45; //发动机转速
User_App.User_JADD = K_Line_Set.K_Line_LID46; //急加速
User_App.User_JSUB = K_Line_Set.K_Line_LID47; //急减速
User_set_Num.User_Gsl = User_App.User_Gsl ;
User_set_Num.User_Ybl = User_App.User_Ybl ;
User_set_Num.User_Speed = User_App.User_Speed ;
User_set_Num.User_JADD = User_App.User_JADD ;
User_set_Num.User_JSUB = User_App.User_JSUB ;
//MenuFlag.Sig.Menu_Flag = 0;
#if 0
User_TPMS12.Tire_Pressure = 0 ;
User_TPMS12.Tire_Temperature_Sign = 0 ;
User_TPMS12.Tire_Temperature = 0 ;
User_TPMS12.Data_updating = 0 ;
User_TPMS12.Data_invalid = 0 ;
User_TPMS12.Low_Presure_Alarm = 0 ;
User_TPMS12.High_Presure_Alarm = 0 ;
User_TPMS12.High_Temperature_Alarm = 0 ;
User_TPMS12.Fast_air_leakage_Alarm = 0 ;
User_TPMS12.Low_Voltage_Alarm = 0 ;
User_TPMS12.No_signal_Alarm = 0 ;
User_TPMS12.Sensor_fault_information = 0 ;
User_TPMS13.Tire_Pressure = 0 ;
User_TPMS13.Tire_Temperature_Sign = 0 ;
User_TPMS13.Tire_Temperature = 0 ;
User_TPMS13.Data_updating = 0 ;
User_TPMS13.Data_invalid = 0 ;
User_TPMS13.Low_Presure_Alarm = 0 ;
User_TPMS13.High_Presure_Alarm = 0 ;
User_TPMS13.High_Temperature_Alarm = 0 ;
User_TPMS13.Fast_air_leakage_Alarm = 0 ;
User_TPMS13.Low_Voltage_Alarm = 0 ;
User_TPMS13.No_signal_Alarm = 0 ;
User_TPMS13.Sensor_fault_information = 0 ;
User_TPMS22.Tire_Pressure = 0 ;
User_TPMS22.Tire_Temperature_Sign = 0 ;
User_TPMS22.Tire_Temperature = 0 ;
User_TPMS22.Data_updating = 0 ;
User_TPMS22.Data_invalid = 0 ;
User_TPMS22.Low_Presure_Alarm = 0 ;
User_TPMS22.High_Presure_Alarm = 0 ;
User_TPMS22.High_Temperature_Alarm = 0 ;
User_TPMS22.Fast_air_leakage_Alarm = 0 ;
User_TPMS22.Low_Voltage_Alarm = 0 ;
User_TPMS22.No_signal_Alarm = 0 ;
User_TPMS22.Sensor_fault_information = 0 ;
User_TPMS23.Tire_Pressure = 0 ;
User_TPMS23.Tire_Temperature_Sign = 0 ;
User_TPMS23.Tire_Temperature = 0 ;
User_TPMS23.Data_updating = 0 ;
User_TPMS23.Data_invalid = 0 ;
User_TPMS23.Low_Presure_Alarm = 0 ;
User_TPMS23.High_Presure_Alarm = 0 ;
User_TPMS23.High_Temperature_Alarm = 0 ;
User_TPMS23.Fast_air_leakage_Alarm = 0 ;
User_TPMS23.Low_Voltage_Alarm = 0 ;
User_TPMS23.No_signal_Alarm = 0 ;
User_TPMS23.Sensor_fault_information = 0 ;
User_TPMS31.Tire_Pressure = 0 ;
User_TPMS31.Tire_Temperature_Sign = 0 ;
User_TPMS31.Tire_Temperature = 0 ;
User_TPMS31.Data_updating = 0 ;
User_TPMS31.Data_invalid = 0 ;
User_TPMS31.Low_Presure_Alarm = 0 ;
User_TPMS31.High_Presure_Alarm = 0 ;
User_TPMS31.High_Temperature_Alarm = 0 ;
User_TPMS31.Fast_air_leakage_Alarm = 0 ;
User_TPMS31.Low_Voltage_Alarm = 0 ;
User_TPMS31.No_signal_Alarm = 0 ;
User_TPMS31.Sensor_fault_information = 0 ;
User_TPMS32.Tire_Pressure = 0 ;
User_TPMS32.Tire_Temperature_Sign = 0 ;
User_TPMS32.Tire_Temperature = 0 ;
User_TPMS32.Data_updating = 0 ;
User_TPMS32.Data_invalid = 0 ;
User_TPMS32.Low_Presure_Alarm = 0 ;
User_TPMS32.High_Presure_Alarm = 0 ;
User_TPMS32.High_Temperature_Alarm = 0 ;
User_TPMS32.Fast_air_leakage_Alarm = 0 ;
User_TPMS32.Low_Voltage_Alarm = 0 ;
User_TPMS32.No_signal_Alarm = 0 ;
User_TPMS32.Sensor_fault_information = 0 ;
User_TPMS33.Tire_Pressure = 0 ;
User_TPMS33.Tire_Temperature_Sign = 0 ;
User_TPMS33.Tire_Temperature = 0 ;
User_TPMS33.Data_updating = 0 ;
User_TPMS33.Data_invalid = 0 ;
User_TPMS33.Low_Presure_Alarm = 0 ;
User_TPMS33.High_Presure_Alarm = 0 ;
User_TPMS33.High_Temperature_Alarm = 0 ;
User_TPMS33.Fast_air_leakage_Alarm = 0 ;
User_TPMS33.Low_Voltage_Alarm = 0 ;
User_TPMS33.No_signal_Alarm = 0 ;
User_TPMS33.Sensor_fault_information = 0 ;
User_TPMS34.Tire_Pressure = 0 ;
User_TPMS34.Tire_Temperature_Sign = 0 ;
User_TPMS34.Tire_Temperature = 0 ;
User_TPMS34.Data_updating = 0 ;
User_TPMS34.Data_invalid = 0 ;
User_TPMS34.Low_Presure_Alarm = 0 ;
User_TPMS34.High_Presure_Alarm = 0 ;
User_TPMS34.High_Temperature_Alarm = 0 ;
User_TPMS34.Fast_air_leakage_Alarm = 0 ;
User_TPMS34.Low_Voltage_Alarm = 0 ;
User_TPMS34.No_signal_Alarm = 0 ;
User_TPMS34.Sensor_fault_information = 0 ;
User_TPMS41.Tire_Pressure = 0 ;
User_TPMS41.Tire_Temperature_Sign = 0 ;
User_TPMS41.Tire_Temperature = 0 ;
User_TPMS41.Data_updating = 0 ;
User_TPMS41.Data_invalid = 0 ;
User_TPMS41.Low_Presure_Alarm = 0 ;
User_TPMS41.High_Presure_Alarm = 0 ;
User_TPMS41.High_Temperature_Alarm = 0 ;
User_TPMS41.Fast_air_leakage_Alarm = 0 ;
User_TPMS41.Low_Voltage_Alarm = 0 ;
User_TPMS41.No_signal_Alarm = 0 ;
User_TPMS41.Sensor_fault_information = 0 ;
User_TPMS42.Tire_Pressure = 0 ;
User_TPMS42.Tire_Temperature_Sign = 0 ;
User_TPMS42.Tire_Temperature = 0 ;
User_TPMS42.Data_updating = 0 ;
User_TPMS42.Data_invalid = 0 ;
User_TPMS42.Low_Presure_Alarm = 0 ;
User_TPMS42.High_Presure_Alarm = 0 ;
User_TPMS42.High_Temperature_Alarm = 0 ;
User_TPMS42.Fast_air_leakage_Alarm = 0 ;
User_TPMS42.Low_Voltage_Alarm = 0 ;
User_TPMS42.No_signal_Alarm = 0 ;
User_TPMS42.Sensor_fault_information = 0 ;
User_TPMS43.Tire_Pressure = 0 ;
User_TPMS43.Tire_Temperature_Sign = 0 ;
User_TPMS43.Tire_Temperature = 0 ;
User_TPMS43.Data_updating = 0 ;
User_TPMS43.Data_invalid = 0 ;
User_TPMS43.Low_Presure_Alarm = 0 ;
User_TPMS43.High_Presure_Alarm = 0 ;
User_TPMS43.High_Temperature_Alarm = 0 ;
User_TPMS43.Fast_air_leakage_Alarm = 0 ;
User_TPMS43.Low_Voltage_Alarm = 0 ;
User_TPMS43.No_signal_Alarm = 0 ;
User_TPMS43.Sensor_fault_information = 0 ;
User_TPMS44.Tire_Pressure = 0 ;
User_TPMS44.Tire_Temperature_Sign = 0 ;
User_TPMS44.Tire_Temperature = 0 ;
User_TPMS44.Data_updating = 0 ;
User_TPMS44.Data_invalid = 0 ;
User_TPMS44.Low_Presure_Alarm = 0 ;
User_TPMS44.High_Presure_Alarm = 0 ;
User_TPMS44.High_Temperature_Alarm = 0 ;
User_TPMS44.Fast_air_leakage_Alarm = 0 ;
User_TPMS44.Low_Voltage_Alarm = 0 ;
User_TPMS44.No_signal_Alarm = 0 ;
User_TPMS44.Sensor_fault_information = 0 ;
#endif
} }
/*------------------------------------------------------------------------- /*-------------------------------------------------------------------------
* Function Name : GUI_Display_OftenShow_Group * Function Name : GUI_Display_OftenShow_Group
...@@ -4976,6 +5215,120 @@ void GUI_BG_TPMS_PictureSet_Display(uint8_t Mode) ...@@ -4976,6 +5215,120 @@ void GUI_BG_TPMS_PictureSet_Display(uint8_t Mode)
} }
} }
/*--------------------------------------------------------------------------
* Function Name : GUI_BG_UserSet_SYSD_GSL_Display
* Description :
* Input : None
* Output : None
* Return : None
* onther : 区域
--------------------------------------------------------------------------*/
void GUI_BG_UserSet_SYSD_GSL_Display(uint8_t Mode)
{
uint32_t User_Value = 0u;
if (Mode == GUI_DISP_MODE_NORMAL)
{
User_Value = User_set_Num.User_Gsl;
GUI_General_Display(MENU_Sprite, CN_User_Menu3_03_12, GUI_BLENDMODE_SRC_OVER);/*Menu*/
GUI_General_Display(MENU_Sprite, CN_User_Menu3_03_kuang, GUI_BLENDMODE_SRC_OVER);/*框*/
if (User_Value != 0xFF)
{
GUI_General_Digit_Display(MENU_Sprite, User_Value, Nb_15_0, 4u, 3u, GUI_SYSSET_X, 255u, GUI_BLENDMODE_SRC_OVER);/*数字*/
GUI_General_Display(MENU_Sprite, CN_User_Menu3_03_kmh, GUI_BLENDMODE_SRC_OVER);/*km/h*/
}
else
{
GUI_General_Display(MENU_Sprite, CN_User_Menu3_03_22, GUI_BLENDMODE_SRC_OVER); /*不设定*/
}
}
else
{
GUI_General_Display(MENU_Sprite, SpriteSize, GUI_BLENDMODE_SRC_OVER);
}
}
/*--------------------------------------------------------------------------
* Function Name : GUI_BG_UserSet_SYSD_Ybl_Display
* Description :
* Input : None
* Output : None
* Return : None
* onther : 区域
--------------------------------------------------------------------------*/
void GUI_BG_UserSet_SYSD_Ybl_Display(uint8_t Mode)
{
uint32_t User_Value = 0u;
if (Mode == GUI_DISP_MODE_NORMAL)
{
User_Value = User_set_Num.User_Ybl;
GUI_General_Display(MENU_Sprite, CN_User_Menu3_03_13, GUI_BLENDMODE_SRC_OVER);/*Menu*/
GUI_General_Display(MENU_Sprite, CN_User_Menu3_03_kuang, GUI_BLENDMODE_SRC_OVER);/*框*/
if (User_Value != 0xFF)
{
GUI_General_Digit_Display(MENU_Sprite, User_Value, Nb_15_0, 4u, 3u, GUI_SYSSET_X, 255u, GUI_BLENDMODE_SRC_OVER);/*数字*/
GUI_General_Display(MENU_Sprite, CN_User_Menu3_03_kmh, GUI_BLENDMODE_SRC_OVER);/*km/h*/
}
else
{
GUI_General_Display(MENU_Sprite, CN_User_Menu3_03_22, GUI_BLENDMODE_SRC_OVER); /*不设定*/
}
}
else
{
GUI_General_Display(MENU_Sprite, SpriteSize, GUI_BLENDMODE_SRC_OVER);
}
}
/*--------------------------------------------------------------------------
* Function Name : GUI_BG_UserSet_SYSD_Speed_Display
* Description :
* Input : None
* Output : None
* Return : None
* onther : 区域
--------------------------------------------------------------------------*/
void GUI_BG_UserSet_SYSD_Speed_Display(uint8_t Mode)
{
uint32_t User_Value = 0u;
if (Mode == GUI_DISP_MODE_NORMAL)
{
User_Value = User_set_Num.User_Speed;
GUI_General_Display(MENU_Sprite, CN_User_Menu3_03_14, GUI_BLENDMODE_SRC_OVER);/*Menu*/
GUI_General_Display(MENU_Sprite, CN_User_Menu3_03_kuang, GUI_BLENDMODE_SRC_OVER);/*框*/
if (User_Value != 0xFF)
{
if (User_Value != 0u)
{
GUI_Translate_Display(MENU_Sprite, Nb_15_0, 520u, 255u, GUI_BLENDMODE_CUSTOM);
GUI_Translate_Display(MENU_Sprite, Nb_15_0, 503u, 255u, GUI_BLENDMODE_CUSTOM);
GUI_General_Digit_Display(MENU_Sprite, User_Value, Nb_15_0, 2u, 1u, GUI_SYSSPEED, 255u, GUI_BLENDMODE_SRC_OVER);/*数字*/
}
else
{
GUI_General_Digit_Display(MENU_Sprite, User_Value, Nb_15_0, 4u, 3u, GUI_SYSSET_X, 255u, GUI_BLENDMODE_SRC_OVER);/*数字*/
}
GUI_General_Display(MENU_Sprite, CN_User_Menu3_03_rpm, GUI_BLENDMODE_SRC_OVER);/*rmp*/
}
else
{
GUI_General_Display(MENU_Sprite, CN_User_Menu3_03_22, GUI_BLENDMODE_SRC_OVER); /*不设定*/
}
}
else
{
GUI_General_Display(MENU_Sprite, SpriteSize, GUI_BLENDMODE_SRC_OVER);
}
}
/*-------------------------------------------------------------------------- /*--------------------------------------------------------------------------
* Function Name : GUI_BG_Enter_Return_Display * Function Name : GUI_BG_Enter_Return_Display
* Description : * Description :
...@@ -5009,4 +5362,5 @@ void GUI_BG_Enter_Return_Display(uint8_t Mode) ...@@ -5009,4 +5362,5 @@ void GUI_BG_Enter_Return_Display(uint8_t Mode)
{ {
GUI_General_Display(MENU_Sprite, SpriteSize, GUI_BLENDMODE_SRC_OVER); GUI_General_Display(MENU_Sprite, SpriteSize, GUI_BLENDMODE_SRC_OVER);
} }
} }
\ No newline at end of file
source/Application/Graphic/GUI/GUI.h
View file @ 00ddd6b9
...@@ -170,6 +170,8 @@ static const uint16_t GUI_TPMS_MIC2_X[4] = {329u, 404u, 510u, 574u}; ...@@ -170,6 +170,8 @@ static const uint16_t GUI_TPMS_MIC2_X[4] = {329u, 404u, 510u, 574u};
static const uint16_t GUI_REP1_X[6] = {582u, 565u, 547u, 521u, 503u, 485u}; static const uint16_t GUI_REP1_X[6] = {582u, 565u, 547u, 521u, 503u, 485u};
static const uint16_t GUI_REP_X[4] = {582u, 565u, 547u, 521u}; static const uint16_t GUI_REP_X[4] = {582u, 565u, 547u, 521u};
static const uint16_t GUI_SETREP_X[6] = {520u, 503u, 485u, 458u, 441u, 424u}; static const uint16_t GUI_SETREP_X[6] = {520u, 503u, 485u, 458u, 441u, 424u};
static const uint16_t GUI_SYSSET_X[4] = {520u, 503u, 485u, 468u};
static const uint16_t GUI_SYSSPEED[2] = {485u, 468u};
static const uint16_t GUIUsetSetYPos[2] = {304u, 282u}; static const uint16_t GUIUsetSetYPos[2] = {304u, 282u};
static const uint16_t GUIUsetSetYPosX[2] = {358u, 337u}; static const uint16_t GUIUsetSetYPosX[2] = {358u, 337u};
...@@ -283,6 +285,9 @@ void GUI_BG_UserSet_SYSD_5_Display(uint8_t Mode); /**/ ...@@ -283,6 +285,9 @@ 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_UserSet_SYSD_GSL_Display(uint8_t Mode); /**/
void GUI_BG_UserSet_SYSD_Ybl_Display(uint8_t Mode); /**/
void GUI_BG_UserSet_SYSD_Speed_Display(uint8_t Mode); /**/
void GUI_BG_Enter_Return_Display(uint8_t Mode); /**/ void GUI_BG_Enter_Return_Display(uint8_t Mode); /**/
......
source/Application/Graphic/Menu/Menu_user.c
View file @ 00ddd6b9
...@@ -1086,14 +1086,24 @@ void Level3_5Menu_4Exit(void) ...@@ -1086,14 +1086,24 @@ void Level3_5Menu_4Exit(void)
/*省油建议设定*/ /*省油建议设定*/
/*速度设定-高速路子菜单*/ /*速度设定-高速路子菜单*/
void Level4_4Menu_1Enter(void) void Level4_4Menu_1Enter(void)
{} {
User_set_Num.User_Gsl = User_App.User_Gsl ;
}
void Level4_4Menu_1Do(void) void Level4_4Menu_1Do(void)
{ {
GUI_OftenShow_Display(); GUI_OftenShow_Display();
GUI_BG_UserSet_Display(GUI_DISP_MODE_NORMAL); GUI_BG_UserSet_Display(GUI_DISP_MODE_NORMAL);
GUI_BG_UserSet_SYSD_GSL_Display(GUI_DISP_MODE_NORMAL);
} }
void Level4_4Menu_1Exit(void) void Level4_4Menu_1Exit(void)
{} {
if (MenuFlag.Menu_Return)
{
User_App.User_Gsl = User_set_Num.User_Gsl ;
MenuFlag.Menu_Return = 0;
}
}
/*速度设定-一般路子菜单*/ /*速度设定-一般路子菜单*/
void Level4_4Menu_2Enter(void) void Level4_4Menu_2Enter(void)
...@@ -1102,6 +1112,7 @@ void Level4_4Menu_2Do(void) ...@@ -1102,6 +1112,7 @@ void Level4_4Menu_2Do(void)
{ {
GUI_OftenShow_Display(); GUI_OftenShow_Display();
GUI_BG_UserSet_Display(GUI_DISP_MODE_NORMAL); GUI_BG_UserSet_Display(GUI_DISP_MODE_NORMAL);
GUI_BG_UserSet_SYSD_Ybl_Display(GUI_DISP_MODE_NORMAL);
} }
void Level4_4Menu_2Exit(void) void Level4_4Menu_2Exit(void)
{} {}
...@@ -1113,6 +1124,7 @@ void Level4_4Menu_3Do(void) ...@@ -1113,6 +1124,7 @@ void Level4_4Menu_3Do(void)
{ {
GUI_OftenShow_Display(); GUI_OftenShow_Display();
GUI_BG_UserSet_Display(GUI_DISP_MODE_NORMAL); GUI_BG_UserSet_Display(GUI_DISP_MODE_NORMAL);
GUI_BG_UserSet_SYSD_Speed_Display(GUI_DISP_MODE_NORMAL);
} }
void Level4_4Menu_3Exit(void) void Level4_4Menu_3Exit(void)
{} {}
......
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