Skip to content

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

增加显示图片，FV00.06

parent 6627d6bf
Hide whitespace changes
Inline Side-by-side
Showing with 869 additions and 800 deletions
source/Application/CAN_APP_NM/CAN_App/CAN_FUNC.c
View file @ 89de3cf0
......@@ -603,7 +603,7 @@ void Can_Set_Buff_18EF1817(uint8_t CopyData[])
{
uint8_t Trip_Type = 0u;
if (State_Flag.FState_ClearOilTx == 1)
if (State_Flag.FState_ClearOilTx == 0x01u)
{
if (Trip_Type == TRAPA)
{
......@@ -627,11 +627,9 @@ void Can_Set_Buff_18EF1817(uint8_t CopyData[])
CopyData[6] = 0xFF;
CopyData[7] = 0xFF;
}
User_BCM_Flag = 1u;/*从头轮询*/
State_Flag.FState_ClearOilTx = 0u;
//Can_Msg_Tx_Overwrite(MSGID_18EF1817, 1, 100 * 1000);
User_BCM_Flag = 1u;/*从头轮询*/
State_Flag.FState_ClearOilTx = 0x00u;
}
else
{
......@@ -761,14 +759,31 @@ void Can_Set_Buff_18EF1817(uint8_t CopyData[])
default:
break;
}
}
}
//Can_Msg_Tx_Overwrite(MSGID_18EF1817, 0XFFFF, 100 * 1000);
void Id18ef1817_Send_Service(void)
{
if (State_Flag.FState_COilTimeOut == 1u)
{
Can_Msg_Tx_Overwrite(MSGID_18EF1817, 1u, 100 * 1000);
}
else
{
if ((State_Flag.FState_ClearOilRx == 0u) && (State_Flag.FState_COilTimeOut != FState_COilTimeOutNum))
{
Can_Msg_Tx_Overwrite(MSGID_18EF1817, 0u, 100 * 1000);
}
else
{
Can_Msg_Tx_Overwrite(MSGID_18EF1817, 0xFFFFu, 100 * 1000);
}
}
}
/*-------------------------------------------------------------------------
* Function Name : Drive_Info_IC1_STATUS_Rx
* Description : 18EF1718 报文循环接收处理
* Description : 18EF1718 报文循环接收处理 100ms任务中执行
* Input : None
* Output : None
* Return : None
......@@ -870,14 +885,22 @@ void Drive_Info_IC1_STATUS_Rx(void)
break;
}
// if (State_Flag.FState_COilTimeOut < FState_COilTimeOutNum)
//{
// State_Flag.FState_COilTimeOut++;
// }
// if (Data_Sig == 0x40u)
//{
// State_Flag.FState_ClearOilRx == 1;
// }
#if 0
if (State_Flag.FState_COilTimeOut < FState_COilTimeOutNum)
{
State_Flag.FState_COilTimeOut++;
if (State_Flag.FState_COilTimeOut == FState_COilTimeOutNum)
{
State_Flag.FState_ClearOilTx = 0u;
}
}
if (Data_Sig == 0x40u)
{
State_Flag.FState_ClearOilRx == 1;
}
#endif
}
/*-------------------------------------------------------------------------
......
source/Application/Graphic/GUI/GUI.c
View file @ 89de3cf0
......@@ -410,7 +410,7 @@ void GUI_TFTTelltales_Display(uint8_t Mode)
if (Veh_Speed >= Veh_SpeedLim)
{
GUI_Translate_Display(WarningLight_Sprite, CN_Alarm_01, 21u, GUI_DISP_LEMPY[0u], GUI_BLENDMODE_SRC_OVER);
GUI_Translate_Display(WarningLight_Sprite, CN_Alarm_01_1, 21u, GUI_DISP_LEMPY[0u], GUI_BLENDMODE_SRC_OVER);
}
else
{
......@@ -423,7 +423,7 @@ void GUI_TFTTelltales_Display(uint8_t Mode)
if ((EBSLamp_State == 0x01u) || (CanStatus2 == CAN_SIG_LOST))
{
GUI_Translate_Display(WarningLight_Sprite, CN_Alarm_02, 21u, GUI_DISP_LEMPY[1u], GUI_BLENDMODE_SRC_OVER);
GUI_Translate_Display(WarningLight_Sprite, CN_Alarm_02_1, 21u, GUI_DISP_LEMPY[1u], GUI_BLENDMODE_SRC_OVER);
}
else
{
......@@ -1201,11 +1201,11 @@ void Gui_Gear_Display(uint8_t Mode)
//}
else if ((Auto_EcoPow == 0x01u) && (CanStatus2 == CAN_SIG_NORMAL))
{
GUI_General_Display(Gear_Sprite, SpriteSize, GUI_BLENDMODE_SRC_OVER); /*显示A-ECO*/
GUI_General_Display(Gear_Sprite, CN_A_ECO, GUI_BLENDMODE_SRC_OVER); /*显示A-ECO*/
}
else if ((Auto_EcoPow == 0x00u) && (CanStatus2 == CAN_SIG_NORMAL))
{
GUI_General_Display(Gear_Sprite, SpriteSize, GUI_BLENDMODE_SRC_OVER); /*显示A-POWER*/
GUI_General_Display(Gear_Sprite, CN_A_POWER, GUI_BLENDMODE_SRC_OVER); /*显示A-POWER*/
}
else
{
......@@ -2053,6 +2053,7 @@ void GUI_BG_Menu_Display(uint8_t Mode)
void GUI_BG_Menu1_Display(uint8_t Mode)
{
uint8_t Flag = 0;
if (Mode == GUI_DISP_MODE_NORMAL)
{
GUI_Translate_Display(MENU_Sprite, (CN_User_Menu1_01black + Flag), 225u, GUI_DISP_MENU_Y[0u], GUI_BLENDMODE_SRC_OVER);
......@@ -2073,6 +2074,7 @@ void GUI_BG_Menu1_Display(uint8_t Mode)
void GUI_BG_Menu2_Display(uint8_t Mode)
{
uint8_t Flag = 0;
if (Mode == GUI_DISP_MODE_NORMAL)
{
GUI_Translate_Display(MENU_Sprite, (CN_User_Menu1_02black + Flag), 225u, GUI_DISP_MENU_Y[1u], GUI_BLENDMODE_SRC_OVER);
......@@ -2093,6 +2095,7 @@ void GUI_BG_Menu2_Display(uint8_t Mode)
void GUI_BG_Menu3_Display(uint8_t Mode)
{
uint8_t Flag = 0;
if (Mode == GUI_DISP_MODE_NORMAL)
{
GUI_Translate_Display(MENU_Sprite, (CN_User_Menu1_03black + Flag), 225u, GUI_DISP_MENU_Y[2u], GUI_BLENDMODE_SRC_OVER);
......@@ -2113,6 +2116,7 @@ void GUI_BG_Menu3_Display(uint8_t Mode)
void GUI_BG_Menu4_Display(uint8_t Mode)
{
uint8_t Flag = 0;
if (Mode == GUI_DISP_MODE_NORMAL)
{
GUI_Translate_Display(MENU_Sprite, (CN_User_Menu1_04black + Flag), 225u, GUI_DISP_MENU_Y[3u], GUI_BLENDMODE_SRC_OVER);
......@@ -2133,6 +2137,7 @@ void GUI_BG_Menu4_Display(uint8_t Mode)
void GUI_BG_Menu5_Display(uint8_t Mode)
{
uint8_t Flag = 0;
if (Mode == GUI_DISP_MODE_NORMAL)
{
GUI_Translate_Display(MENU_Sprite, (CN_User_Menu1_05black + Flag), 225u, GUI_DISP_MENU_Y[3u], GUI_BLENDMODE_SRC_OVER);
......@@ -2153,6 +2158,7 @@ void GUI_BG_Menu5_Display(uint8_t Mode)
void GUI_BG_Menu6_Display(uint8_t Mode)
{
uint8_t Flag = 0;
if (Mode == GUI_DISP_MODE_NORMAL)
{
GUI_Translate_Display(MENU_Sprite, (CN_User_Menu1_06black + Flag), 225u, GUI_DISP_MENU_Y[3u], GUI_BLENDMODE_SRC_OVER);
......@@ -2229,6 +2235,7 @@ void GUI_BG_Rep_Menu_Display(uint8_t Mode)
void GUI_BG_RepMenu1_Display(uint8_t Mode)
{
uint8_t Flag = 0;
if (Mode == GUI_DISP_MODE_NORMAL)
{
GUI_Translate_Display(MENU_Sprite, (CN_User_Menu2_02_1black + Flag), 225u, GUI_DISP_MENU_Y[0u], GUI_BLENDMODE_SRC_OVER);
......@@ -2249,6 +2256,7 @@ void GUI_BG_RepMenu1_Display(uint8_t Mode)
void GUI_BG_RepMenu2_Display(uint8_t Mode)
{
uint8_t Flag = 0;
if (Mode == GUI_DISP_MODE_NORMAL)
{
GUI_Translate_Display(MENU_Sprite, (CN_User_Menu2_02_2black + Flag), 225u, GUI_DISP_MENU_Y[1u], GUI_BLENDMODE_SRC_OVER);
......@@ -2270,6 +2278,7 @@ void GUI_BG_RepMenu2_Display(uint8_t Mode)
void GUI_BG_RepMenu3_Display(uint8_t Mode)
{
uint8_t Flag = 0;
if (Mode == GUI_DISP_MODE_NORMAL)
{
GUI_Translate_Display(MENU_Sprite, (CN_User_Menu2_02_3black + Flag), 225u, GUI_DISP_MENU_Y[2u], GUI_BLENDMODE_SRC_OVER);
......@@ -2291,6 +2300,7 @@ void GUI_BG_RepMenu3_Display(uint8_t Mode)
void GUI_BG_RepMenu4_Display(uint8_t Mode)
{
uint8_t Flag = 0;
if (Mode == GUI_DISP_MODE_NORMAL)
{
GUI_Translate_Display(MENU_Sprite, (CN_User_Menu2_02_4black + Flag), 225u, GUI_DISP_MENU_Y[3u], GUI_BLENDMODE_SRC_OVER);
......@@ -2312,6 +2322,7 @@ void GUI_BG_RepMenu4_Display(uint8_t Mode)
void GUI_BG_RepMenu5_Display(uint8_t Mode)
{
uint8_t Flag = 0;
if (Mode == GUI_DISP_MODE_NORMAL)
{
}
......@@ -2332,6 +2343,7 @@ void GUI_BG_RepMenu5_Display(uint8_t Mode)
void GUI_BG_RepMenu6_Display(uint8_t Mode)
{
uint8_t Flag = 0;
if (Mode == GUI_DISP_MODE_NORMAL)
{
GUI_Translate_Display(MENU_Sprite, (CN_User_Menu2_02_5black + Flag), 225u, GUI_DISP_MENU_Y[3u], GUI_BLENDMODE_SRC_OVER);
......@@ -2353,6 +2365,7 @@ void GUI_BG_RepMenu6_Display(uint8_t Mode)
void GUI_BG_RepMenu7_Display(uint8_t Mode)
{
uint8_t Flag = 0;
if (Mode == GUI_DISP_MODE_NORMAL)
{
GUI_Translate_Display(MENU_Sprite, (CN_User_Menu2_02_6black + Flag), 225u, GUI_DISP_MENU_Y[3u], GUI_BLENDMODE_SRC_OVER);
......@@ -2374,6 +2387,7 @@ void GUI_BG_RepMenu7_Display(uint8_t Mode)
void GUI_BG_RepMenu8_Display(uint8_t Mode)
{
uint8_t Flag = 0;
if (Mode == GUI_DISP_MODE_NORMAL)
{
GUI_Translate_Display(MENU_Sprite, (CN_User_Menu2_02_7black + Flag), 225u, GUI_DISP_MENU_Y[3u], GUI_BLENDMODE_SRC_OVER);
......@@ -2395,6 +2409,7 @@ void GUI_BG_RepMenu8_Display(uint8_t Mode)
void GUI_BG_RepMenu9_Display(uint8_t Mode)
{
uint8_t Flag = 0;
if (Mode == GUI_DISP_MODE_NORMAL)
{
GUI_Translate_Display(MENU_Sprite, (CN_User_Menu2_02_8black + Flag), 225u, GUI_DISP_MENU_Y[3u], GUI_BLENDMODE_SRC_OVER);
......@@ -2475,6 +2490,7 @@ void GUI_BG_RepSet_Menu_Display(uint8_t Mode)
void GUI_BG_RepSetMenu1_Display(uint8_t Mode)
{
uint8_t Flag = 0;
if (Mode == GUI_DISP_MODE_NORMAL)
{
GUI_Translate_Display(MENU_Sprite, (CN_User_Menu2_03_01black + Flag), 225u, GUI_DISP_MENU_Y[0u], GUI_BLENDMODE_SRC_OVER);
......@@ -2496,6 +2512,7 @@ void GUI_BG_RepSetMenu1_Display(uint8_t Mode)
void GUI_BG_RepSetMenu2_Display(uint8_t Mode)
{
uint8_t Flag = 0;
if (Mode == GUI_DISP_MODE_NORMAL)
{
GUI_Translate_Display(MENU_Sprite, (CN_User_Menu2_03_02black + Flag), 225u, GUI_DISP_MENU_Y[1u], GUI_BLENDMODE_SRC_OVER);
......@@ -2517,6 +2534,7 @@ void GUI_BG_RepSetMenu2_Display(uint8_t Mode)
void GUI_BG_RepSetMenu3_Display(uint8_t Mode)
{
uint8_t Flag = 0;
if (Mode == GUI_DISP_MODE_NORMAL)
{
GUI_Translate_Display(MENU_Sprite, (CN_User_Menu2_03_03black + Flag), 225u, GUI_DISP_MENU_Y[2u], GUI_BLENDMODE_SRC_OVER);
......@@ -2538,6 +2556,7 @@ void GUI_BG_RepSetMenu3_Display(uint8_t Mode)
void GUI_BG_RepSetMenu4_Display(uint8_t Mode)
{
uint8_t Flag = 0;
if (Mode == GUI_DISP_MODE_NORMAL)
{
GUI_Translate_Display(MENU_Sprite, (CN_User_Menu2_03_04black + Flag), 225u, GUI_DISP_MENU_Y[3u], GUI_BLENDMODE_SRC_OVER);
......@@ -2559,6 +2578,7 @@ void GUI_BG_RepSetMenu4_Display(uint8_t Mode)
void GUI_BG_RepSetMenu5_Display(uint8_t Mode)
{
uint8_t Flag = 0;
if (Mode == GUI_DISP_MODE_NORMAL)
{
GUI_Translate_Display(MENU_Sprite, (CN_User_Menu2_03_04black + Flag), 225u, GUI_DISP_MENU_Y[3u], GUI_BLENDMODE_SRC_OVER);
......@@ -2580,6 +2600,7 @@ void GUI_BG_RepSetMenu5_Display(uint8_t Mode)
void GUI_BG_RepSetMenu6_Display(uint8_t Mode)
{
uint8_t Flag = 0;
if (Mode == GUI_DISP_MODE_NORMAL)
{
GUI_Translate_Display(MENU_Sprite, (CN_User_Menu2_03_06black + Flag), 225u, GUI_DISP_MENU_Y[3u], GUI_BLENDMODE_SRC_OVER);
......@@ -2601,6 +2622,7 @@ void GUI_BG_RepSetMenu6_Display(uint8_t Mode)
void GUI_BG_RepSetMenu7_Display(uint8_t Mode)
{
uint8_t Flag = 0;
if (Mode == GUI_DISP_MODE_NORMAL)
{
GUI_Translate_Display(MENU_Sprite, (CN_User_Menu2_03_07black + Flag), 225u, GUI_DISP_MENU_Y[3u], GUI_BLENDMODE_SRC_OVER);
......@@ -2622,6 +2644,7 @@ void GUI_BG_RepSetMenu7_Display(uint8_t Mode)
void GUI_BG_RepSetMenu8_Display(uint8_t Mode)
{
uint8_t Flag = 0;
if (Mode == GUI_DISP_MODE_NORMAL)
{
GUI_Translate_Display(MENU_Sprite, (CN_User_Menu2_03_08black + Flag), 225u, GUI_DISP_MENU_Y[3u], GUI_BLENDMODE_SRC_OVER);
......@@ -2698,6 +2721,7 @@ void GUI_BG_UserSet_Menu_Display(uint8_t Mode)
void GUI_BG_UserSetMenu1_Display(uint8_t Mode)
{
uint8_t Flag = 0;
if (Mode == GUI_DISP_MODE_NORMAL)
{
GUI_Translate_Display(MENU_Sprite, (CN_User_Menu2_04_1black + Flag), 225u, GUI_DISP_MENU_Y[0u], GUI_BLENDMODE_SRC_OVER);
......@@ -2718,6 +2742,7 @@ void GUI_BG_UserSetMenu1_Display(uint8_t Mode)
void GUI_BG_UserSetMenu2_Display(uint8_t Mode)
{
uint8_t Flag = 0;
if (Mode == GUI_DISP_MODE_NORMAL)
{
GUI_Translate_Display(MENU_Sprite, (CN_User_Menu2_04_2black + Flag), 225u, GUI_DISP_MENU_Y[1u], GUI_BLENDMODE_SRC_OVER);
......@@ -2738,6 +2763,7 @@ void GUI_BG_UserSetMenu2_Display(uint8_t Mode)
void GUI_BG_UserSetMenu3_Display(uint8_t Mode)
{
uint8_t Flag = 0;
if (Mode == GUI_DISP_MODE_NORMAL)
{
GUI_Translate_Display(MENU_Sprite, (CN_User_Menu2_04_7black + Flag), 225u, GUI_DISP_MENU_Y[2u], GUI_BLENDMODE_SRC_OVER);
......@@ -2758,6 +2784,7 @@ void GUI_BG_UserSetMenu3_Display(uint8_t Mode)
void GUI_BG_UserSetMenu4_Display(uint8_t Mode)
{
uint8_t Flag = 0;
if (Mode == GUI_DISP_MODE_NORMAL)
{
GUI_Translate_Display(MENU_Sprite, (CN_User_Menu2_04_4black + Flag), 225u, GUI_DISP_MENU_Y[3u], GUI_BLENDMODE_SRC_OVER);
......@@ -2778,6 +2805,7 @@ void GUI_BG_UserSetMenu4_Display(uint8_t Mode)
void GUI_BG_UserSetMenu5_Display(uint8_t Mode)
{
uint8_t Flag = 0;
if (Mode == GUI_DISP_MODE_NORMAL)
{
GUI_Translate_Display(MENU_Sprite, (CN_User_Menu2_04_10black + Flag), 225u, GUI_DISP_MENU_Y[3u], GUI_BLENDMODE_SRC_OVER);
......@@ -2798,6 +2826,7 @@ void GUI_BG_UserSetMenu5_Display(uint8_t Mode)
void GUI_BG_UserSetMenu6_Display(uint8_t Mode)
{
uint8_t Flag = 0;
if (Mode == GUI_DISP_MODE_NORMAL)
{
GUI_Translate_Display(MENU_Sprite, (CN_User_Menu2_04_3black + Flag), 225u, GUI_DISP_MENU_Y[3u], GUI_BLENDMODE_SRC_OVER);
......@@ -2818,6 +2847,7 @@ void GUI_BG_UserSetMenu6_Display(uint8_t Mode)
void GUI_BG_UserSetMenu7_Display(uint8_t Mode)
{
uint8_t Flag = 0;
if (Mode == GUI_DISP_MODE_NORMAL)
{
GUI_Translate_Display(MENU_Sprite, (CN_User_Menu2_04_7black + Flag), 225u, GUI_DISP_MENU_Y[3u], GUI_BLENDMODE_SRC_OVER);
......@@ -2879,6 +2909,7 @@ void GUI_BG_Demo_Menu_Display(uint8_t Mode)
void GUI_BG_DemoMenu1_Display(uint8_t Mode)
{
uint8_t Flag = 0;
if (Mode == GUI_DISP_MODE_NORMAL)
{
GUI_Translate_Display(MENU_Sprite, (CN_User_Menu2_05_1black + Flag), 225u, GUI_DISP_MENU_Y[0u], GUI_BLENDMODE_SRC_OVER);
......@@ -2900,6 +2931,7 @@ void GUI_BG_DemoMenu1_Display(uint8_t Mode)
void GUI_BG_DemoMenu2_Display(uint8_t Mode)
{
uint8_t Flag = 0;
if (Mode == GUI_DISP_MODE_NORMAL)
{
GUI_Translate_Display(MENU_Sprite, (CN_User_Menu2_05_2black + Flag), 225u, GUI_DISP_MENU_Y[1u], GUI_BLENDMODE_SRC_OVER);
......@@ -2921,6 +2953,7 @@ void GUI_BG_DemoMenu2_Display(uint8_t Mode)
void GUI_BG_DemoMenu3_Display(uint8_t Mode)
{
uint8_t Flag = 0;
if (Mode == GUI_DISP_MODE_NORMAL)
{
GUI_Translate_Display(MENU_Sprite, (CN_User_Menu2_05_3black + Flag), 225u, GUI_DISP_MENU_Y[2u], GUI_BLENDMODE_SRC_OVER);
......@@ -2942,6 +2975,7 @@ void GUI_BG_DemoMenu3_Display(uint8_t Mode)
void GUI_BG_DemoMenu4_Display(uint8_t Mode)
{
uint8_t Flag = 0;
if (Mode == GUI_DISP_MODE_NORMAL)
{
GUI_Translate_Display(MENU_Sprite, (CN_User_Menu2_05_4black + Flag), 225u, GUI_DISP_MENU_Y[3u], GUI_BLENDMODE_SRC_OVER);
......
source/Driver/Graphic/images.c
View file @ 89de3cf0
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 @ 89de3cf0
......@@ -196,6 +196,10 @@ enum SpriteName
CN_tianlanyezouge_03,
CN_tianlanyezouge_04,
CN_tianlanyezouge_05,
CN_AUTO,
CN_A_ECO,
CN_A_POWER,
CN_black,
CN_dangwei_1,
CN_dangwei_10,
CN_dangwei_11,
......@@ -219,7 +223,9 @@ enum SpriteName
CN_dangwei_RM,
CN_MANUAL,
CN_Alarm_01,
CN_Alarm_01_1,
CN_Alarm_02,
CN_Alarm_02_1,
CN_ODO,
CN_ODO_danwei,
CN_TRIP,
......
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