Skip to content

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

🐞 fix:【56855】修改自检时间+【56253】新增电压指示灯自检

parent d47b13e1
Hide whitespace changes
Inline Side-by-side
Showing with 51 additions and 25 deletions
Firmware/Source/Component/AMT630H/AMT630H_Datas.c
View file @ d84370fd
......@@ -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());
}
}
......@@ -178,17 +177,16 @@ 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
......@@ -228,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;
......@@ -264,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 显示模式信息 一级菜单
......@@ -3988,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)
{
......@@ -4011,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
......@@ -4022,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
......@@ -4040,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
{
;
}
}
/*结束状态*/
......@@ -4063,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;/*自检结束标志*/
}
......
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