Commit 970de49c authored by hu's avatar hu

调整禅道要求WET图标显示

parent 11087aec
......@@ -111,7 +111,7 @@ void Can_Set_Buff_18FEAE17(uint8_t CopyData[])
Service_Brake_Circuit2_AirPressure = 0u;
}
}
else if ((K_Line_Set.K_Line_LID42 == 0x01u) || f (K_Line_Set.K_Line_LID42 == 0x02u) || (K_Line_Set.K_Line_LID42 == 0x03u))
else if ((K_Line_Set.K_Line_LID42 == 0x01u) || (K_Line_Set.K_Line_LID42 == 0x02u) || (K_Line_Set.K_Line_LID42 == 0x03u))
{
if (Common_Get_Air1_Data() != 0u)
{
......@@ -2454,4 +2454,4 @@ void DoCAN_Get_Multi_frameE8_Recv(void)
ECM18EBFFE8.bCtrByte = 0;
}
}
}
\ No newline at end of file
}
......@@ -686,6 +686,7 @@ void GUI_WetGas_Dispaly(uint8_t Mode)
current_value = GetGaugesCurrentPos(WETGasGauges);
current_Flag = Common_Get_WET_Valid(); /*有效性判断用*/
/*禅道488*/
if ((current_value <= 17u) && (current_Flag == 1u))
{
switch (current_value)
......@@ -730,19 +731,19 @@ void GUI_WetGas_Dispaly(uint8_t Mode)
GUI_Translate_Display(WET_Sprite, CN_qiyazouge_01, (145u + 8u * 0x01), 405u, GUI_BLENDMODE_SRC_OVER);
case 0x01u:
GUI_Translate_Display(WET_Sprite, CN_qiyazouge_01, (145u + 8u * 0x00), 405u, GUI_BLENDMODE_SRC_OVER);
GUI_General_Display(WET_Sprite, CN_qiyafuhaodeng, GUI_BLENDMODE_SRC_OVER); /*气压符号灯。*/
case 0x00u:
GUI_General_Display(WET_Sprite, CN_qiya, GUI_BLENDMODE_SRC_OVER); /*刷长条的气压表框。*/
break;
default:
GUI_General_Display(WET_Sprite, CN_qiyafuhaodeng, GUI_BLENDMODE_SRC_OVER); /*气压符号灯。*/
//GUI_General_Display(WET_Sprite, SpriteSize, GUI_BLENDMODE_SRC_OVER);
break;
}
//GUI_General_Display(WET_Sprite, CN_qiyafuhaodeng, GUI_BLENDMODE_SRC_OVER); /*气压符号灯。*/
GUI_General_Display(WET_Sprite, CN_qiyafuhaodeng, GUI_BLENDMODE_SRC_OVER); /*气压符号灯。*/
}
else
{
GUI_General_Display(WET_Sprite, SpriteSize, GUI_BLENDMODE_SRC_OVER);
//GUI_General_Display(WET_Sprite, SpriteSize, GUI_BLENDMODE_SRC_OVER);
GUI_General_Display(WET_Sprite, CN_qiyafuhaodeng, GUI_BLENDMODE_SRC_OVER);
}
}
else
......@@ -4349,7 +4350,8 @@ void GUI_BG_RepMenu_3_1_Display(uint8_t Mode)
if ((CanStatus == CAN_SIG_LOST) || (State_Flag.Engine_Oil_Time >= 100u))/*此报文掉线5S*/
{
GUI_General_Display(MENU_Sprite, CN_User_Menu3_01_12, GUI_BLENDMODE_SRC_OVER); /*距离更换*/
GUI_General_Display(MENU_Sprite, CN_User_Menu3_01_ERROR, GUI_BLENDMODE_SRC_OVER); /*error*/
/*禅道698*/
//GUI_General_Display(MENU_Sprite, CN_User_Menu3_01_ERROR, GUI_BLENDMODE_SRC_OVER); /*error*/
}
else
{
......
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