Skip to content

V
VC66_7C
Commit 68168d2d authored by hu's avatar hu
Browse files
Options

增加界面

parent 9f523633
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 22628 additions and 22557 deletions
ghs/project
View file @ 68168d2d
No preview for this file type
ghs/project.hex
View file @ 68168d2d
This diff is collapsed.
ghs/project.siz
View file @ 68168d2d
project .intvect 1536
project .text 306156
project .text 306412
project .rodata 410871
project .secinfo 120
project .syscall 6
......
source/Application/APP/Telltales/Flash_synchronizer.h
View file @ 68168d2d
......@@ -25,6 +25,7 @@ extern volatile uint8_t FlashSync3Hz;
#define FLASH_SYNC_1Hz FlashSync1Hz
#define FLASH_SYNC_2Hz FlashSync2Hz
#define FLASH_SYNC_4Hz FlashSync4Hz
#define FLASH_SYNC_5Hz FlashSync5Hz
#define FLASH_SYNC_05Hz FlashSync05Hz
#define FLASH_SYNC_2_5_Hz FlashSync_2_5_Hz /* 2.5Hz闪烁 */
......
source/Application/CAN_APP_NM/CAN_App/CAN_Communication_Matrix.c
View file @ 68168d2d
......@@ -37,7 +37,7 @@ const st_CANMsgAttribute CAN_MSG_CONST_ARRAY[ID_TOTAL_MAX] =
{0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u},
{0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u},
{0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u},
5000ul,
2000ul,
0x18FF2300ul,
(( void * )0),
(( void * )0),
......@@ -55,7 +55,7 @@ const st_CANMsgAttribute CAN_MSG_CONST_ARRAY[ID_TOTAL_MAX] =
},
{
{0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u},
{0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u},
{0xFFu, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0xFFu, 0x00u},
{0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u},
5000ul,
0x18FE5BE8ul,
......@@ -284,9 +284,9 @@ const st_CANMsgAttribute CAN_MSG_CONST_ARRAY[ID_TOTAL_MAX] =
(( void * )0),
},
{
{0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u},
{0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u},
{0x00u, 0x00u, 0x00u, 0x00u, 0xFFu, 0x00u, 0x00u, 0x00u},
{0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u},
5000ul,
0x18FF4100ul,
(( void * )0),
......
source/Application/Graphic/GUI/GUI.c
View file @ 68168d2d
......@@ -410,31 +410,88 @@ void GUI_WetGas_Dispaly(uint8_t Mode)
--------------------------------------------------------------------------*/
void GUI_AdBlue_Dispaly(uint8_t Mode)
{
uint8_t current_value = 0u;
uint8_t Tank_value = 0u;
uint8_t CanStatus = 0u;
uint8_t Level_blinking = 0u;
if (Mode == GUI_DISP_MODE_NORMAL)
{
current_value = HYQ_TEST;
if ((K_Line_Set.K_Line_LID33 == 1) || (K_Line_Set.K_Line_LID33 == 3))
{
CanStatus = CAN_MSG_Status(ID_CanMsg18FF2300_Msg_Count);
GUI_General_Display(AdBlue_Sprite, CN_tianlanyefuhaodeng, GUI_BLENDMODE_SRC_OVER); /*AdBlue*/
GUI_General_Display(AdBlue_Sprite, CN_tianlanye, GUI_BLENDMODE_SRC_OVER); /*框*/
if (CanStatus == CAN_SIG_LOST)
{
GUI_General_Display(AdBlue_Sprite, SpriteSize, GUI_BLENDMODE_SRC_OVER);
}
else
{
/*指示灯*/
Level_blinking = Get_ID_18FF2300_Sig_Level_blinking();
switch (current_value)
if ((Level_blinking == 0xFFu) || (Level_blinking == 0x00u))
{
GUI_General_Display(AdBlue_Sprite, CN_tianlanyefuhaodeng, GUI_BLENDMODE_SRC_OVER); /*AdBlue*/
}
else if (Level_blinking == 0x03u)
{
if (FLASH_SYNC_3Hz == 1u)
{
GUI_General_Display(AdBlue_Sprite, CN_tianlanyefuhaodeng, GUI_BLENDMODE_SRC_OVER); /*AdBlue*/
}
else
{
GUI_General_Display(AdBlue_Sprite, SpriteSize, GUI_BLENDMODE_SRC_OVER);
}
}
else if (Level_blinking == 0x01u)
{
if (FLASH_SYNC_1Hz == 1u)
{
GUI_General_Display(AdBlue_Sprite, CN_tianlanyefuhaodeng, GUI_BLENDMODE_SRC_OVER); /*AdBlue*/
}
else
{
GUI_General_Display(AdBlue_Sprite, SpriteSize, GUI_BLENDMODE_SRC_OVER);
}
}
}
/*段*/
Tank_value = Get_ID_18FF2300_Sig_Tank_Level();
switch (Tank_value)
{
case 0x3Cu:
GUI_Translate_Display(AdBlue_Sprite, CN_tianlanyezouge_01, (152u + 31u * 0x04u), 450u, GUI_BLENDMODE_SRC_OVER);
case 0x1Cu:
GUI_Translate_Display(AdBlue_Sprite, CN_tianlanyezouge_01, (152u + 31u * 0x03u), 450u, GUI_BLENDMODE_SRC_OVER);
case 0x0Cu:
GUI_Translate_Display(AdBlue_Sprite, CN_tianlanyezouge_01, (152u + 31u * 0x02u), 450u, GUI_BLENDMODE_SRC_OVER);
case 0x04u:
GUI_Translate_Display(AdBlue_Sprite, CN_tianlanyezouge_01, (152u + 31u * 0x01u), 450u, GUI_BLENDMODE_SRC_OVER);
case 0x02u:
GUI_General_Display(AdBlue_Sprite, CN_tianlanye, GUI_BLENDMODE_SRC_OVER); /*框*/
GUI_Translate_Display(AdBlue_Sprite, CN_tianlanyezouge_01, (152u + 31u * 0x00u), 450u, GUI_BLENDMODE_SRC_OVER);
break;
case 0x01u:
GUI_General_Display(AdBlue_Sprite, CN_tianlanye, GUI_BLENDMODE_SRC_OVER); /*框*/
GUI_General_Display(AdBlue_Sprite, SpriteSize, GUI_BLENDMODE_SRC_OVER);
break;
default:
GUI_General_Display(AdBlue_Sprite, SpriteSize, GUI_BLENDMODE_SRC_OVER);
break;
}
}
else
{
case 0x05u:
GUI_Translate_Display(AdBlue_Sprite, CN_tianlanyezouge_01, (152u + 31u * 0x04u), 450u, GUI_BLENDMODE_SRC_OVER);
case 0x04u:
GUI_Translate_Display(AdBlue_Sprite, CN_tianlanyezouge_01, (152u + 31u * 0x03u), 450u, GUI_BLENDMODE_SRC_OVER);
case 0x03u:
GUI_Translate_Display(AdBlue_Sprite, CN_tianlanyezouge_01, (152u + 31u * 0x02u), 450u, GUI_BLENDMODE_SRC_OVER);
case 0x02u:
GUI_Translate_Display(AdBlue_Sprite, CN_tianlanyezouge_01, (152u + 31u * 0x01u), 450u, GUI_BLENDMODE_SRC_OVER);
case 0x01u:
GUI_Translate_Display(AdBlue_Sprite, CN_tianlanyezouge_01, (152u + 31u * 0x00u), 450u, GUI_BLENDMODE_SRC_OVER);
break;
default:
GUI_General_Display(AdBlue_Sprite, SpriteSize, GUI_BLENDMODE_SRC_OVER);
break;
}
}
else
......@@ -467,7 +524,7 @@ void Gui_TRIPA_Display(uint8_t Mode)
/*显示 TRIP A 的数值*/
GUI_General_Digit_Display(TRIP_Sprite, TRIPA_value, Nb_19_0, 5u, 3u, GUI_DISP_TRIPA, 389, GUI_BLENDMODE_SRC_OVER);
GUI_General_Display(TRIP_Sprite, CN_PJchesu_kmh, GUI_BLENDMODE_SRC_OVER); /*显示文字 “ km ”*/
GUI_Translate_Display(TRIP_Sprite, CN_ODO_danwei, 699u, 400u, GUI_BLENDMODE_SRC_OVER); /*显示文字 “ km ”*/
}
else
{
......@@ -491,7 +548,7 @@ void Gui_TRIPB_Display(uint8_t Mode)
/*显示 TRIP B 的数值*/
GUI_General_Digit_Display(TRIP_Sprite, TRIPB_value, Nb_19_0, 5u, 3u, GUI_DISP_TRIPA, 389, GUI_BLENDMODE_SRC_OVER);
GUI_General_Display(TRIP_Sprite, CN_PJchesu_kmh, GUI_BLENDMODE_SRC_OVER); /*显示文字 “ km ”*/
GUI_Translate_Display(TRIP_Sprite, CN_ODO_danwei, 699u, 400u, GUI_BLENDMODE_SRC_OVER); /*显示文字 “ km ”*/
}
else
{
......@@ -516,7 +573,7 @@ void Gui_ODO_Display(uint8_t Mode)
ODO_value = (Data_ODO_Read() / 10); /*此处需将ODO函数返回值赋给变量，ODO函数在其他文件中实现。*/
GUI_General_Display(ODO_Sprite, CN_ODO, GUI_BLENDMODE_SRC_OVER); /*显示文/*字 “ ODO ”*/
GUI_General_Display(ODO_Sprite, CN_ODO_danwei, GUI_BLENDMODE_SRC_OVER); /*显示文字 “ km ”*/
GUI_Translate_Display(ODO_Sprite, CN_ODO_danwei, 699u, 436u, GUI_BLENDMODE_SRC_OVER); /*显示文字 “ km ”*/
GUI_General_Digit_Display(ODO_Sprite, ODO_value, Nb_19_0, 7u, 6u, GUI_DISP_ODO, 425, GUI_BLENDMODE_SRC_OVER); /*显示ODO的数值*/
}
else
......@@ -912,7 +969,13 @@ void Gui_Gear_Display(uint8_t Mode)
Temp = Current_Gear - 0x7Eu;
if ((Current_Gear >= 0x7Eu) && (Current_Gear <= 0x89u))
CanStatus1 = CAN_MSG_Status(ID_CanMsg18FF8503_Msg_Count);
if (CanStatus1 == CAN_SIG_LOST)
{
GUI_General_Display(Gear_Sprite, SpriteSize, GUI_BLENDMODE_SRC_OVER); /*不显示*/
}
else if ((Current_Gear >= 0x7Eu) && (Current_Gear <= 0x89u))
{
if ((Current_Gear == 0x7Eu) && (Manouvering_Mode == 0x01u))
{
......@@ -962,7 +1025,6 @@ void Gui_Gear_Display(uint8_t Mode)
/*G2*/
Automatic_or_Manual_Mode = Get_ID_18FF8503_Sig_Automatic_or_Manual_Mode();
CanStatus1 = CAN_MSG_Status(ID_CanMsg18FF8503_Msg_Count);
if (CanStatus1 == CAN_SIG_LOST)
{
GUI_General_Display(Gear_Sprite, SpriteSize, GUI_BLENDMODE_SRC_OVER); /*不显示*/
......
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