Commit 21e95aa7 authored by hu's avatar hu

调整界面

parent a9b03806
...@@ -102,12 +102,12 @@ void Tacho_Processing_Service(void) ...@@ -102,12 +102,12 @@ void Tacho_Processing_Service(void)
//转*每转脉冲数/60=频率 //转*每转脉冲数/60=频率
u32Result *= 4; u32Result *= 4u;
u32Result /= 60; u32Result /= 60u;
Fre = (uint16_t)u32Result; Fre = (uint16_t)u32Result;
RTE_PWM_Set_Tacho_Out(Fre, 500); RTE_PWM_Set_Tacho_Out(Fre, 500u);
} }
/*------------------------------------------------------------------------- /*-------------------------------------------------------------------------
* Function Name : Tacho_Display * Function Name : Tacho_Display
......
...@@ -13,48 +13,47 @@ ...@@ -13,48 +13,47 @@
typedef struct typedef struct
{ {
uint8_t FState_GZM; /*故障码*/ uint8_t FState_GZM; /*故障码*/
uint8_t FState_WXTZ; /*维修提醒*/ uint8_t FState_WXTZ; /*维修提醒*/
uint8_t FState_WXSD; /*维修设定*/ uint8_t FState_WXSD; /*维修设定*/
uint8_t FState_YHSD; /*用户设定*/ uint8_t FState_YHSD; /*用户设定*/
uint8_t FState_ECO; /*ECO*/ uint8_t FState_ECO; /*ECO*/
uint8_t FState_TPMS; /*胎压显示*/ uint8_t FState_TPMS; /*胎压显示*/
uint8_t FState_SYSYS; /*系统演示*/ uint8_t FState_TPMSSET; /*胎压设置*/
uint8_t WXTZ_FDJY; /*发动机油*/ uint8_t FState_SYSYS; /*系统演示*/
uint8_t WXTZ_RYLQY; /*燃油滤清油*/ uint8_t WXTZ_FDJY; /*发动机油*/
uint8_t WXTZ_BSXY; /*变速箱油*/ uint8_t WXTZ_RYLQY; /*燃油滤清油*/
uint8_t WXTZ_CSQY; /*差速器油*/ uint8_t WXTZ_BSXY; /*变速箱油*/
uint8_t WXTZ_LHQY; /*离合器油*/ uint8_t WXTZ_CSQY; /*差速器油*/
uint8_t WXTZ_KQGZJ; /*空气干燥剂*/ uint8_t WXTZ_LHQY; /*离合器油*/
uint8_t WXTZ_DLZXY; /*动力转向油*/ uint8_t WXTZ_KQGZJ; /*空气干燥剂*/
uint8_t WXTZ_LT; /*轮胎*/ uint8_t WXTZ_DLZXY; /*动力转向油*/
uint8_t WXTZ_QDJ; /*起动机*/ uint8_t WXTZ_LT; /*轮胎*/
uint8_t WXSD_FDJY; /*发动机*/ uint8_t WXTZ_QDJ; /*起动机*/
uint8_t WXSD_RYLQY; /*燃油滤清油*/ uint8_t WXSD_FDJY; /*发动机*/
uint8_t WXSD_BSXY; /*变速箱油*/ uint8_t WXSD_RYLQY; /*燃油滤清油*/
uint8_t WXSD_CSQY; /*差速器油*/ uint8_t WXSD_BSXY; /*变速箱油*/
uint8_t WXSD_LHQY; /*离合器油*/ uint8_t WXSD_CSQY; /*差速器油*/
uint8_t WXSD_KQGZJ; /*空气转向*/ uint8_t WXSD_LHQY; /*离合器油*/
uint8_t WXSD_DLZXY; /*动力转向*/ uint8_t WXSD_KQGZJ; /*空气转向*/
uint8_t WXSD_LT; /*轮胎*/ uint8_t WXSD_DLZXY; /*动力转向*/
uint8_t WXSD_QDJ; /*起动机*/ uint8_t WXSD_LT; /*轮胎*/
uint8_t USER_DATE; /*日期设定*/ uint8_t WXSD_QDJ; /*起动机*/
uint8_t USER_TIME; /*时间设定*/ uint8_t USER_DATE; /*日期设定*/
uint8_t USER_DISPLAY; /*显示设定*/ uint8_t USER_TIME; /*时间设定*/
uint8_t USER_PROPOSAL; /*省油设定*/ uint8_t USER_DISPLAY; /*显示设定*/
uint8_t USER_HSA; /*HAS*/ uint8_t USER_PROPOSAL; /*省油设定*/
uint8_t USER_VOLUEM; /*音量设定*/ uint8_t USER_HSA; /*HAS*/
uint8_t USER_LANGUAGE; /*语言设定*/ uint8_t USER_VOLUEM; /*音量设定*/
uint8_t USER_COMPANY; /*单位设定*/ uint8_t USER_LANGUAGE; /*语言设定*/
uint8_t USER_LIGHT; /*亮度设定*/ uint8_t USER_COMPANY; /*单位设定*/
uint8_t USER_SETIC; /*仪表设定*/ uint8_t USER_LIGHT; /*亮度设定*/
uint8_t USER_SETIC; /*仪表设定*/
uint8_t DEMO_LDWS; uint8_t DEMO_LDWS;
uint8_t DEMO_AEBS1; uint8_t DEMO_AEBS1;
uint8_t DEMO_AEBS2; uint8_t DEMO_AEBS2;
uint8_t DEMO_AEBS3; uint8_t DEMO_AEBS3;
uint8_t FState_TPMSSET; /*胎压设置*/
uint8_t ENTER_RETURN; uint8_t ENTER_RETURN;
uint8_t Menu_Key_Static; uint8_t Menu_Key_Static;
...@@ -194,112 +193,110 @@ extern void GUI_Display_background(void); /*刷底图*/ ...@@ -194,112 +193,110 @@ extern void GUI_Display_background(void); /*刷底图*/
extern void GUI_OftenShow_Display(void); /*常显界面*/ extern void GUI_OftenShow_Display(void); /*常显界面*/
extern void GUI_Dynamic_DIsplay(void); extern void GUI_Dynamic_DIsplay(void);
void GUI_AC_Temp_Dispaly(uint8_t Mode); /*室外温度显示*/ void GUI_AC_Temp_Dispaly(uint8_t Mode); /*室外温度显示*/
void GUI_Time_Dispaly(uint8_t Mode); /*时间显示*/ void GUI_Time_Dispaly(uint8_t Mode); /*时间显示*/
void GUI_Data_Dispaly(uint8_t Mode); /*日历显示*/ void GUI_Data_Dispaly(uint8_t Mode); /*日历显示*/
void GUI_TFTTelltales_Display(uint8_t Mode); /*TFT指示灯*/ void GUI_TFTTelltales_Display(uint8_t Mode); /*TFT指示灯*/
void GUI_WetGas_Dispaly(uint8_t Mode); /*wet气压*/ void GUI_WetGas_Dispaly(uint8_t Mode); /*wet气压*/
void GUI_AdBlue_Dispaly(uint8_t Mode); /**/ void GUI_AdBlue_Dispaly(uint8_t Mode); /**/
void Gui_TRIPA_Display(uint8_t Mode); /*TRIPA*/ void Gui_TRIPA_Display(uint8_t Mode); /*TRIPA*/
void Gui_TRIPB_Display(uint8_t Mode); /*TRIPB*/ void Gui_TRIPB_Display(uint8_t Mode); /*TRIPB*/
void Gui_ODO_Display(uint8_t Mode); /*ODO*/ void Gui_ODO_Display(uint8_t Mode); /*ODO*/
void Gui_ADAS_Display(uint8_t Mode); /*ADAS*/ void Gui_ADAS_Display(uint8_t Mode); /*ADAS*/
void Gui_DrivingSupport_Display(uint8_t Mode); /*定速巡航*/ void Gui_DrivingSupport_Display(uint8_t Mode); /*定速巡航*/
void Gui_Gear_Display(uint8_t Mode); /*挡位*/ void Gui_Gear_Display(uint8_t Mode); /*挡位*/
void GUI_AVG_FuelSpeed_Display(uint8_t Mode); /*平均车速,平均油耗*/ void GUI_AVG_FuelSpeed_Display(uint8_t Mode); /*平均车速,平均油耗*/
void GUI_Drive_Info_Avg_Speed_Display(uint16_t Speed); /*平均车速*/ void GUI_Drive_Info_Avg_Speed_Display(uint16_t Speed); /*平均车速*/
void GUI_Drive_Info_Avg_Fuel_Display(uint16_t Fuel); /*平均油耗*/ void GUI_Drive_Info_Avg_Fuel_Display(uint16_t Fuel); /*平均油耗*/
void GUI_Battery_Display_Display(uint8_t Mode); /*电池电量*/ void GUI_Battery_Display_Display(uint8_t Mode); /*电池电量*/
void GUI_DPD_Display_Display(uint8_t Mode); /*DPD*/ void GUI_DPD_Display_Display(uint8_t Mode); /*DPD*/
void GUI_Time_OilTemp_Display(uint8_t Mode); /*转速时间-油温*/ void GUI_Time_OilTemp_Display(uint8_t Mode); /*转速时间-油温*/
void GUI_Time_OilTemp_OFF_Display(uint8_t Mode); /*OFF 转速时间-油温*/ void GUI_Time_OilTemp_OFF_Display(uint8_t Mode); /*OFF 转速时间-油温*/
void GUI_Year_Month_Data_Display(uint8_t Mode); /*年月日*/ void GUI_Year_Month_Data_Display(uint8_t Mode); /*年月日*/
void GUI_block_NULL_Display(uint8_t Mode); /*……*/ void GUI_block_NULL_Display(uint8_t Mode); /*……*/
void GUI_BG_Menu_Display(uint8_t Mode); /*一级菜单项*/ void GUI_BG_Menu_Display(uint8_t Mode); /*一级菜单项*/
void GUI_BG_Menu1_Display(uint8_t Mode); /**/ void GUI_BG_Menu1_Display(uint8_t Mode); /**/
void GUI_BG_Menu2_Display(uint8_t Mode); /**/ void GUI_BG_Menu2_Display(uint8_t Mode); /**/
void GUI_BG_Menu3_Display(uint8_t Mode); /**/ void GUI_BG_Menu3_Display(uint8_t Mode); /**/
void GUI_BG_Menu4_Display(uint8_t Mode); /**/ void GUI_BG_Menu4_Display(uint8_t Mode); /**/
void GUI_BG_Menu5_Display(uint8_t Mode); /**/ void GUI_BG_Menu5_Display(uint8_t Mode); /**/
void GUI_BG_Menu6_Display(uint8_t Mode); /**/ void GUI_BG_Menu6_Display(uint8_t Mode); /**/
void GUI_BG_Errot_Display(uint8_t Mode); /*二级菜单--故障码显示*/ void GUI_BG_Errot_Display(uint8_t Mode); /*二级菜单--故障码显示*/
void GUI_BG_Rep_Menu_Display(uint8_t Mode); /*二级菜单--保养通知*/ void GUI_BG_Rep_Menu_Display(uint8_t Mode); /*二级菜单--保养通知*/
void GUI_BG_RepMenu1_Display(uint8_t Mode); /**/ void GUI_BG_RepMenu1_Display(uint8_t Mode); /**/
void GUI_BG_RepMenu2_Display(uint8_t Mode); /**/ void GUI_BG_RepMenu2_Display(uint8_t Mode); /**/
void GUI_BG_RepMenu3_Display(uint8_t Mode); /**/ void GUI_BG_RepMenu3_Display(uint8_t Mode); /**/
void GUI_BG_RepMenu4_Display(uint8_t Mode); /**/ void GUI_BG_RepMenu4_Display(uint8_t Mode); /**/
void GUI_BG_RepMenu5_Display(uint8_t Mode); /**/ void GUI_BG_RepMenu5_Display(uint8_t Mode); /**/
void GUI_BG_RepMenu6_Display(uint8_t Mode); /**/ void GUI_BG_RepMenu6_Display(uint8_t Mode); /**/
void GUI_BG_RepMenu7_Display(uint8_t Mode); /**/ void GUI_BG_RepMenu7_Display(uint8_t Mode); /**/
void GUI_BG_RepMenu8_Display(uint8_t Mode); /**/ void GUI_BG_RepMenu8_Display(uint8_t Mode); /**/
void GUI_BG_RepMenu9_Display(uint8_t Mode); /**/ void GUI_BG_RepMenu9_Display(uint8_t Mode); /**/
void GUI_BG_RepSet_Menu_Display(uint8_t Mode); /*二级菜单--保养通知设定*/ void GUI_BG_RepSet_Menu_Display(uint8_t Mode); /*二级菜单--保养通知设定*/
void GUI_BG_RepSetMenu1_Display(uint8_t Mode); /**/ void GUI_BG_RepSetMenu1_Display(uint8_t Mode); /**/
void GUI_BG_RepSetMenu2_Display(uint8_t Mode); /**/ void GUI_BG_RepSetMenu2_Display(uint8_t Mode); /**/
void GUI_BG_RepSetMenu3_Display(uint8_t Mode); /**/ void GUI_BG_RepSetMenu3_Display(uint8_t Mode); /**/
void GUI_BG_RepSetMenu4_Display(uint8_t Mode); /**/ void GUI_BG_RepSetMenu4_Display(uint8_t Mode); /**/
void GUI_BG_RepSetMenu5_Display(uint8_t Mode); /**/ void GUI_BG_RepSetMenu5_Display(uint8_t Mode); /**/
void GUI_BG_RepSetMenu6_Display(uint8_t Mode); /**/ void GUI_BG_RepSetMenu6_Display(uint8_t Mode); /**/
void GUI_BG_RepSetMenu7_Display(uint8_t Mode); /**/ void GUI_BG_RepSetMenu7_Display(uint8_t Mode); /**/
void GUI_BG_RepSetMenu8_Display(uint8_t Mode); /**/ void GUI_BG_RepSetMenu8_Display(uint8_t Mode); /**/
void GUI_BG_UserSet_Menu_Display(uint8_t Mode); /*二级菜单--用户设定*/ void GUI_BG_UserSet_Menu_Display(uint8_t Mode); /*二级菜单--用户设定*/
void GUI_BG_UserSetMenu1_Display(uint8_t Mode); /**/ void GUI_BG_UserSetMenu1_Display(uint8_t Mode); /**/
void GUI_BG_UserSetMenu2_Display(uint8_t Mode); /**/ void GUI_BG_UserSetMenu2_Display(uint8_t Mode); /**/
void GUI_BG_UserSetMenu3_Display(uint8_t Mode); /**/ void GUI_BG_UserSetMenu3_Display(uint8_t Mode); /**/
void GUI_BG_UserSetMenu4_Display(uint8_t Mode); /**/ void GUI_BG_UserSetMenu4_Display(uint8_t Mode); /**/
void GUI_BG_UserSetMenu5_Display(uint8_t Mode); /**/ void GUI_BG_UserSetMenu5_Display(uint8_t Mode); /**/
void GUI_BG_UserSetMenu6_Display(uint8_t Mode); /**/ void GUI_BG_UserSetMenu6_Display(uint8_t Mode); /**/
void GUI_BG_UserSetMenu7_Display(uint8_t Mode); /**/ void GUI_BG_UserSetMenu7_Display(uint8_t Mode); /**/
void GUI_BG_Demo_Menu_Display(uint8_t Mode); /*二级菜单--系统演示模式*/ void GUI_BG_Demo_Menu_Display(uint8_t Mode); /*二级菜单--系统演示模式*/
void GUI_BG_DemoMenu1_Display(uint8_t Mode); /**/ void GUI_BG_DemoMenu1_Display(uint8_t Mode); /**/
void GUI_BG_DemoMenu2_Display(uint8_t Mode); /**/ void GUI_BG_DemoMenu2_Display(uint8_t Mode); /**/
void GUI_BG_DemoMenu3_Display(uint8_t Mode); /**/ void GUI_BG_DemoMenu3_Display(uint8_t Mode); /**/
void GUI_BG_DemoMenu4_Display(uint8_t Mode); /**/ void GUI_BG_DemoMenu4_Display(uint8_t Mode); /**/
void GUI_BG_TPMS_GasPIC_Display(uint8_t Mode); /*二级菜单--TPMS*/ void GUI_BG_TPMS_GasPIC_Display(uint8_t Mode); /*二级菜单--TPMS*/
void GUI_BG_TPMS_GasNUM_Display(uint8_t Mode); /**/ void GUI_BG_TPMS_GasNUM_Display(uint8_t Mode); /**/
void GUI_BG_TPMS_TempPIC_Display(uint8_t Mode); /**/ void GUI_BG_TPMS_TempPIC_Display(uint8_t Mode); /**/
void GUI_BG_TPMS_TempNUM_Display(uint8_t Mode); /**/ void GUI_BG_TPMS_TempNUM_Display(uint8_t Mode); /**/
void GUI_BG_RepMenu_Display(uint8_t Mode); /*三级菜单--保养通知*/ void GUI_BG_RepMenu_Display(uint8_t Mode); /*三级菜单--保养通知*/
void GUI_BG_RepMenu_3_1_Display(uint8_t Mode); /**/ void GUI_BG_RepMenu_3_1_Display(uint8_t Mode); /**/
void GUI_BG_RepMenu_3_2_Display(uint8_t Mode); /**/ void GUI_BG_RepMenu_3_2_Display(uint8_t Mode); /**/
void GUI_BG_RepMenu_3_3_Display(uint8_t Mode); /**/ void GUI_BG_RepMenu_3_3_Display(uint8_t Mode); /**/
void GUI_BG_RepMenu_3_4_Display(uint8_t Mode); /**/ void GUI_BG_RepMenu_3_4_Display(uint8_t Mode); /**/
void GUI_BG_RepMenu_3_6_Display(uint8_t Mode); /**/ void GUI_BG_RepMenu_3_6_Display(uint8_t Mode); /**/
void GUI_BG_RepMenu_3_7_Display(uint8_t Mode); /**/ void GUI_BG_RepMenu_3_7_Display(uint8_t Mode); /**/
void GUI_BG_RepMenu_3_8_Display(uint8_t Mode); /**/ void GUI_BG_RepMenu_3_8_Display(uint8_t Mode); /**/
void GUI_BG_RepMenuSet_Menu_Display(uint8_t Mode); /**/ void GUI_BG_RepMenuSet_Menu_Display(uint8_t Mode); /**/
void GUI_BG_RepSetMenu_3_1_Display(uint8_t Mode); /**/ void GUI_BG_RepSetMenu_3_1_Display(uint8_t Mode); /**/
void GUI_BG_RepSetMenu_3_2_Display(uint8_t Mode); /**/ void GUI_BG_RepSetMenu_3_2_Display(uint8_t Mode); /**/
void GUI_BG_RepSetMenu_3_3_Display(uint8_t Mode); /**/ void GUI_BG_RepSetMenu_3_3_Display(uint8_t Mode); /**/
void GUI_BG_RepSetMenu_3_4_Display(uint8_t Mode); /**/ void GUI_BG_RepSetMenu_3_4_Display(uint8_t Mode); /**/
void GUI_BG_RepSetMenu_3_5_Display(uint8_t Mode); /**/ void GUI_BG_RepSetMenu_3_5_Display(uint8_t Mode); /**/
void GUI_BG_RepSetMenu_3_6_Display(uint8_t Mode); /**/ void GUI_BG_RepSetMenu_3_6_Display(uint8_t Mode); /**/
void GUI_BG_RepSetMenu_3_7_Display(uint8_t Mode); /**/ 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_UserSet_SYSD_GSL_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_Ybl_Display(uint8_t Mode); /**/
void GUI_BG_UserSet_SYSD_Speed_Display(uint8_t Mode); /**/ void GUI_BG_UserSet_SYSD_Speed_Display(uint8_t Mode); /**/
void GUI_BG_UserSet_SYSD_JADD_Display(uint8_t Mode);/**/ void GUI_BG_UserSet_SYSD_JADD_Display(uint8_t Mode); /**/
void GUI_BG_UserSet_SYSD_JSUB_Display(uint8_t Mode);/**/ void GUI_BG_UserSet_SYSD_JSUB_Display(uint8_t Mode); /**/
void GUI_BG_UserSet_SYSD_IDLING_Display(uint8_t Mode);/**/ void GUI_BG_UserSet_SYSD_IDLING_Display(uint8_t Mode); /**/
void GUI_BG_UserSet_SYSD_Parking_Display(uint8_t Mode); /**/ void GUI_BG_UserSet_SYSD_Parking_Display(uint8_t Mode); /**/
void GUI_BG_Enter_Return_Display(uint8_t Mode); /**/ void GUI_BG_Enter_Return_Display(uint8_t Mode); /**/
void Common_EOL_User_Server(void); void Common_EOL_User_Server(void);
#endif #endif
\ No newline at end of file
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