Commit 5841c36a authored by 王雅楠's avatar 王雅楠

🐞 fix:新增故障信息无效状态

parent da6fcff0
...@@ -69,6 +69,7 @@ void AMT630H_GUI_Fault_Information(void) ...@@ -69,6 +69,7 @@ void AMT630H_GUI_Fault_Information(void)
{ {
if(g_u8Display_Mode == ModeDAY) if(g_u8Display_Mode == ModeDAY)
{ {
if(g_u8Language == CH) if(g_u8Language == CH)
{ {
SetPagePic(GRAPHICS_PAGE_0, Pic_0163_27_396); SetPagePic(GRAPHICS_PAGE_0, Pic_0163_27_396);
...@@ -105,6 +106,8 @@ void AMT630H_GUI_Fault_Information(void) ...@@ -105,6 +106,8 @@ void AMT630H_GUI_Fault_Information(void)
} }
else if(g_u8Display_Mode == ModeNIGHT) 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) if(g_u8Language == CH)
{ {
SetPagePic(GRAPHICS_PAGE_0, Pic_0350_27_396); SetPagePic(GRAPHICS_PAGE_0, Pic_0350_27_396);
...@@ -182,8 +185,8 @@ static void AMT630H_GUI_FaultCode(uint8_t FaultCodevalid,uint8_t FaultCode_hight ...@@ -182,8 +185,8 @@ static void AMT630H_GUI_FaultCode(uint8_t FaultCodevalid,uint8_t FaultCode_hight
{ {
if(g_u8Display_Mode == ModeDAY) if(g_u8Display_Mode == ModeDAY)
{ {
//SetPagePicFree(GRAPHICS_PAGE_0, Pic_0876_639_293, 610, 164);//当前故障码的P SetPagePicFree(GRAPHICS_PAGE_0, Pic_0876_639_293, 610, 164);//当前故障码的P
//SetPagePicFree(GRAPHICS_PAGE_0, Pic_0876_639_293, 610, 229);//历史故障码的P SetPagePicFree(GRAPHICS_PAGE_0, Pic_0876_639_293, 610, 229);//历史故障码的P
/*当前故障码前两位显示*/ /*当前故障码前两位显示*/
DisplayNumPara.NumList = NumbeList_FaultCode_day; DisplayNumPara.NumList = NumbeList_FaultCode_day;
DisplayNumPara.x = 639; DisplayNumPara.x = 639;
...@@ -219,8 +222,8 @@ static void AMT630H_GUI_FaultCode(uint8_t FaultCodevalid,uint8_t FaultCode_hight ...@@ -219,8 +222,8 @@ static void AMT630H_GUI_FaultCode(uint8_t FaultCodevalid,uint8_t FaultCode_hight
} }
else if(g_u8Display_Mode == ModeNIGHT) 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, 175);//当前故障码的P
//SetPagePicFree(GRAPHICS_PAGE_0, Pic_0912_639_293, 610, 240);//历史故障码的P SetPagePicFree(GRAPHICS_PAGE_0, Pic_0912_639_293, 610, 240);//历史故障码的P
/*当前故障码前两位显示*/ /*当前故障码前两位显示*/
DisplayNumPara.NumList = NumbeList_FaultCode_night; DisplayNumPara.NumList = NumbeList_FaultCode_night;
DisplayNumPara.x = 639; DisplayNumPara.x = 639;
...@@ -257,7 +260,20 @@ static void AMT630H_GUI_FaultCode(uint8_t FaultCodevalid,uint8_t FaultCode_hight ...@@ -257,7 +260,20 @@ static void AMT630H_GUI_FaultCode(uint8_t FaultCodevalid,uint8_t FaultCode_hight
} }
else else
{ {
/*显示-----*/; if(g_u8Display_Mode == ModeDAY)
{
SetPagePicFree(GRAPHICS_PAGE_0, Pic_0926_619_240, 610, 175);
SetPagePicFree(GRAPHICS_PAGE_0, Pic_0926_619_240, 610, 240);
}
else if(g_u8Display_Mode == ModeNIGHT)
{
SetPagePicFree(GRAPHICS_PAGE_0, Pic_0927_619_175, 610, 175);
SetPagePicFree(GRAPHICS_PAGE_0, Pic_0927_619_175, 610, 240);
}
else
{
;
}
} }
} }
/** /**
......
...@@ -234,21 +234,33 @@ static Tellib_uint16_t LED_TCS_Judgement(void) ...@@ -234,21 +234,33 @@ static Tellib_uint16_t LED_TCS_Judgement(void)
{ {
LED_STATE = 1u;/*TCS灯亮*/ LED_STATE = 1u;/*TCS灯亮*/
} }
else else if(Get_CAN_CH0_ID_37B_Sig_TCS_Warning_Lamp() == 0x0)
{ {
LED_STATE = 0u;/*都不亮*/ LED_STATE = 0u;/*都不亮*/
} }
}
else else
{
LED_STATE = 0u;
}
}
else if(Get_CAN_CH0_ID_37B_Sig_TCS_Work_Mode == 0x0)
{ {
if(Get_CAN_CH0_ID_37B_Sig_TCS_Warning_Lamp() == 0x1) if(Get_CAN_CH0_ID_37B_Sig_TCS_Warning_Lamp() == 0x1)
{ {
LED_STATE = 2u;/*TCS/亮*/ LED_STATE = 2u;/*TCS/亮*/
} }
else if(Get_CAN_CH0_ID_37B_Sig_TCS_Warning_Lamp() == 0x0)
{
LED_STATE = 0u;
}
else else
{ {
; LED_STATE = 0u;
}
} }
else
{
;
} }
} }
return LED_STATE; return LED_STATE;
......
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