Skip to content

H
haoJin750TFT
Commit 5184fee4 authored by 王雅楠's avatar 王雅楠
Browse files
Options

Merge branch 'wangyanan' into 'dev' 

Wangyanan

See merge request !66
parents 0710b110 ed8a632e
Hide whitespace changes
Inline Side-by-side
Showing with 85 additions and 38 deletions
Firmware/Source/Component/AMT630H/AMT630H_Datas.c
View file @ 5184fee4
......@@ -15,6 +15,8 @@ uint16_t g_u16vspeednumberup = 0;
uint16_t g_u16vspeednumberdown = 300;
uint16_t g_u16espeednumberup = 0;
uint16_t g_u16espeednumberdown = 300;
uint16_t g_u16voltagenumberup = 0;
uint16_t g_u16voltagenumberdown = 160;
//自检函数
void AMT630H_GUI_BACKGRAND_SelfCheck(void);
......@@ -71,7 +73,6 @@ void AMT630H_GUI_Fault_Information(void)
{
if(g_u8Display_Mode == ModeDAY)
{
if(g_u8Language == CH)
{
SetPagePic(GRAPHICS_PAGE_0, Pic_0163_27_396);
......@@ -108,8 +109,6 @@ void AMT630H_GUI_Fault_Information(void)
}
else if(g_u8Display_Mode == ModeNIGHT)
{
SetPagePic(GRAPHICS_PAGE_0, Pic_0900_610_229);//夜间 历史故障P
SetPagePic(GRAPHICS_PAGE_0, Pic_0900_610_164);//夜间 当前故障P
if(g_u8Language == CH)
{
SetPagePic(GRAPHICS_PAGE_0, Pic_0350_27_396);
......@@ -141,7 +140,7 @@ void AMT630H_GUI_Fault_Information(void)
SetPagePic(GRAPHICS_PAGE_0, Pic_0282_375_292);
SetPagePic(GRAPHICS_PAGE_0, Pic_0284_338_228);
SetPagePic(GRAPHICS_PAGE_0, Pic_0285_334_163);
SetPagePic(GRAPHICS_PAGE_0, Pic_0285_334_163);/*current fault*/
AMT630H_GUI_FaultCode(Get_FaultCode_Valid(),Get_Current_Hight_FaultCode(),Get_Current_Mid_FaultCode());
}
}
......@@ -173,18 +172,21 @@ static uint16_t NumbeList_FaultCode_night[]={
Pic_0234_605_289,
};
uint8_t FaultCodevalid_monitor = 2;
/*故障码显示函数*/
static void AMT630H_GUI_FaultCode(uint8_t FaultCodevalid,uint8_t FaultCode_hight,uint8_t FaultCode_mid)
{
/*数字只有两组 历史故障和故障信息纵坐标不同*/
DISPLAY_NUM_ST DisplayNumPara;
uint16_t frontnumber;
uint16_t midnumber;
frontnumber = FaultCode_hight;
midnumber = FaultCode_mid;
FaultCodevalid_monitor = FaultCodevalid;
if(FaultCodevalid == 1)
{
DISPLAY_NUM_ST DisplayNumPara;
uint16_t frontnumber;
uint16_t midnumber;
frontnumber = FaultCode_hight;
midnumber = FaultCode_mid;
if(g_u8Display_Mode == ModeDAY)
{
SetPagePicFree(GRAPHICS_PAGE_0, Pic_0876_639_293, 610, 164);//当前故障码的P
......@@ -224,8 +226,8 @@ static void AMT630H_GUI_FaultCode(uint8_t FaultCodevalid,uint8_t FaultCode_hight
}
else if(g_u8Display_Mode == ModeNIGHT)
{
SetPagePicFree(GRAPHICS_PAGE_0, Pic_0912_639_293, 610, 175);//当前故障码的P
SetPagePicFree(GRAPHICS_PAGE_0, Pic_0912_639_293, 610, 240);//历史故障码的P
SetPagePicFree(GRAPHICS_PAGE_0, Pic_0912_639_293, 610, 164);//当前故障码的P
SetPagePicFree(GRAPHICS_PAGE_0, Pic_0912_639_293, 610, 229);//历史故障码的P
/*当前故障码前两位显示*/
DisplayNumPara.NumList = NumbeList_FaultCode_night;
DisplayNumPara.x = 639;
......@@ -260,25 +262,29 @@ static void AMT630H_GUI_FaultCode(uint8_t FaultCodevalid,uint8_t FaultCode_hight
DisplayNum(GRAPHICS_PAGE_0, &DisplayNumPara, midnumber);
}
}
else
else if(FaultCodevalid == 0)
{
if(g_u8Display_Mode == ModeDAY)
{
/* ----- */
SetPagePic(GRAPHICS_PAGE_0, Pic_0930_612_240);
SetPagePic(GRAPHICS_PAGE_0, Pic_0930_612_175);
SetPagePic(GRAPHICS_PAGE_0, Pic_0931_612_240);
SetPagePic(GRAPHICS_PAGE_0, Pic_0931_612_175);
}
else if(g_u8Display_Mode == ModeNIGHT)
{
/* ----- */
SetPagePic(GRAPHICS_PAGE_0, Pic_0931_612_240);
SetPagePic(GRAPHICS_PAGE_0, Pic_0931_612_175);
SetPagePic(GRAPHICS_PAGE_0, Pic_0930_612_240);
SetPagePic(GRAPHICS_PAGE_0, Pic_0930_612_175);
}
else
{
;
}
}
else
{
;
}
}
/**
* @brief 显示模式信息 一级菜单
......@@ -3574,7 +3580,7 @@ static void AMT630H_GUI_Trip(uint32_t Trip, uint8_t Uint)
DisplayNumPara.MinDigits = 4;
if(Uint == 0)
{
SetPagePic(GRAPHICS_PAGE_0, Pic_0580_187_324);/*单位km*/
SetPagePic(GRAPHICS_PAGE_0, Pic_0688_187_324);/*单位km*/
}
else
{
......@@ -3587,7 +3593,7 @@ static void AMT630H_GUI_Trip(uint32_t Trip, uint8_t Uint)
DisplayNumPara.MinDigits = 3;
if(Uint == 0)
{
SetPagePic(GRAPHICS_PAGE_0, Pic_0580_163_324);/*KM*/
SetPagePic(GRAPHICS_PAGE_0, Pic_0688_163_324);/*KM*/
}
else
{
......@@ -3600,20 +3606,20 @@ static void AMT630H_GUI_Trip(uint32_t Trip, uint8_t Uint)
DisplayNumPara.MinDigits = 2;
if(Uint == 0)
{
SetPagePic(GRAPHICS_PAGE_0, Pic_0580_139_324);/*KM*/
SetPagePic(GRAPHICS_PAGE_0, Pic_0688_139_324);/*KM*/
}
else
{
SetPagePic(GRAPHICS_PAGE_0, Pic_0863_139_324);/*单位mile*/
}
}
else if((Tripnumber<10)&&(Tripnumber>=0))
else if((Tripnumber < 10)&&(Tripnumber >= 0))
{
DisplayNumPara.x = 93;
DisplayNumPara.MinDigits = 2;
if(Uint == 0)
{
SetPagePic(GRAPHICS_PAGE_0, Pic_0580_139_324);/*单位KM*/
SetPagePic(GRAPHICS_PAGE_0, Pic_0688_139_324);/*单位KM*/
}
else
{
......@@ -3624,6 +3630,7 @@ static void AMT630H_GUI_Trip(uint32_t Trip, uint8_t Uint)
}
}
/*车速显示函数*/
static void AMT630H_GUI_VSpeed(uint16_t VSpeed,uint8_t Unit)
{
......@@ -3983,7 +3990,6 @@ void AMT630H_GUI_BACKGRAND_SelfCheck()
SetPagePic(GRAPHICS_PAGE_0, Pic_0748_194_26);/*E*/
// AMT630H_GUI_Telephone(Telephone);
AMT630H_GUI_Voltage(KL30_VOLTAGE_Value);
AMT630H_GUI_TIME(Get_Dis_Hour_Time(), Get_Dis_Minute_Time());
if(KL30_VOLTAGE_time < 10)
{
......@@ -4006,7 +4012,7 @@ void AMT630H_GUI_BACKGRAND_SelfCheck()
/*燃油自检*/
if(g_u16fuelnumberup < 600)
{
g_u16fuelnumberup += 6;
g_u16fuelnumberup += 12;
AMT630H_GUI_Fuel_SelfCheck(g_u16fuelnumberup/75);/*初始化g_u16fuelnumberup = 0*/
}
else
......@@ -4017,13 +4023,13 @@ void AMT630H_GUI_BACKGRAND_SelfCheck()
if(g_u16vspeednumberup < 300)
{
AMT630H_GUI_VSpeed(g_u16vspeednumberup,Get_Dis_Unit());/*初始化g_u16vspeednumberup = 0*/
g_u16vspeednumberup += 6;
g_u16vspeednumberup += 12;
}
else
{
if(g_u16vspeednumberdown >0)
{
g_u16vspeednumberdown -= 6;/*初始化g_u16vspeednumberup=1200*/
g_u16vspeednumberdown -= 12;/*初始化g_u16vspeednumberup=600*/
AMT630H_GUI_VSpeed(g_u16vspeednumberdown,Get_Dis_Unit());/*if g_u16vspeednumberup=0 车速自检结束*/
}
else
......@@ -4035,14 +4041,35 @@ void AMT630H_GUI_BACKGRAND_SelfCheck()
if(g_u16espeednumberup <= 300)
{
AMT630H_GUI_ESpeed(g_u16espeednumberup*40);/*初始化g_u16espeednumberup = 0*/
g_u16espeednumberup += 6;
g_u16espeednumberup += 12;
}
else
{
if(g_u16espeednumberdown > 0)
{
AMT630H_GUI_ESpeed(g_u16espeednumberdown*40);/*初始化g_u16espeednumberdown = 600*/
g_u16espeednumberdown -= 6;/*g_u16espeednumberdown = 0 转速自检结束*/
g_u16espeednumberdown -= 12;/*g_u16espeednumberdown = 0 转速自检结束*/
}
}
/*
*电压值自检
*电压自检范围：0V~16V
*/
if(g_u16voltagenumberup <= 160)
{
AMT630H_GUI_Voltage(g_u16voltagenumberup*10);
g_u16voltagenumberup += 5;
}
else
{
if(g_u16voltagenumberdown > 0)
{
AMT630H_GUI_Voltage(g_u16voltagenumberdown*10);
g_u16voltagenumberdown -= 5;
}
else
{
;
}
}
/*结束状态*/
......@@ -4058,8 +4085,12 @@ void AMT630H_GUI_BACKGRAND_SelfCheck()
{
AMT630H_GUI_ESpeed(g_u16espeednumberdown);
}
if(g_u16voltagenumberdown == 0)
{
AMT630H_GUI_Voltage(g_u16voltagenumberdown);
}
/*结束自检*/
if((g_u16fuelnumberup == 600)&&(g_u16vspeednumberdown == 0)&&(g_u16espeednumberdown == 0))
if((g_u16fuelnumberup == 600)&&(g_u16vspeednumberdown == 0)&&(g_u16espeednumberdown == 0)&&(g_u16voltagenumberdown == 0))
{
g_u8SelfCheck = 1;/*自检结束标志*/
}
......@@ -4269,9 +4300,13 @@ void AMT630H_GUI_ReadPosittion_Display(void)
PicObj.update_pic_id = Pic_0233;
PicObj.second_menu = 0;
PicObj.navigation_task_id = 0;
SetPagePic(GRAPHICS_PAGE_0, Pic_0233_605_289);
SetPagePic(GRAPHICS_PAGE_0, Pic_0193_0_0);
SetPagePic(GRAPHICS_PAGE_0, Pic_0477_178_130);
SetPagePic(GRAPHICS_PAGE_0, Pic_0001_0_0);/*图层*/
SetPagePic(GRAPHICS_PAGE_0, Pic_0932_124_85);/*\豪进750TFT（371000 - 7500 - 02TY0000）OTA升级*/
SetPagePic(GRAPHICS_PAGE_0, Pic_0933_101_210);/*\SSID: TYW_DASHBOARD*/
SetPagePic(GRAPHICS_PAGE_0, Pic_0934_102_260);/*\PASS: 88888888*/
//SetPagePic(GRAPHICS_PAGE_0, Pic_0935_36_367);/*\热点已连接到TYW_DASHBOARD*/
SetPagePic(GRAPHICS_PAGE_0, Pic_0936_92_367);/*\请根据提示设置手机热点*/
SetPagePic(GRAPHICS_PAGE_0, Pic_0937_564_521);/*\*请保持移动设备与仪表距离在半米内*/
PackedTransfer_DisplayPhoneMirrorQRcode(0, PicObj);
}
break;
......
Firmware/Source/Component/AMT630H/PicBin.c
View file @ 5184fee4
......@@ -117,7 +117,8 @@ static const uint16_t PicIndexData[] = {
Pic_0901, 12, 653, 164, Pic_0901, 12, 667, 164, Pic_0902, 13, 638, 293, Pic_0903, 15, 637, 293, Pic_0904, 15, 637, 293, Pic_0905, 21, 634, 293, Pic_0906, 15, 637, 293, Pic_0907, 14, 637, 293, Pic_0908, 15, 637, 293, Pic_0909, 13, 638, 292,
Pic_0910, 13, 639, 293, Pic_0911, 17, 636, 292, Pic_0912, 13, 639, 293, Pic_0913, 17, 636, 292, Pic_0914, 13, 638, 293, Pic_0915, 16, 636, 293, Pic_0916, 11, 640, 293, Pic_0917, 14, 639, 293, Pic_0899, 11, 638, 293, Pic_0918, 3, 643, 293,
Pic_0898, 14, 637, 293, Pic_0897, 15, 637, 292, Pic_0919, 11, 640, 293, Pic_0920, 12, 639, 293, Pic_0921, 14, 638, 293, Pic_0922, 14, 638, 292, Pic_0923, 14, 638, 293, Pic_0924, 15, 637, 293, Pic_0925, 221, 501, 160, Pic_0926, 50, 619, 240,
Pic_0926, 50, 619, 175, Pic_0927, 50, 619, 240, Pic_0927, 50, 619, 175, Pic_0928, 75, 894, 310, Pic_0929, 75, 894, 310, Pic_0930, 64, 612, 240, Pic_0930, 64, 612, 175, Pic_0931, 64, 612, 240, Pic_0931, 64, 612, 175,
Pic_0926, 50, 619, 175, Pic_0927, 50, 619, 240, Pic_0927, 50, 619, 175, Pic_0928, 75, 894, 310, Pic_0929, 75, 894, 310, Pic_0930, 64, 612, 240, Pic_0930, 64, 612, 175, Pic_0931, 64, 612, 240, Pic_0931, 64, 612, 175, Pic_0932, 777, 124, 85,
Pic_0933, 317, 101, 210, Pic_0934, 209, 102, 260, Pic_0935, 461, 36, 367, Pic_0936, 350, 92, 367, Pic_0937, 323, 564, 521,
};
#define PicIndexData_LEN 14888
//uint32_t PicIndexDataLEN = 0;
......
Firmware/Source/Component/AMT630H/PicBin.h
View file @ 5184fee4
#ifndef PICBIN_H
#define PICBIN_H
/* Flash Bin Version:20240826 2024-08-26 19:25:18 Compression ratio:70.00% */
/* Flash Bin Version:20240828 2024-08-28 15:55:32 Compression ratio:70.00% */
#define Pic_0001 1
#define Pic_0002 2
#define Pic_0003 3
......@@ -933,6 +933,12 @@
#define Pic_0929 929
#define Pic_0930 930
#define Pic_0931 931
#define Pic_0932 932
#define Pic_0933 933
#define Pic_0934 934
#define Pic_0935 935
#define Pic_0936 936
#define Pic_0937 937
enum {
Pic_0001_0_0 = 0,
......@@ -2109,9 +2115,15 @@ enum {
Pic_0930_612_175,
Pic_0931_612_240,
Pic_0931_612_175,
Pic_0932_124_85,
Pic_0933_101_210,
Pic_0934_102_260,
Pic_0935_36_367,
Pic_0936_92_367,
Pic_0937_564_521,
};
#define PIC_INDEX_DATA_CRC 0xC89CDFB5
#define PIC_INDEX_DATA_CRC 0xD0B47BE6
extern void User_PicIndexDataInit(void);
#endif
Firmware/Source/Component/Telltales/Telltales_user.c
View file @ 5184fee4
......@@ -336,14 +336,13 @@ static void LED_Fuel_Level_Low_Execution(Tellib_uint16_t led_status)
}
// uint16_t ECU_Engine_Temperature_R =0;
// uint32_t test_ECU_Engine_Temperature =0;
uint16_t test_ECU_Engine_Temperature =0;
/*信号来源：ECU_101 +硬线-P11 阻值 CAN>硬线*/
static Tellib_uint16_t LED_Coolant_Temperature_Judgement(void)
{
Tellib_uint16_t LED_STATE = 0u;
if (CAN_MSG_Status(&CAN_CH0_CanMsgOp, CAN_CH0_ID_CH0_101_Msg_Count) == CAN_SIG_LOST)
{
// ECU_Engine_Temperature_R = ADC_Read_Signal(ADC_CH_COOLANT_TEMP1_R);
if(ADC_Read_Signal(ADC_CH_COOLANT_TEMP1_R) <= 20)
{
ECU_Engine_Temperature_flag = 1;
......@@ -372,7 +371,7 @@ static Tellib_uint16_t LED_Coolant_Temperature_Judgement(void)
}
else
{
// test_ECU_Engine_Temperature = Get_CAN_CH0_ID_101_Sig_ECU_Engine_Temperature();
test_ECU_Engine_Temperature = Get_CAN_CH0_ID_101_Sig_ECU_Engine_Temperature();
if(Get_CAN_CH0_ID_101_Sig_ECU_Engine_Temperature() >= 120 )
{
ECU_Engine_Temperature_flag = 1;
......
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