Skip to content

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

增加界面

parent f30f67ff
Expand all Show whitespace changes
Inline Side-by-side
Showing with 24119 additions and 23817 deletions
ghs/project
View file @ 61479894
No preview for this file type
ghs/project.hex
View file @ 61479894
This diff is collapsed.
ghs/project.siz
View file @ 61479894
project .intvect 1536
project .text 303532
project .rodata 410071
project .text 304844
project .rodata 410871
project .secinfo 120
project .syscall 6
project .romdata 9045
......
source/Application/CAN_APP_NM/CAN_App/CAN_FUNC.h
View file @ 61479894
......@@ -3,6 +3,22 @@
#include "TYW_stdint.h"
typedef struct
{
uint32_t TripA_Fuel ;
uint32_t TripA_Average_Speed ;
uint32_t TripA_Fuel_Consume ;
uint32_t TripA_Idling ;
uint32_t TripA_Runing ;
uint32_t TripB_Fuel ;
uint32_t TripB_Average_Speed ;
uint32_t TripB_Fuel_Consume ;
uint32_t TripB_Idling ;
uint32_t TripB_Runing ;
uint32_t Engine_Surplus ;
} USER_ECU;
extern USER_ECU User_ECU;
extern void Can_Set_Buff_18FEAE17(uint8_t CopyData []) ;
......@@ -31,4 +47,13 @@ extern void Can_Set_Buff_18EF2D17(uint8_t CopyData []) ;
extern void Can_Set_Buff_18033317(uint8_t CopyData []) ;
extern void Can_Set_Buff_180433A2(uint8_t CopyData []) ;
void Drive_Info_IC1_STATUS_Rx(void);
uint32_t Common_Data_Get_TripA_Fuel(void);
uint32_t Common_Data_Get_TripA_Average_Speed(void);
uint32_t Common_Data_Get_TripB_Fuel(void);
uint32_t Common_Data_Get_TripB_Average_Speed(void);
#endif
\ No newline at end of file
source/Application/Graphic/GUI/GUI.c
View file @ 61479894
This diff is collapsed.
source/Application/Graphic/GUI/GUI.h
View file @ 61479894
......@@ -49,18 +49,20 @@ typedef struct
uint8_t FState_TPMSSET; /*胎压设置*/
uint8_t ENTER_RETURN ;
uint8_t ENTER_RETURN;
uint8_t FState_COilTimeOut;
uint8_t FState_ClearOilRx;
} _Display_State_Flag;
extern volatile _Display_State_Flag State_Flag;
static const uint32_t GUIWedk[7u] = {CN_xingqiyi, CN_xingqier, CN_xingqisan, CN_xingqisi, CN_xingqiwu, CN_xingqiliu, CN_xingqiri};
static const uint32_t GUIGear[12u] = {CN_dangwei_01, CN_dangwei_02, CN_dangwei_03, CN_dangwei_04, CN_dangwei_05, CN_dangwei_06,
CN_dangwei_07, CN_dangwei_08, CN_dangwei_09, CN_dangwei_10, CN_dangwei_11, CN_dangwei_12
};
static const uint32_t GUIMenuWedk[7u] = {CN_Mon, CN_Tue, CN_Wed, CN_Thu, CN_Fri, CN_Sat, CN_ri};
static const uint32_t GUIGear[12u] = {CN_dangwei_1, CN_dangwei_2, CN_dangwei_3, CN_dangwei_4, CN_dangwei_5, CN_dangwei_6, CN_dangwei_7, CN_dangwei_8, CN_dangwei_9, CN_dangwei_10, CN_dangwei_11, CN_dangwei_12};
static const uint16_t GUI_DISP_AC_TEMP[2] = {229u, 216u}; /*室外温度数字显示*/
static const uint16_t GUI_DISP_Hours[2] = {370u, 349u};
......@@ -99,6 +101,9 @@ static const uint16_t GUIUsetSetYPosX[2] = {358u, 337u};
static const uint16_t GUIUsetSetMPosX[2] = {463u, 440u};
static const uint16_t GUIUsetSetDPosX[2] = {570u, 547u};
static const uint16_t GUIBGAVGSpeedPosX[4] = {667u, 642u, 617u, 592u};
static const uint16_t GUIBGAVGFuelPosX[4] = {667u, 628u, 603u, 578u};
extern void GUI_Display_KL15_ON_Init(void);
extern void GUI_Display_KL15_OFF_Init(void);
extern void GUI_Display_Value_Init(void); /*显示数据初始化*/
......@@ -119,8 +124,8 @@ void Gui_ADAS_Display(uint8_t Mode); /*ADAS*/
void Gui_DrivingSupport_Display(uint8_t Mode); /*定速巡航*/
void Gui_Gear_Display(uint8_t Mode); /*挡位*/
void GUI_AVG_FuelSpeed_Display(uint8_t Mode); /*平均车速，平均油耗*/
void GUI_Drive_Info_Avg_Speed_Display(uint8_t Valid, uint16_t Speed); /*平均车速*/
void GUI_Drive_Info_Avg_Fuel_Display(uint8_t Valid, uint16_t Fuel); /*平均油耗*/
void GUI_Drive_Info_Avg_Speed_Display(uint16_t Speed); /*平均车速*/
void GUI_Drive_Info_Avg_Fuel_Display(uint16_t Fuel); /*平均油耗*/
void GUI_Battery_Display_Display(uint8_t Mode); /*电池电量*/
void GUI_DPD_Display_Display(uint8_t Mode); /*DPD*/
void GUI_Time_OilTemp_Display(uint8_t Mode); /*转速时间-油温*/
......@@ -163,36 +168,34 @@ void GUI_BG_UserSetMenu5_Display(uint8_t Mode); /**/
void GUI_BG_UserSetMenu6_Display(uint8_t Mode); /**/
void GUI_BG_UserSetMenu7_Display(uint8_t Mode); /**/
void GUI_BG_Demo_Menu_Display(uint8_t Mode); /*二级菜单--系统演示模式*/
void GUI_BG_DemoMenu1_Display(uint8_t Mode);
void GUI_BG_DemoMenu2_Display(uint8_t Mode);
void GUI_BG_DemoMenu3_Display(uint8_t Mode);
void GUI_BG_DemoMenu4_Display(uint8_t Mode);
void GUI_BG_DemoMenu1_Display(uint8_t Mode); /**/
void GUI_BG_DemoMenu2_Display(uint8_t Mode); /**/
void GUI_BG_DemoMenu3_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_GasNUM_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_GasNUM_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_RepMenu_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_3_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_7_Display(uint8_t Mode);
void GUI_BG_RepMenu_3_8_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_3_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_7_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_RepSetMenu_3_1_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_4_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_7_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_3_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_6_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_Date_Display(uint8_t Mode);
void GUI_BG_UserSet_Time_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_Enter_Return_Display(uint8_t Mode);
void GUI_BG_Enter_Return_Display(uint8_t Mode); /**/
#endif
\ No newline at end of file
source/Driver/Graphic/images.c
View file @ 61479894
This source diff could not be displayed because it is too large. You can view the blob instead.
source/Driver/Graphic/images.h
View file @ 61479894
......@@ -124,6 +124,7 @@ enum SpriteName
Nb_21_7,
Nb_21_8,
Nb_21_9,
Nb_21_dian,
Nb_21_hengxian,
Nb_21_maohao,
CN_Nb_28_0,
......@@ -138,25 +139,55 @@ enum SpriteName
CN_Nb_28_9,
CN_Nb_28_dian,
CN_Nb_28_heng,
CN_RC_Nb_12_0,
CN_RC_Nb_12_1,
CN_RC_Nb_12_2,
CN_RC_Nb_12_3,
CN_RC_Nb_12_4,
CN_RC_Nb_12_5,
CN_RC_Nb_12_6,
CN_RC_Nb_12_7,
CN_RC_Nb_12_8,
CN_RC_Nb_12_9,
CN_RC_Nb_12_heng,
CN_RC_Nb_14_0,
CN_RC_Nb_14_1,
CN_RC_Nb_14_2,
CN_RC_Nb_14_3,
CN_RC_Nb_14_4,
CN_RC_Nb_14_5,
CN_RC_Nb_14_6,
CN_RC_Nb_14_7,
CN_RC_Nb_14_8,
CN_RC_Nb_14_9,
CN_RC_Nb_14_dian,
CN_RC_Nb_19_0,
CN_RC_Nb_19_1,
CN_RC_Nb_19_2,
CN_RC_Nb_19_3,
CN_RC_Nb_19_4,
CN_RC_Nb_19_5,
CN_RC_Nb_19_6,
CN_RC_Nb_19_7,
CN_RC_Nb_19_8,
CN_RC_Nb_19_9,
CN_RC_Nb_19_dian,
CN_RC_Nb_21_0,
CN_RC_Nb_21_1,
CN_RC_Nb_21_2,
CN_RC_Nb_21_3,
CN_RC_Nb_21_4,
CN_RC_Nb_21_5,
CN_RC_Nb_21_6,
CN_RC_Nb_21_7,
CN_RC_Nb_21_8,
CN_RC_Nb_21_9,
CN_RC_Nb_21_heng,
CN_RC_Nb_21_maohao,
CN_qiya,
CN_qiyafuhaodeng,
CN_qiyazouge_01,
CN_qiyazouge_02,
CN_qiyazouge_03,
CN_qiyazouge_04,
CN_qiyazouge_05,
CN_qiyazouge_06,
CN_qiyazouge_07,
CN_qiyazouge_08,
CN_qiyazouge_09,
CN_qiyazouge_10,
CN_qiyazouge_11,
CN_qiyazouge_12,
CN_qiyazouge_13,
CN_qiyazouge_14,
CN_qiyazouge_15,
CN_qiyazouge_16,
CN_qiyazouge_17,
CN_tianlanye,
CN_tianlanyefuhaodeng,
CN_tianlanyezouge_01,
......@@ -164,18 +195,18 @@ enum SpriteName
CN_tianlanyezouge_03,
CN_tianlanyezouge_04,
CN_tianlanyezouge_05,
CN_dangwei_01,
CN_dangwei_02,
CN_dangwei_03,
CN_dangwei_04,
CN_dangwei_05,
CN_dangwei_06,
CN_dangwei_07,
CN_dangwei_08,
CN_dangwei_09,
CN_dangwei_1,
CN_dangwei_10,
CN_dangwei_11,
CN_dangwei_12,
CN_dangwei_2,
CN_dangwei_3,
CN_dangwei_4,
CN_dangwei_5,
CN_dangwei_6,
CN_dangwei_7,
CN_dangwei_8,
CN_dangwei_9,
CN_dangwei_buming,
CN_dangwei_DM,
CN_dangwei_E,
......@@ -192,7 +223,6 @@ enum SpriteName
CN_TRIP,
CN_TRIP_A,
CN_TRIP_B,
CN_TRIP_danwei,
CN_Alarm_01_image,
CN_Alarm_01_imageblack,
CN_Alarm_01_wenzi1,
......@@ -363,6 +393,28 @@ enum SpriteName
CN_DPD_zouge3,
CN_DPD_zouge4,
CN_DPD_zouge5,
CN_PJchesu,
CN_PJchesu_kmh,
CN_PJyouhao,
CN_PJyouhao_L100km,
CN_TRIPAB,
CN_TRIPAB_A,
CN_TRIPAB_B,
CN_Bri_an,
CN_Bri_ming,
CN_Bri_zouge,
CN_Alarm_Fault_01_image,
CN_Alarm_Fault_01_wenzi,
CN_Alarm_Fault_02_image,
CN_Alarm_Fault_02_wenzi,
CN_Alarm_Fault_03_image,
CN_Alarm_Fault_03_wenzi,
CN_Alarm_Fault_04_image,
CN_Alarm_Fault_04_wenzi,
CN_Alarm_Fault_05_image,
CN_Alarm_Fault_05_wenzi,
CN_Alarm_Fault_06_image,
CN_Alarm_Fault_06_wenzi,
CN_AM,
CN_Fri,
CN_kuohao,
......@@ -382,19 +434,8 @@ enum SpriteName
CN_dianyaji_kedu,
CN_dianyaji_L,
CN_dianyaji_tubiao,
CN_dianyaji_zouge1,
CN_dianyaji_zouge10,
CN_dianyaji_zouge11,
CN_dianyaji_zouge12,
CN_dianyaji_zouge13,
CN_dianyaji_zouge2,
CN_dianyaji_zouge3,
CN_dianyaji_zouge4,
CN_dianyaji_zouge5,
CN_dianyaji_zouge6,
CN_dianyaji_zouge7,
CN_dianyaji_zouge8,
CN_dianyaji_zouge9,
CN_dianyaji_zouge_red,
CN_dianyaji_zouge_white,
CN_ENTER_danjieshu,
CN_ENTER_Gray,
CN_ENTER_jieshu,
......@@ -427,8 +468,10 @@ enum SpriteName
CN_jiao3,
CN_jiao4,
CN_LeftRoad,
CN_LeftRoad_1,
CN_LeftRoad_shanshuo,
CN_RightRoad,
CN_RightRoad_1,
CN_RightRoad_shanshuo,
CN_Road1,
CN_Road1_shanshuo,
......@@ -436,8 +479,6 @@ enum SpriteName
CN_Road2_shanshuo,
CN_Road3,
CN_Road3_shanshuo,
CN_Road4,
CN_Road4_shanshuo,
CN_tanhao1,
CN_tanhao2,
CN_fengexian,
......@@ -698,6 +739,11 @@ enum SpriteName
CN_User_Menu3_01_22,
CN_User_Menu3_01_23,
CN_User_Menu3_01_24,
CN_User_Menu3_01_25,
CN_User_Menu3_01_26,
CN_User_Menu3_01_27,
CN_User_Menu3_01_28,
CN_User_Menu3_01_29,
CN_User_Menu3_01_3,
CN_User_Menu3_01_4,
CN_User_Menu3_01_5,
......@@ -774,6 +820,7 @@ enum SpriteName
CN_User_Menu3_03_kuang,
CN_User_Menu3_03_man,
CN_User_Menu3_03_nian,
CN_User_Menu3_03_PM,
CN_User_Menu3_03_redge,
CN_User_Menu3_03_ri,
CN_User_Menu3_03_rpm,
......@@ -803,6 +850,8 @@ enum SpriteName
CN_User_Menu3_03_luntai2,
CN_User_Menu3_03_luntai3,
CN_User_Menu3_03_luntai4,
CN_User_Menu3_03_luntai5,
CN_User_Menu3_03_luntai_guang,
CN_User_Menu3_04_che,
CN_User_Menu3_04_jiantou1,
CN_User_Menu3_04_jiantou2,
......
source/System/tasks.c
View file @ 61479894
......@@ -88,6 +88,7 @@
#include "SEG_DISPLAY.h"
#include "Buzzer.h"
#include "CAN_FUNC.h"
/*******************************************************************************
* *
......@@ -220,8 +221,8 @@ void Sys_Run_Mode_100ms_Tasks(void)
Popups_Management_Service();
Popup_Scheduling_Service();
/*CAN 数据处理*/
Drive_Info_IC1_STATUS_Rx();
/*加速度计算*/
Data_Acc_Speed_Processing();
......
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