Skip to content

V
VC66_7C
Commit 25af5853 authored by hu's avatar hu
Browse files
Options

增加界面

parent 61479894
Expand all Show whitespace changes
Inline Side-by-side
Showing with 22820 additions and 22699 deletions
ghs/project
View file @ 25af5853
No preview for this file type
ghs/project.hex
View file @ 25af5853
This diff is collapsed.
ghs/project.siz
View file @ 25af5853
project .intvect 1536 project .intvect 1536
project .text 304844 project .text 305404
project .rodata 410871 project .rodata 410871
project .secinfo 120 project .secinfo 120
project .syscall 6 project .syscall 6
......
source/Application/CAN_APP_NM/CAN_App/CAN_Communication_Matrix.c
View file @ 25af5853
...@@ -5,20 +5,20 @@ ...@@ -5,20 +5,20 @@
const st_CAN_SendAttribute st_CANSendAttr[ID_SEND_TOTAL] = const st_CAN_SendAttribute st_CANSendAttr[ID_SEND_TOTAL] =
{ {
{0x18FEAE17ul, 200ul * 1000ul, 0ul, 0u,MSG_EXT, 2u, 8u, CAN_MSG_TX_CYCLE, Can_Set_Buff_18FEAE17, (void *)0}, {0x18FEAE17ul, 200ul * 1000ul, 0ul, 0u, MSG_EXT, 2u, 8u, CAN_MSG_TX_CYCLE, Can_Set_Buff_18FEAE17, (void *)0},
{0x18FF3E17ul, 500ul * 1000ul, 1ul, 0u,MSG_EXT, 3u, 8u, CAN_MSG_TX_CYCLE, Can_Set_Buff_18FF3E17, (void *)0}, {0x18FF3E17ul, 500ul * 1000ul, 1ul, 0u, MSG_EXT, 3u, 8u, CAN_MSG_TX_CYCLE, Can_Set_Buff_18FF3E17, (void *)0},
{0x18FED917ul, 100ul * 1000ul, 3ul, 0u,MSG_EXT, 4u, 8u, CAN_MSG_TX_CYCLE, Can_Set_Buff_18FED917, (void *)0}, {0x18FED917ul, 100ul * 1000ul, 3ul, 0u, MSG_EXT, 4u, 8u, CAN_MSG_TX_CYCLE, Can_Set_Buff_18FED917, (void *)0},
{0x18FEE617ul, 1000ul * 1000ul, 5ul, 0u,MSG_EXT, 5u, 8u, CAN_MSG_TX_CYCLE, Can_Set_Buff_18FEE617, (void *)0}, {0x18FEE617ul, 1000ul * 1000ul, 5ul, 0u, MSG_EXT, 5u, 8u, CAN_MSG_TX_CYCLE, Can_Set_Buff_18FEE617, (void *)0},
{0x18EF1817ul, 100ul * 1000ul, 7ul, 0u,MSG_EXT, 6u, 8u, CAN_MSG_TX_CYCLE, Can_Set_Buff_18EF1817, (void *)0}, {0x18EF1817ul, 100ul * 1000ul, 7ul, 0u, MSG_EXT, 6u, 8u, CAN_MSG_TX_CYCLE, Can_Set_Buff_18EF1817, (void *)0},
{0x18FEE017ul, 100ul * 1000ul, 11ul, 0u,MSG_EXT, 7u, 8u, CAN_MSG_TX_CYCLE, Can_Set_Buff_18FEE017, (void *)0}, {0x18FEE017ul, 100ul * 1000ul, 11ul, 0u, MSG_EXT, 7u, 8u, CAN_MSG_TX_CYCLE, Can_Set_Buff_18FEE017, (void *)0},
{0x18FEFC17ul, 1000ul * 1000ul, 13ul, 0u,MSG_EXT, 8u, 8u, CAN_MSG_TX_CYCLE, Can_Set_Buff_18FEFC17, (void *)0}, {0x18FEFC17ul, 1000ul * 1000ul, 13ul, 0u, MSG_EXT, 8u, 8u, CAN_MSG_TX_CYCLE, Can_Set_Buff_18FEFC17, (void *)0},
{0x18FF2517ul, 1000ul * 1000ul, 17ul, 0u,MSG_EXT, 9u, 8u, CAN_MSG_TX_CYCLE, Can_Set_Buff_18FF2517, (void *)0}, {0x18FF2517ul, 1000ul * 1000ul, 17ul, 0u, MSG_EXT, 9u, 8u, CAN_MSG_TX_CYCLE, Can_Set_Buff_18FF2517, (void *)0},
{0x18FF2A17ul, 2000ul * 1000ul, 19ul, 0u,MSG_EXT, 10u, 8u, CAN_MSG_TX_CYCLE, Can_Set_Buff_18FF2A17, (void *)0}, {0x18FF2A17ul, 2000ul * 1000ul, 19ul, 0u, MSG_EXT, 10u, 8u, CAN_MSG_TX_CYCLE, Can_Set_Buff_18FF2A17, (void *)0},
{0x18FF9D17ul, 100ul * 1000ul, 23ul, 0u,MSG_EXT, 11u, 8u, CAN_MSG_TX_CYCLE, Can_Set_Buff_18FF9D17, (void *)0}, {0x18FF9D17ul, 100ul * 1000ul, 23ul, 0u, MSG_EXT, 11u, 8u, CAN_MSG_TX_CYCLE, Can_Set_Buff_18FF9D17, (void *)0},
{0x18FFE517ul, 1000ul * 1000ul, 29ul, 0u,MSG_EXT, 12u, 8u, CAN_MSG_TX_CYCKE_EVENT, Can_Set_Buff_18FFE517, (void *)0}, {0x18FFE517ul, 1000ul * 1000ul, 29ul, 0u, MSG_EXT, 12u, 8u, CAN_MSG_TX_CYCKE_EVENT, Can_Set_Buff_18FFE517, (void *)0},
{0x18EF2D17ul, 1000ul * 1000ul, 31ul, 0u,MSG_EXT, 13u, 8u, CAN_MSG_TX_CYCLE, Can_Set_Buff_18EF2D17, (void *)0}, {0x18EF2D17ul, 1000ul * 1000ul, 31ul, 0u, MSG_EXT, 13u, 8u, CAN_MSG_TX_CYCLE, Can_Set_Buff_18EF2D17, (void *)0},
{0x18033317ul, 100ul * 1000ul, 34ul, 0u,MSG_EXT, 14u, 8u, CAN_MSG_TX_CYCLE, Can_Set_Buff_18033317, (void *)0}, {0x18033317ul, 100ul * 1000ul, 34ul, 0u, MSG_EXT, 14u, 8u, CAN_MSG_TX_CYCLE, Can_Set_Buff_18033317, (void *)0},
{0x180433A2ul, 100ul * 1000ul, 47ul, 0u,MSG_EXT, 15u, 8u, CAN_MSG_TX_CYCLE, Can_Set_Buff_180433A2, (void *)0}, {0x180433A2ul, 100ul * 1000ul, 47ul, 0u, MSG_EXT, 15u, 8u, CAN_MSG_TX_CYCLE, Can_Set_Buff_180433A2, (void *)0},
}; };
const st_CANMsgAttribute CAN_MSG_CONST_ARRAY[ID_TOTAL_MAX] = const st_CANMsgAttribute CAN_MSG_CONST_ARRAY[ID_TOTAL_MAX] =
...@@ -286,7 +286,7 @@ const st_CANMsgAttribute CAN_MSG_CONST_ARRAY[ID_TOTAL_MAX] = ...@@ -286,7 +286,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}, {0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u},
{0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u}, {0x00u, 0x00u, 0x00u, 0x00u, 0xFFu, 0x00u, 0x00u, 0x00u},
5000ul, 5000ul,
0x18FF4100ul, 0x18FF4100ul,
(( void * )0), (( void * )0),
......
source/Application/Graphic/GUI/GUI.c
View file @ 25af5853
...@@ -128,13 +128,14 @@ void GUI_Display_Value_Init(void) ...@@ -128,13 +128,14 @@ void GUI_Display_Value_Init(void)
--------------------------------------------------------------------------*/ --------------------------------------------------------------------------*/
void GUI_OftenShow_Display(void) void GUI_OftenShow_Display(void)
{ {
GUI_AC_Temp_Dispaly(GUI_DISP_MODE_NORMAL); GUI_AC_Temp_Dispaly(GUI_DISP_MODE_BLANK);
GUI_Time_Dispaly(GUI_DISP_MODE_NORMAL); GUI_Time_Dispaly(GUI_DISP_MODE_NORMAL);
GUI_Data_Dispaly(GUI_DISP_MODE_NORMAL); GUI_Data_Dispaly(GUI_DISP_MODE_NORMAL);
GUI_TFTTelltales_Display(GUI_DISP_MODE_NORMAL); GUI_TFTTelltales_Display(GUI_DISP_MODE_NORMAL);
GUI_WetGas_Dispaly(GUI_DISP_MODE_NORMAL); GUI_WetGas_Dispaly(GUI_DISP_MODE_NORMAL);
GUI_AdBlue_Dispaly(GUI_DISP_MODE_NORMAL); GUI_AdBlue_Dispaly(GUI_DISP_MODE_NORMAL);
Gui_ODO_Display(GUI_DISP_MODE_NORMAL); Gui_ODO_Display(GUI_DISP_MODE_NORMAL);
if (1) if (1)
{ {
Gui_TRIPA_Display(GUI_DISP_MODE_NORMAL); Gui_TRIPA_Display(GUI_DISP_MODE_NORMAL);
...@@ -300,9 +301,16 @@ void GUI_Data_Dispaly(uint8_t Mode) ...@@ -300,9 +301,16 @@ void GUI_Data_Dispaly(uint8_t Mode)
--------------------------------------------------------------------------*/ --------------------------------------------------------------------------*/
void GUI_TFTTelltales_Display(uint8_t Mode) void GUI_TFTTelltales_Display(uint8_t Mode)
{ {
uint32_t Veh_SpeedLim = 0u;
uint32_t Veh_Speed = 0u;
if (Mode == GUI_DISP_MODE_NORMAL) if (Mode == GUI_DISP_MODE_NORMAL)
{ {
if (1) Veh_Speed = Common_Get_Disp_V_Speed();
Veh_Speed = Veh_Speed / 10u;
Veh_SpeedLim = Get_ID_18EA0021_Sig_CruiseControl_VehicleSpeedSetup();
if (Veh_Speed >= Veh_SpeedLim)
{ {
GUI_General_Display(WarningLight_Sprite, CN_Alarm_01, GUI_BLENDMODE_SRC_OVER); GUI_General_Display(WarningLight_Sprite, CN_Alarm_01, GUI_BLENDMODE_SRC_OVER);
} }
...@@ -653,17 +661,112 @@ void Gui_ADAS_Display(uint8_t Mode) ...@@ -653,17 +661,112 @@ void Gui_ADAS_Display(uint8_t Mode)
--------------------------------------------------------------------------*/ --------------------------------------------------------------------------*/
void Gui_DrivingSupport_Display(uint8_t Mode) void Gui_DrivingSupport_Display(uint8_t Mode)
{ {
uint8_t Veh_Seep_Value = 0u; uint8_t VariableSLD_Disp = 0u;
uint8_t VariableSLD_Status = 0u;
uint8_t Var_SpeedValue = 0u;
if (Mode == GUI_DISP_MODE_NORMAL) if (Mode == GUI_DISP_MODE_NORMAL)
{ {
/*定速巡航图标*/ /*定速巡航图标*/
VariableSLD_Status = Get_ID_18FF4100_Sig_Cruise_VariableSLD_Cont_Staus(); /*3-5*/
VariableSLD_Disp = Get_ID_18FF4100_Sig_Cruise_VariableSLD_Disp();/*6-8*/
if ((VariableSLD_Disp == 1u) && (K_Line_Set.K_Line_LID29 == 0x01))
{
if (VariableSLD_Status == 0u)
{
GUI_General_Display(Cruise_Sprite, CN_dingsuxunhang, GUI_BLENDMODE_SRC_OVER);
}
else if (VariableSLD_Status == 2u)
{
GUI_General_Display(Cruise_Sprite, CN_dingsuxunhang, GUI_BLENDMODE_SRC_OVER); GUI_General_Display(Cruise_Sprite, CN_dingsuxunhang, GUI_BLENDMODE_SRC_OVER);
GUI_General_Display(Cruise_Sprite, CN_dingsuxunhang_SET, GUI_BLENDMODE_SRC_OVER); GUI_General_Display(Cruise_Sprite, CN_dingsuxunhang_SET, GUI_BLENDMODE_SRC_OVER);
}
else if (VariableSLD_Status == 3u)
{
if (FLASH_SYNC_1Hz)
{
GUI_General_Display(Cruise_Sprite, CN_dingsuxunhang_SET, GUI_BLENDMODE_SRC_OVER);
}
else
{
GUI_General_Display(Cruise_Sprite, SpriteSize, GUI_BLENDMODE_SRC_OVER);
}
//显示km/h，显示设定车速: GUI_General_Display(Cruise_Sprite, CN_dingsuxunhang, GUI_BLENDMODE_SRC_OVER);
GUI_General_Digit_Display(Cruise_Sprite, Veh_Seep_Value, Nb_21_0, 3u, 2u, GUI_DISP_DrivingSupport, 104u, GUI_BLENDMODE_SRC_OVER); /*显示 定速巡航设定车速 的数值*/ }
GUI_General_Display(Cruise_Sprite, CN_dingsuxunhangdanwei, GUI_BLENDMODE_SRC_OVER); //显示文字 “ km/h ” else
{
GUI_General_Display(Cruise_Sprite, SpriteSize, GUI_BLENDMODE_SRC_OVER);
}
}
else if ((VariableSLD_Disp == 3u) && (K_Line_Set.K_Line_LID29 == 0x01) && (K_Line_Set.K_Line_LID39 == 0x01))
{
if (VariableSLD_Status == 0u)
{
GUI_General_Display(Cruise_Sprite, CN_dingsuxunhang_1, GUI_BLENDMODE_SRC_OVER);
}
else if (VariableSLD_Status == 1u)
{
GUI_General_Display(Cruise_Sprite, CN_dingsuxunhang_1, GUI_BLENDMODE_SRC_OVER);
GUI_General_Display(Cruise_Sprite, CN_dingsuxunhang_STANDBY, GUI_BLENDMODE_SRC_OVER);
}
else if (VariableSLD_Status == 2u)
{
GUI_General_Display(Cruise_Sprite, CN_dingsuxunhang_1, GUI_BLENDMODE_SRC_OVER);
GUI_General_Display(Cruise_Sprite, CN_dingsuxunhang_SET, GUI_BLENDMODE_SRC_OVER);
}
else if (VariableSLD_Status == 3u)
{
if (FLASH_SYNC_1Hz)
{
GUI_General_Display(Cruise_Sprite, CN_dingsuxunhang_SET, GUI_BLENDMODE_SRC_OVER);
}
else
{
GUI_General_Display(Cruise_Sprite, SpriteSize, GUI_BLENDMODE_SRC_OVER);
}
GUI_General_Display(Cruise_Sprite, CN_dingsuxunhang_1, GUI_BLENDMODE_SRC_OVER);
}
else
{
GUI_General_Display(Cruise_Sprite, SpriteSize, GUI_BLENDMODE_SRC_OVER);
}
}
else
{
GUI_General_Display(Cruise_Sprite, SpriteSize, GUI_BLENDMODE_SRC_OVER);
}
/*显示km/h，显示设定车速:*/
Var_SpeedValue = Get_ID_18FF4100_Sig_Indicate_Lamp_Speed();
if ((K_Line_Set.K_Line_LID29 == 0x01) || (K_Line_Set.K_Line_LID39 == 0x01))
{
if (Var_SpeedValue == 0u)
{
GUI_Translate_Display(Cruise_Sprite, Nb_21_hengxian, 429u, 104u, GUI_BLENDMODE_SRC_OVER);
GUI_Translate_Display(Cruise_Sprite, Nb_21_hengxian, 450u, 104u, GUI_BLENDMODE_SRC_OVER);
GUI_Translate_Display(Cruise_Sprite, Nb_21_hengxian, 471u, 104u, GUI_BLENDMODE_SRC_OVER);
GUI_General_Display(Cruise_Sprite, CN_dingsuxunhangdanwei, GUI_BLENDMODE_SRC_OVER);
}
else if (Var_SpeedValue <= 250u)
{
/*显示文字 “ km/h ”*/
GUI_General_Digit_Display(Cruise_Sprite, Var_SpeedValue, Nb_21_0, 3u, 2u, GUI_DISP_DrivingSupport, 104u, GUI_BLENDMODE_SRC_OVER); /*显示 定速巡航设定车速 的数值*/
GUI_General_Display(Cruise_Sprite, CN_dingsuxunhangdanwei, GUI_BLENDMODE_SRC_OVER);
}
else
{
GUI_General_Display(Cruise_Sprite, SpriteSize, GUI_BLENDMODE_SRC_OVER);
}
}
else
{
GUI_General_Display(Cruise_Sprite, SpriteSize, GUI_BLENDMODE_SRC_OVER);
}
} }
else else
{ {
...@@ -699,6 +802,7 @@ void Gui_Gear_Display(uint8_t Mode) ...@@ -699,6 +802,7 @@ void Gui_Gear_Display(uint8_t Mode)
Current_Gear = Get_ID_18F00503_Sig_Current_Gear(); Current_Gear = Get_ID_18F00503_Sig_Current_Gear();
Temp = Current_Gear - 0x7Eu; Temp = Current_Gear - 0x7Eu;
if ((Current_Gear >= 0x7Eu) && (Current_Gear <= 0x89u)) if ((Current_Gear >= 0x7Eu) && (Current_Gear <= 0x89u))
{ {
if ((Current_Gear == 0x7Eu) && (Manouvering_Mode == 0x01u)) if ((Current_Gear == 0x7Eu) && (Manouvering_Mode == 0x01u))
......
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