Skip to content

V
VC66_7C
Commit 7f3b7937 authored by hu's avatar hu
Browse files
Options

调整机油燃油滤清器显示方式

parent bdf23998
Hide whitespace changes
Inline Side-by-side
Showing with 68 additions and 69 deletions
source/Application/CAN_APP_NM/CAN_App/CAN_Communication_Matrix.c
View file @ 7f3b7937
...@@ -404,16 +404,16 @@ const st_CANMsgAttribute CAN_MSG_CONST_ARRAY[ID_TOTAL_MAX] = ...@@ -404,16 +404,16 @@ const st_CANMsgAttribute CAN_MSG_CONST_ARRAY[ID_TOTAL_MAX] =
(( void * )0), (( void * )0),
(( void * )0), (( void * )0),
}, },
{ // {
{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, 0x00u, 0x00u, 0x00u, 0x00u},
5000ul, // 5000ul,
0x18FF3018ul, // 0x18FF3018ul,
(( void * )0), // (( void * )0),
(( void * )0), // (( void * )0),
(( void * )0), // (( void * )0),
}, // },
{ {
{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},
...@@ -996,16 +996,6 @@ uint8_t Get_ID_18FEED00_Sig_Maximum_Vehicle_Speed_Limit(void) ...@@ -996,16 +996,6 @@ uint8_t Get_ID_18FEED00_Sig_Maximum_Vehicle_Speed_Limit(void)
// ((uint32_t)((uint32_t)CAN_MSG_Read(ID_CanMsg18EA0021_Msg_Count, 0u) >> 0u) & 0xFFu)); // ((uint32_t)((uint32_t)CAN_MSG_Read(ID_CanMsg18EA0021_Msg_Count, 0u) >> 0u) & 0xFFu));
//} //}
uint8_t Get_ID_18FF3018_Sig_Engine_oil_filte(void)
{
return (((uint8_t)((uint8_t)CAN_MSG_Read(ID_CanMsg18FF3018_Msg_Count, 0u) >> 6u) & 0x03u));
}
uint8_t Get_ID_18FF3018_Sig_Starter(void)
{
return (((uint8_t)((uint8_t)CAN_MSG_Read(ID_CanMsg18FF3018_Msg_Count, 0u) >> 0u) & 0x03u));
}
uint8_t Get_ID_0C010305_Sig_Auto_EcoPow(void) uint8_t Get_ID_0C010305_Sig_Auto_EcoPow(void)
{ {
return (((uint8_t)((uint8_t)CAN_MSG_Read(ID_CanMsg0C010305_Msg_Count, 5u) >> 2u) & 0x03u)); return (((uint8_t)((uint8_t)CAN_MSG_Read(ID_CanMsg0C010305_Msg_Count, 5u) >> 2u) & 0x03u));
...@@ -1157,9 +1147,9 @@ uint8_t Co_Can_ConvertSubID(uint32_t MsgID) ...@@ -1157,9 +1147,9 @@ uint8_t Co_Can_ConvertSubID(uint32_t MsgID)
case ID_CanMsg18FEED00_Msg: case ID_CanMsg18FEED00_Msg:
u8Result = ID_CanMsg18FEED00_Msg_Count; u8Result = ID_CanMsg18FEED00_Msg_Count;
break; break;
case ID_CanMsg18FF3018_Msg: //case ID_CanMsg18FF3018_Msg:
u8Result = ID_CanMsg18FF3018_Msg_Count; // u8Result = ID_CanMsg18FF3018_Msg_Count;
break; // break;
case ID_CanMsg18021733_Msg: case ID_CanMsg18021733_Msg:
u8Result = ID_CanMsg18021733_Msg_Count; u8Result = ID_CanMsg18021733_Msg_Count;
break; break;
......
source/Application/CAN_APP_NM/CAN_App/CAN_Communication_Matrix.h
View file @ 7f3b7937
...@@ -44,7 +44,7 @@ typedef enum ...@@ -44,7 +44,7 @@ typedef enum
/*35*/ID_CanMsg18FD7C00_Msg_Count, /*35*/ID_CanMsg18FD7C00_Msg_Count,
/*36*/ID_CanMsg18FECAE8_Msg_Count, /*36*/ID_CanMsg18FECAE8_Msg_Count,
/*37*/ID_CanMsg18FEED00_Msg_Count, /*37*/ID_CanMsg18FEED00_Msg_Count,
/*38*/ID_CanMsg18FF3018_Msg_Count, /*38*///ID_CanMsg18FF3018_Msg_Count,
/*39*/ID_CanMsg18021733_Msg_Count, /*39*/ID_CanMsg18021733_Msg_Count,
/*40*/ID_CanMsg0C010305_Msg_Count, /*40*/ID_CanMsg0C010305_Msg_Count,
/*41*/ID_CanMsg18FECA2A_Msg_Count, /*41*/ID_CanMsg18FECA2A_Msg_Count,
...@@ -116,7 +116,7 @@ extern const st_CAN_SendAttribute st_CANSendAttr[ID_SEND_TOTAL] ; ...@@ -116,7 +116,7 @@ extern const st_CAN_SendAttribute st_CANSendAttr[ID_SEND_TOTAL] ;
#define ID_CanMsg18FD7C00_Msg 0x18FD7C00u #define ID_CanMsg18FD7C00_Msg 0x18FD7C00u
#define ID_CanMsg18FECAE8_Msg 0x18FECAE8u #define ID_CanMsg18FECAE8_Msg 0x18FECAE8u
#define ID_CanMsg18FEED00_Msg 0x18FEED00u #define ID_CanMsg18FEED00_Msg 0x18FEED00u
#define ID_CanMsg18FF3018_Msg 0x18FF3018u //#define ID_CanMsg18FF3018_Msg 0x18FF3018u
#define ID_CanMsg18021733_Msg 0x18021733u #define ID_CanMsg18021733_Msg 0x18021733u
#define ID_CanMsg0C010305_Msg 0x0C010305u #define ID_CanMsg0C010305_Msg 0x0C010305u
#define ID_CanMsg18FECA2A_Msg 0x18FECA2Au #define ID_CanMsg18FECA2A_Msg 0x18FECA2Au
...@@ -227,8 +227,6 @@ extern uint8_t Get_ID_18FD7C00_Sig_DPF_Lamp_Status_Amber(void); ...@@ -227,8 +227,6 @@ extern uint8_t Get_ID_18FD7C00_Sig_DPF_Lamp_Status_Amber(void);
extern uint8_t Get_ID_18FECAE8_Sig_Amber_Warning_Lamp_Status(void); extern uint8_t Get_ID_18FECAE8_Sig_Amber_Warning_Lamp_Status(void);
extern uint8_t Get_ID_18FEED00_Sig_Maximum_Vehicle_Speed_Limit(void); extern uint8_t Get_ID_18FEED00_Sig_Maximum_Vehicle_Speed_Limit(void);
//extern uint32_t Get_ID_18EA0021_Sig_CruiseControl_VehicleSpeedSetup(void); //extern uint32_t Get_ID_18EA0021_Sig_CruiseControl_VehicleSpeedSetup(void);
extern uint8_t Get_ID_18FF3018_Sig_Engine_oil_filte(void);
extern uint8_t Get_ID_18FF3018_Sig_Starter(void);
extern uint8_t Get_ID_0C010305_Sig_Auto_EcoPow(void); extern uint8_t Get_ID_0C010305_Sig_Auto_EcoPow(void);
extern uint32_t Get_ID_18FECA03_Sig_SPN(void); extern uint32_t Get_ID_18FECA03_Sig_SPN(void);
extern uint8_t Get_ID_18FECA03_Sig_FMI(void); extern uint8_t Get_ID_18FECA03_Sig_FMI(void);
......
source/Application/Graphic/GUI/GUI.c
View file @ 7f3b7937
...@@ -3987,31 +3987,29 @@ void GUI_BG_RepMenu_3_1_Display(uint8_t Mode) ...@@ -3987,31 +3987,29 @@ void GUI_BG_RepMenu_3_1_Display(uint8_t Mode)
uint32_t User_Value = 0u; uint32_t User_Value = 0u;
uint8_t User_FLAG = 0u; uint8_t User_FLAG = 0u;
uint8_t Sig_Engine_oil = 0u; uint8_t Sig_Engine_Oil = 0u;
uint8_t Sig_Starter = 0u; uint8_t Sig_Starter_OH = 0u;
uint8_t CanStatus = 0u; uint8_t CanStatus = 0u;
if (Mode == GUI_DISP_MODE_NORMAL) if (Mode == GUI_DISP_MODE_NORMAL)
{ {
/*发动机油＆滤清器*/ /*User_ECU.Engine_Oil*/ /*User_App.User_FDJYLQQ = User_ECU.Engine_Oil;*/ /*发动机油＆滤清器*/ /*User_ECU.Engine_Oil*/ /*User_App.User_FDJYLQQ = User_ECU.Engine_Oil;*/
Sig_Engine_oil = Get_ID_18FF3018_Sig_Engine_oil_filte();/*78*/ Sig_Engine_Oil = Get_ID_18FF3018_Sig_Engine_Oil_Warnning();/*78*/
Sig_Starter = Get_ID_18FF3018_Sig_Starter();/*12*/ Sig_Starter_OH = Get_ID_18FF3018_Sig_Starter_OH_Warnning();/*12*/
CanStatus = CAN_MSG_Status(ID_CanMsg18EF1718_Msg_Count); CanStatus = CAN_MSG_Status(ID_CanMsg18EF1718_Msg_Count);
User_Value = User_ECU.Engine_Oil;/*显示数据*/ User_Value = User_ECU.Engine_Oil;/*显示数据*/
if (Sig_Engine_oil) if (CanStatus == CAN_SIG_LOST)
{ {
GUI_General_Display(MENU_Sprite, CN_User_Menu3_01_12, GUI_BLENDMODE_SRC_OVER); /*距离更换*/ 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*/ GUI_General_Display(MENU_Sprite, CN_User_Menu3_01_ERROR, GUI_BLENDMODE_SRC_OVER); /*error*/
} }
else else
{ {
if (Sig_Engine_oil == 1u)/*事前报警*/ if (Sig_Engine_Oil == 1u)/*事前报警*/
{ {
GUI_General_Display(MENU_Sprite, CN_User_Menu3_01_12, GUI_BLENDMODE_SRC_OVER); /*请更换*/ GUI_General_Display(MENU_Sprite, CN_User_Menu3_01_14, GUI_BLENDMODE_SRC_OVER); /*即将请更换*/
GUI_General_Digit_Display(MENU_Sprite, User_Value, Nb_15_0, 6u, 5u, GUI_REP1_X, 277u, GUI_BLENDMODE_SRC_OVER);
if (User_Value >= 1000u) if (User_Value >= 1000u)
{ {
...@@ -4021,32 +4019,48 @@ void GUI_BG_RepMenu_3_1_Display(uint8_t Mode) ...@@ -4021,32 +4019,48 @@ void GUI_BG_RepMenu_3_1_Display(uint8_t Mode)
{ {
GUI_General_Display(MENU_Sprite, SpriteSize, GUI_BLENDMODE_SRC_OVER); GUI_General_Display(MENU_Sprite, SpriteSize, GUI_BLENDMODE_SRC_OVER);
} }
GUI_General_Digit_Display(MENU_Sprite, User_Value, Nb_15_0, 6u, 5u, GUI_REP1_X, 277u, GUI_BLENDMODE_SRC_OVER);
} }
else if ((Sig_Engine_oil == 0u) && (Sig_Starter == 0u)) /*无报警*/ else if ((Sig_Engine_Oil == 0u) && (Sig_Starter_OH == 0u)) /*无报警*/
{ {
GUI_General_Display(MENU_Sprite, CN_User_Menu3_01_12, GUI_BLENDMODE_SRC_OVER); /*请更换*/ GUI_General_Display(MENU_Sprite, CN_User_Menu3_01_12, GUI_BLENDMODE_SRC_OVER);/*距离更换*/
GUI_Translate_Display(MENU_Sprite, Nb_15_douhao, 534u, 281u, GUI_BLENDMODE_SRC_OVER); /*逗号*/ if (User_Value >= 1000u)
{
GUI_Translate_Display(MENU_Sprite, Nb_15_douhao, 534u, 281u, GUI_BLENDMODE_SRC_OVER); /*逗号*/
}
else
{
GUI_General_Display(MENU_Sprite, SpriteSize, GUI_BLENDMODE_SRC_OVER);
}
GUI_General_Digit_Display(MENU_Sprite, User_Value, Nb_15_0, 6u, 5u, GUI_REP1_X, 277u, GUI_BLENDMODE_SRC_OVER); GUI_General_Digit_Display(MENU_Sprite, User_Value, Nb_15_0, 6u, 5u, GUI_REP1_X, 277u, GUI_BLENDMODE_SRC_OVER);
} }
else if ((Sig_Engine_oil == 2u) && (Sig_Starter == 2u)) /*本报警*/ else if ((Sig_Engine_Oil == 2u) && (Sig_Starter_OH == 2u)) /*本报警*/
{ {
GUI_General_Display(MENU_Sprite, CN_User_Menu3_01_12, GUI_BLENDMODE_SRC_OVER); /*请更换*/ GUI_General_Display(MENU_Sprite, CN_User_Menu3_01_13, GUI_BLENDMODE_SRC_OVER); /*请更换*/
GUI_Translate_Display(MENU_Sprite, Nb_15_fuhao, 506u, 279u, GUI_BLENDMODE_SRC_OVER); /*负号*/ GUI_Translate_Display(MENU_Sprite, Nb_15_fuhao, 506u, 279u, GUI_BLENDMODE_SRC_OVER); /*负号*/
GUI_Translate_Display(MENU_Sprite, Nb_15_douhao, 534u, 281u, GUI_BLENDMODE_SRC_OVER); /*逗号*/ if (User_Value >= 1000u)
{
GUI_Translate_Display(MENU_Sprite, Nb_15_douhao, 534u, 281u, GUI_BLENDMODE_SRC_OVER); /*逗号*/
}
else
{
GUI_General_Display(MENU_Sprite, SpriteSize, GUI_BLENDMODE_SRC_OVER);
}
GUI_General_Digit_Display(MENU_Sprite, 1000u, Nb_15_0, 6u, 5u, GUI_REP1_X, 277u, GUI_BLENDMODE_SRC_OVER); GUI_General_Digit_Display(MENU_Sprite, User_Value, Nb_15_0, 6u, 5u, GUI_REP1_X, 277u, GUI_BLENDMODE_SRC_OVER);
} }
else if ((Sig_Engine_oil == 3u) && (Sig_Starter == 3u))/*空白*/ else if ((Sig_Engine_Oil == 3u) && (Sig_Starter_OH == 3u))/*空白*/
{ {
GUI_General_Display(MENU_Sprite, CN_User_Menu3_01_12, GUI_BLENDMODE_SRC_OVER); /*请更换*/ GUI_General_Display(MENU_Sprite, CN_User_Menu3_01_12, GUI_BLENDMODE_SRC_OVER); /*距离更换*/
GUI_General_Display(MENU_Sprite, SpriteSize, GUI_BLENDMODE_SRC_OVER); GUI_General_Display(MENU_Sprite, SpriteSize, GUI_BLENDMODE_SRC_OVER);
} }
else else
{ {
GUI_General_Display(MENU_Sprite, CN_User_Menu3_01_12, GUI_BLENDMODE_SRC_OVER); /*请更换*/ GUI_General_Display(MENU_Sprite, CN_User_Menu3_01_12, GUI_BLENDMODE_SRC_OVER); /*距离更换*/
GUI_General_Display(MENU_Sprite, SpriteSize, GUI_BLENDMODE_SRC_OVER); GUI_General_Display(MENU_Sprite, SpriteSize, GUI_BLENDMODE_SRC_OVER);
} }
} }
...@@ -6297,9 +6311,6 @@ void GUI_BG_Enter_Return_Display(uint8_t Mode) ...@@ -6297,9 +6311,6 @@ void GUI_BG_Enter_Return_Display(uint8_t Mode)
void Common_EOL_User_Server(void) void Common_EOL_User_Server(void)
{ {
uint8_t Sig_Engine_oil = 0u;
uint8_t Sig_Starter = 0u;
uint8_t CanStatus = 0u;
/*发动机油＆滤清器*/ /*发动机油＆滤清器*/
// if (State_Flag.User_FDJYLQQ_FLAG != 3u) // if (State_Flag.User_FDJYLQQ_FLAG != 3u)
// { // {
......
source/Application/Graphic/Menu/Menu_user.c
View file @ 7f3b7937
...@@ -570,10 +570,10 @@ void Level2_1Menu_1Enter(void) ...@@ -570,10 +570,10 @@ void Level2_1Menu_1Enter(void)
canMag.Msg[1u] = 0x19u; canMag.Msg[1u] = 0x19u;
canMag.Msg[2u] = 0x02u; canMag.Msg[2u] = 0x02u;
canMag.Msg[3u] = 0x0Cu; canMag.Msg[3u] = 0x0Cu;
canMag.Msg[4u] = 0x55u; canMag.Msg[4u] = 0x00u;
canMag.Msg[5u] = 0x55u; canMag.Msg[5u] = 0x00u;
canMag.Msg[6u] = 0x55u; canMag.Msg[6u] = 0x00u;
canMag.Msg[7u] = 0x55u; canMag.Msg[7u] = 0x00u;
Can_Write(&canMag); Can_Write(&canMag);
...@@ -1935,10 +1935,10 @@ void LevelF1Menu_1Enter(void) ...@@ -1935,10 +1935,10 @@ void LevelF1Menu_1Enter(void)
canMag.Msg[1u] = 0x19u; canMag.Msg[1u] = 0x19u;
canMag.Msg[2u] = 0x02u; canMag.Msg[2u] = 0x02u;
canMag.Msg[3u] = 0x0Cu; canMag.Msg[3u] = 0x0Cu;
canMag.Msg[4u] = 0x55u; canMag.Msg[4u] = 0x00u;
canMag.Msg[5u] = 0x55u; canMag.Msg[5u] = 0x00u;
canMag.Msg[6u] = 0x55u; canMag.Msg[6u] = 0x00u;
canMag.Msg[7u] = 0x55u; canMag.Msg[7u] = 0x00u;
Can_Write(&canMag); Can_Write(&canMag);
} }
...@@ -2028,10 +2028,10 @@ void LevelF1_1Menu_1Enter(void) ...@@ -2028,10 +2028,10 @@ void LevelF1_1Menu_1Enter(void)
canMag.Msg[1u] = 0x19u; canMag.Msg[1u] = 0x19u;
canMag.Msg[2u] = 0x02u; canMag.Msg[2u] = 0x02u;
canMag.Msg[3u] = 0x0Cu; canMag.Msg[3u] = 0x0Cu;
canMag.Msg[4u] = 0x55u; canMag.Msg[4u] = 0x00u;
canMag.Msg[5u] = 0x55u; canMag.Msg[5u] = 0x00u;
canMag.Msg[6u] = 0x55u; canMag.Msg[6u] = 0x00u;
canMag.Msg[7u] = 0x55u; canMag.Msg[7u] = 0x00u;
Can_Write(&canMag); Can_Write(&canMag);
...@@ -2260,10 +2260,10 @@ void LevelD1Menu_1Enter(void) ...@@ -2260,10 +2260,10 @@ void LevelD1Menu_1Enter(void)
canMag.Msg[1u] = 0x19u; canMag.Msg[1u] = 0x19u;
canMag.Msg[2u] = 0x02u; canMag.Msg[2u] = 0x02u;
canMag.Msg[3u] = 0x0Cu; canMag.Msg[3u] = 0x0Cu;
canMag.Msg[4u] = 0x55u; canMag.Msg[4u] = 0x00u;
canMag.Msg[5u] = 0x55u; canMag.Msg[5u] = 0x00u;
canMag.Msg[6u] = 0x55u; canMag.Msg[6u] = 0x00u;
canMag.Msg[7u] = 0x55u; canMag.Msg[7u] = 0x00u;
Can_Write(&canMag); Can_Write(&canMag);
} }
...@@ -2352,10 +2352,10 @@ void LevelD1_1Menu_1Enter(void) ...@@ -2352,10 +2352,10 @@ void LevelD1_1Menu_1Enter(void)
canMag.Msg[1u] = 0x19u; canMag.Msg[1u] = 0x19u;
canMag.Msg[2u] = 0x02u; canMag.Msg[2u] = 0x02u;
canMag.Msg[3u] = 0x0Cu; canMag.Msg[3u] = 0x0Cu;
canMag.Msg[4u] = 0x55u; canMag.Msg[4u] = 0x00u;
canMag.Msg[5u] = 0x55u; canMag.Msg[5u] = 0x00u;
canMag.Msg[6u] = 0x55u; canMag.Msg[6u] = 0x00u;
canMag.Msg[7u] = 0x55u; canMag.Msg[7u] = 0x00u;
Can_Write(&canMag); Can_Write(&canMag);
......
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