Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
V
VC66_7C
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
ISUZU
VC66_7C
Commits
f4d8e204
Commit
f4d8e204
authored
May 30, 2022
by
hu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
调整水温报警灯,超速报警灯,燃油报警灯
parent
17915a87
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
164 additions
and
138 deletions
+164
-138
Telltales.h
source/Application/APP/Telltales/Telltales.h
+39
-39
Telltales_user.c
source/Application/APP/Telltales/Telltales_user.c
+3
-2
Popups.c
source/Application/Alarm/Popups.c
+26
-24
CAN_Communication_Matrix.c
...Application/CAN_APP_NM/CAN_App/CAN_Communication_Matrix.c
+21
-20
CAN_Communication_Matrix.h
...Application/CAN_APP_NM/CAN_App/CAN_Communication_Matrix.h
+47
-46
CAN_FUNC.c
source/Application/CAN_APP_NM/CAN_App/CAN_FUNC.c
+21
-1
CAN_FUNC.h
source/Application/CAN_APP_NM/CAN_App/CAN_FUNC.h
+2
-0
GUI.c
source/Application/Graphic/GUI/GUI.c
+5
-6
No files found.
source/Application/APP/Telltales/Telltales.h
View file @
f4d8e204
...
...
@@ -7,45 +7,45 @@
typedef
enum
{
em_LED_INTER_DIFF_LOCK_T
,
em_LED_FOUR_MUL_FOUR_T
,
em_LED_EXH_BRAKE_T
,
em_LED_QOS_GLOW_T
,
em_LED_HI_BEAM_T
,
em_LED_Rr_FOG_LAMP_T
,
em_LED_MIL_T
,
em_LED_SVS_T
,
em_LED_H_S_A__T
,
em_LED_RETARDER_T
,
em_LED_AUTO_LEVELING_T
,
em_LED_ROWS_L
,
em_LED_BSM_OFF_L
,
em_LED_AEBS_OFF_L
,
em_LED_LDWS_L
,
em_LED_SRS_L
,
em_LED_ENG_OIL_L
,
em_LED_CHARG_L
,
em_LED_SEAT_BELT_L
,
em_LED_RR_DIFF_LOCK_L
,
em_LED_TPMS_L
,
em_LED_ASR_or_EVSC_OFF_L
,
em_LED_EVSC_L
,
em_LED_eco_stop_OFF_L
,
em_LED_AMT_L
,
em_LED_WEAR_IND_L
,
em_LED_TRAILER_BRAKE_R
,
em_LED_BRAKE_AIR_or_EBS_YELLOW_R
,
em_LED_ACC_AIR_R
,
em_LED_ABS_R
,
em_LED_PARK_BRAKE_R
,
em_LED_BRAKE_AIR_or_EBS_RED_R
,
em_LED_BRAKE_LOCK_R
,
em_LED_AIR_SUS_R
,
em_LED_TRAILER_ABS_U
,
em_LED_WORKING_LAMP_U
,
em_LED_TRAILER_ABS_INFO_U
,
em_LED_TEMP
,
em_LED_FUEL
,
/* 0*/
em_LED_INTER_DIFF_LOCK_T
,
/* 1*/
em_LED_FOUR_MUL_FOUR_T
,
/* 2*/
em_LED_EXH_BRAKE_T
,
/* 3*/
em_LED_QOS_GLOW_T
,
/* 4*/
em_LED_HI_BEAM_T
,
/* 5*/
em_LED_Rr_FOG_LAMP_T
,
/* 6*/
em_LED_MIL_T
,
/* 7*/
em_LED_SVS_T
,
/* 8*/
em_LED_H_S_A__T
,
/* 9*/
em_LED_RETARDER_T
,
/*10*/
em_LED_AUTO_LEVELING_T
,
/*11*/
em_LED_ROWS_L
,
/*12*/
em_LED_BSM_OFF_L
,
/*13*/
em_LED_AEBS_OFF_L
,
/*14*/
em_LED_LDWS_L
,
/*15*/
em_LED_SRS_L
,
/*16*/
em_LED_ENG_OIL_L
,
/*17*/
em_LED_CHARG_L
,
/*18*/
em_LED_SEAT_BELT_L
,
/*19*/
em_LED_RR_DIFF_LOCK_L
,
/*20*/
em_LED_TPMS_L
,
/*21*/
em_LED_ASR_or_EVSC_OFF_L
,
/*22*/
em_LED_EVSC_L
,
/*23*/
em_LED_eco_stop_OFF_L
,
/*24*/
em_LED_AMT_L
,
/*25*/
em_LED_WEAR_IND_L
,
/*26*/
em_LED_TRAILER_BRAKE_R
,
/*27*/
em_LED_BRAKE_AIR_or_EBS_YELLOW_R
,
/*28*/
em_LED_ACC_AIR_R
,
/*29*/
em_LED_ABS_R
,
/*30*/
em_LED_PARK_BRAKE_R
,
/*31*/
em_LED_BRAKE_AIR_or_EBS_RED_R
,
/*32*/
em_LED_BRAKE_LOCK_R
,
/*33*/
em_LED_AIR_SUS_R
,
/*34*/
em_LED_TRAILER_ABS_U
,
/*35*/
em_LED_WORKING_LAMP_U
,
/*36*/
em_LED_TRAILER_ABS_INFO_U
,
/*37*/
em_LED_TEMP
,
/*38*/
em_LED_FUEL
,
LED_Max
,
}
LED_Idx_t
;
...
...
source/Application/APP/Telltales/Telltales_user.c
View file @
f4d8e204
...
...
@@ -1670,7 +1670,7 @@ uint8_t LED_TRAILER_BRAKE_R_Judgement(void)
uint8_t
u8Result
=
0u
;
uint8_t
m_Condition1
=
0u
;
/*m_Condition1 = (uint8_t)Line_In_Get_Status(LINE_IN_TRAILER_BRAKE);*/
m_Condition1
=
(
uint8_t
)
Line_In_Get_Status
(
LINE_IN_TRAILER_BRAKE
);
if
(
m_Condition1
==
1u
)
{
...
...
@@ -1964,7 +1964,8 @@ void LED_Temp_Execution(uint8_t led_status)
if
(
u8IG_st
==
COMMON_POWER_ON
)
{
if
(
led_status
==
1u
)
//if (led_status == 1u)
if
(
0
)
{
TEMP_R_LED_OUT
=
1u
;
/*水温红灯*/
//Water_Temp_Led_R_MCU_OUT = 1u;
...
...
source/Application/Alarm/Popups.c
View file @
f4d8e204
...
...
@@ -290,6 +290,18 @@ void Popups_Polling(void)
Popup_Delete
(
POPUP4_OIL_PRESSURE
);
}
/*13.--3--AMT初始化异常 DM1 SPN4220 Key On時*/
variable_4
=
Get_ID_18FECA03_Sig_SPN
();
if
((
variable_4
==
4220u
)
&&
(
K_Line_Set
.
K_Line_LID41
==
0x13u
))
{
Popup_Request
(
POPUP4_AMT_INIT_EXCE
);
}
else
{
Popup_Delete
(
POPUP4_AMT_INIT_EXCE
);
}
/*14.--4--尿素品质异常(系统检测)*/
if
(
0
)
{
...
...
@@ -320,6 +332,18 @@ void Popups_Polling(void)
Popup_Delete
(
POPUP4_ADBLUE_SUPPLY
);
}
/*17.--7--AMT初始化结束 DM1 SPN4021 Key On時*/
variable_4
=
Get_ID_18FECA03_Sig_SPN
();
if
((
variable_4
==
4021u
)
&&
(
K_Line_Set
.
K_Line_LID41
==
0x13u
))
{
Popup_Request
(
POPUP4_START_ENG
);
}
else
{
Popup_Delete
(
POPUP4_START_ENG
);
}
/*18.--8--DPD自动再生*/
if
(
0
)
{
...
...
@@ -334,36 +358,14 @@ void Popups_Polling(void)
{
Popup_Clear
(
POPUT4_ABNORMAL_CHARGE
);
Popup_Clear
(
POPUP4_OIL_PRESSURE
);
Popup_Clear
(
POPUP4_AMT_INIT_EXCE
);
Popup_Clear
(
POPUP4_ADBLUE_QUALITY
);
Popup_Clear
(
POPUP4_ADBLUE_SPRAY
);
Popup_Clear
(
POPUP4_ADBLUE_SUPPLY
);
Popup_Clear
(
POPUP4_START_ENG
);
Popup_Clear
(
POPUP4_DPD_AUTO
);
}
/*13.--3--AMT初始化异常 DM1 SPN4220 Key On時*/
variable_4
=
Get_ID_18FECA03_Sig_SPN
();
if
((
variable_4
==
4220u
)
&&
(
E_Speed
>
350u
)
&&
(
K_Line_Set
.
K_Line_LID41
==
0x13u
))
{
Popup_Request
(
POPUP4_AMT_INIT_EXCE
);
}
else
{
Popup_Delete
(
POPUP4_AMT_INIT_EXCE
);
}
/*17.--7--AMT初始化结束 DM1 SPN4021 Key On時*/
variable_4
=
Get_ID_18FECA03_Sig_SPN
();
if
((
variable_4
==
4021u
)
&&
(
E_Speed
>
350u
)
&&
(
K_Line_Set
.
K_Line_LID41
==
0x13u
))
{
Popup_Request
(
POPUP4_START_ENG
);
}
else
{
Popup_Delete
(
POPUP4_START_ENG
);
}
/*----第五组---------------------------------------------------------------------*/
/*19.--1--过热(过热,请在安全的场所停车)有车速 LID $43 :0x82*/
variable_1
=
Common_Get_Water_Temp_Level_Flag
();
...
...
source/Application/CAN_APP_NM/CAN_App/CAN_Communication_Matrix.c
View file @
f4d8e204
...
...
@@ -18,6 +18,7 @@ const st_CAN_SendAttribute st_CANSendAttr[ID_SEND_TOTAL] =
//{0x18EF2D17ul, 1000ul * 1000ul, 31ul, 0u, MSG_EXT, 13u, 8u, CAN_MSG_TX_CYCLE, Can_Set_Buff_18EF2D17, (void *)0},
{
0x18033317ul
,
0ul
*
1000ul
,
34ul
,
0u
,
MSG_EXT
,
14u
,
8u
,
CAN_MSG_TX_CYCKE_EVENT
,
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
},
{
0x18EA0017ul
,
5000ul
*
1000ul
,
47ul
,
0u
,
MSG_EXT
,
16u
,
8u
,
CAN_MSG_TX_CYCLE
,
Can_Set_Buff_18EA0017
,
(
void
*
)
0
},
};
const
st_CANMsgAttribute
CAN_MSG_CONST_ARRAY
[
ID_TOTAL_MAX
]
=
...
...
@@ -393,7 +394,7 @@ const st_CANMsgAttribute CAN_MSG_CONST_ARRAY[ID_TOTAL_MAX] =
((
void
*
)
0
),
},
{
{
0x
00
u
,
0x00u
,
0x00u
,
0x00u
,
0x00u
,
0x00u
,
0x00u
,
0x00u
},
{
0x
FF
u
,
0x00u
,
0x00u
,
0x00u
,
0x00u
,
0x00u
,
0x00u
,
0x00u
},
{
0x00u
,
0x00u
,
0x00u
,
0x00u
,
0x00u
,
0x00u
,
0x00u
,
0x00u
},
{
0x00u
,
0x00u
,
0x00u
,
0x00u
,
0x00u
,
0x00u
,
0x00u
,
0x00u
},
5000ul
,
...
...
@@ -402,16 +403,16 @@ const st_CANMsgAttribute CAN_MSG_CONST_ARRAY[ID_TOTAL_MAX] =
((
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
},
5000ul
,
0x18EA0021ul
,
((
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},
//
5000ul,
//
0x18EA0021ul,
//
(( void * )0),
//
(( void * )0),
//
(( void * )0),
//
},
{
{
0x00u
,
0x00u
,
0x00u
,
0x00u
,
0x00u
,
0x00u
,
0x00u
,
0x00u
},
{
0x00u
,
0x00u
,
0x00u
,
0x00u
,
0x00u
,
0x00u
,
0x00u
,
0x00u
},
...
...
@@ -987,12 +988,12 @@ uint8_t Get_ID_18FEED00_Sig_Maximum_Vehicle_Speed_Limit(void)
return
(((
uint8_t
)((
uint8_t
)
CAN_MSG_Read
(
ID_CanMsg18FEED00_Msg_Count
,
0u
)
>>
0u
)
&
0xFFu
));
}
uint32_t
Get_ID_18EA0021_Sig_CruiseControl_VehicleSpeedSetup
(
void
)
{
return
(((
uint32_t
)((
uint32_t
)((
uint32_t
)((
uint32_t
)
CAN_MSG_Read
(
ID_CanMsg18EA0021_Msg_Count
,
2u
)
>>
0u
)
&
0xFFu
)
<<
8u
)
+
\
((
uint32_t
)((
uint32_t
)
CAN_MSG_Read
(
ID_CanMsg18EA0021_Msg_Count
,
1u
)
>>
0u
)
&
0xFFu
)
<<
8u
)
+
\
((
uint32_t
)((
uint32_t
)
CAN_MSG_Read
(
ID_CanMsg18EA0021_Msg_Count
,
0u
)
>>
0u
)
&
0xFFu
));
}
//
uint32_t Get_ID_18EA0021_Sig_CruiseControl_VehicleSpeedSetup(void)
//
{
//
return (((uint32_t)((uint32_t)((uint32_t)((uint32_t)CAN_MSG_Read(ID_CanMsg18EA0021_Msg_Count, 2u) >> 0u) & 0xFFu) << 8u) + \
//
((uint32_t)((uint32_t)CAN_MSG_Read(ID_CanMsg18EA0021_Msg_Count, 1u) >> 0u) & 0xFFu) << 8u) + \
//
((uint32_t)((uint32_t)CAN_MSG_Read(ID_CanMsg18EA0021_Msg_Count, 0u) >> 0u) & 0xFFu));
//
}
uint8_t
Get_ID_0C010305_Sig_Auto_EcoPow
(
void
)
{
...
...
@@ -1145,9 +1146,9 @@ uint8_t Co_Can_ConvertSubID(uint32_t MsgID)
case
ID_CanMsg18FEED00_Msg
:
u8Result
=
ID_CanMsg18FEED00_Msg_Count
;
break
;
case
ID_CanMsg18EA0021_Msg
:
u8Result
=
ID_CanMsg18EA0021_Msg_Count
;
break
;
//
case ID_CanMsg18EA0021_Msg:
//
u8Result = ID_CanMsg18EA0021_Msg_Count;
//
break;
case
ID_CanMsg18021733_Msg
:
u8Result
=
ID_CanMsg18021733_Msg_Count
;
break
;
...
...
source/Application/CAN_APP_NM/CAN_App/CAN_Communication_Matrix.h
View file @
f4d8e204
...
...
@@ -6,50 +6,50 @@
typedef
enum
{
ID_CanMsg18FF5510_Msg_Count
,
ID_CanMsg18FF2300_Msg_Count
,
ID_CanMsg18FED900_Msg_Count
,
ID_CanMsg18FE5BE8_Msg_Count
,
ID_CanMsg18FECA0B_Msg_Count
,
ID_CanMsg18011733_Msg_Count
,
ID_CanMsg18FE4F0B_Msg_Count
,
ID_CanMsg18F0010B_Msg_Count
,
ID_CanMsg0CF02F2A_Msg_Count
,
ID_CanMsg0CF02FA1_Msg_Count
,
ID_CanMsg0CF02FA0_Msg_Count
,
ID_CanMsg18EBFF03_Msg_Count
,
ID_CanMsg18ECFF03_Msg_Count
,
ID_CanMsg18FECA03_Msg_Count
,
ID_CanMsg0CF00400_Msg_Count
,
ID_CanMsg18FEEE00_Msg_Count
,
ID_CanMsg0C0320C8_Msg_Count
,
ID_CanMsg0C0320C0_Msg_Count
,
ID_CanMsg0C0320B8_Msg_Count
,
ID_CanMsg0C0320B0_Msg_Count
,
ID_CanMsg0C0320A8_Msg_Count
,
ID_CanMsg0CFF0F15_Msg_Count
,
ID_CanMsg18FF4925_Msg_Count
,
ID_CanMsg18F00503_Msg_Count
,
ID_CanMsg18FF8503_Msg_Count
,
ID_CanMsg18FE4A03_Msg_Count
,
ID_CanMsg18FF4100_Msg_Count
,
ID_CanMsg10F007E8_Msg_Count
,
ID_CanMsg18EF1718_Msg_Count
,
ID_CanMsg18FEE518_Msg_Count
,
ID_CanMsg18FF3018_Msg_Count
,
ID_CanMsg18FF1211_Msg_Count
,
ID_CanMsg10FF462D_Msg_Count
,
ID_CanMsg10FF477E_Msg_Count
,
ID_CanMsg18FF5612_Msg_Count
,
ID_CanMsg18FD7C00_Msg_Count
,
ID_CanMsg18FECAE8_Msg_Count
,
ID_CanMsg18FEED00_Msg_Count
,
ID_CanMsg18EA0021_Msg_Count
,
ID_CanMsg18021733_Msg_Count
,
ID_CanMsg0C010305_Msg_Count
,
ID_CanMsg18FECA2A_Msg_Count
,
ID_CanMsg18FECAA1_Msg_Count
,
ID_CanMsg18FECAA0_Msg_Count
,
/* 0*/
ID_CanMsg18FF5510_Msg_Count
,
/* 1*/
ID_CanMsg18FF2300_Msg_Count
,
/* 2*/
ID_CanMsg18FED900_Msg_Count
,
/* 3*/
ID_CanMsg18FE5BE8_Msg_Count
,
/* 4*/
ID_CanMsg18FECA0B_Msg_Count
,
/* 5*/
ID_CanMsg18011733_Msg_Count
,
/* 6*/
ID_CanMsg18FE4F0B_Msg_Count
,
/* 7*/
ID_CanMsg18F0010B_Msg_Count
,
/* 8*/
ID_CanMsg0CF02F2A_Msg_Count
,
/* 9*/
ID_CanMsg0CF02FA1_Msg_Count
,
/*10*/
ID_CanMsg0CF02FA0_Msg_Count
,
/*11*/
ID_CanMsg18EBFF03_Msg_Count
,
/*12*/
ID_CanMsg18ECFF03_Msg_Count
,
/*13*/
ID_CanMsg18FECA03_Msg_Count
,
/*14*/
ID_CanMsg0CF00400_Msg_Count
,
/*15*/
ID_CanMsg18FEEE00_Msg_Count
,
/*16*/
ID_CanMsg0C0320C8_Msg_Count
,
/*17*/
ID_CanMsg0C0320C0_Msg_Count
,
/*18*/
ID_CanMsg0C0320B8_Msg_Count
,
/*19*/
ID_CanMsg0C0320B0_Msg_Count
,
/*20*/
ID_CanMsg0C0320A8_Msg_Count
,
/*21*/
ID_CanMsg0CFF0F15_Msg_Count
,
/*22*/
ID_CanMsg18FF4925_Msg_Count
,
/*23*/
ID_CanMsg18F00503_Msg_Count
,
/*24*/
ID_CanMsg18FF8503_Msg_Count
,
/*25*/
ID_CanMsg18FE4A03_Msg_Count
,
/*26*/
ID_CanMsg18FF4100_Msg_Count
,
/*27*/
ID_CanMsg10F007E8_Msg_Count
,
/*28*/
ID_CanMsg18EF1718_Msg_Count
,
/*29*/
ID_CanMsg18FEE518_Msg_Count
,
/*30*/
ID_CanMsg18FF3018_Msg_Count
,
/*31*/
ID_CanMsg18FF1211_Msg_Count
,
/*32*/
ID_CanMsg10FF462D_Msg_Count
,
/*33*/
ID_CanMsg10FF477E_Msg_Count
,
/*34*/
ID_CanMsg18FF5612_Msg_Count
,
/*35*/
ID_CanMsg18FD7C00_Msg_Count
,
/*36*/
ID_CanMsg18FECAE8_Msg_Count
,
/*37*/
ID_CanMsg18FEED00_Msg_Count
,
/*38*/
//
ID_CanMsg18EA0021_Msg_Count,
/*39*/
ID_CanMsg18021733_Msg_Count
,
/*40*/
ID_CanMsg0C010305_Msg_Count
,
/*41*/
ID_CanMsg18FECA2A_Msg_Count
,
/*42*/
ID_CanMsg18FECAA1_Msg_Count
,
/*43*/
ID_CanMsg18FECAA0_Msg_Count
,
ID_TOTAL_MAX
,
}
CAN_MSG_ID_t
;
...
...
@@ -70,6 +70,7 @@ typedef enum
//MSGID_18EF2D17,
MSGID_18033317
,
MSGID_180433A2
,
MSGID_18EA0017
,
ID_SEND_TOTAL
,
}
CAN_MSG_SEND_ID_t
;
...
...
@@ -115,7 +116,7 @@ extern const st_CAN_SendAttribute st_CANSendAttr[ID_SEND_TOTAL] ;
#define ID_CanMsg18FD7C00_Msg 0x18FD7C00u
#define ID_CanMsg18FECAE8_Msg 0x18FECAE8u
#define ID_CanMsg18FEED00_Msg 0x18FEED00u
#define ID_CanMsg18EA0021_Msg 0x18EA0021u
//
#define ID_CanMsg18EA0021_Msg 0x18EA0021u
#define ID_CanMsg18021733_Msg 0x18021733u
#define ID_CanMsg0C010305_Msg 0x0C010305u
#define ID_CanMsg18FECA2A_Msg 0x18FECA2Au
...
...
@@ -225,7 +226,7 @@ extern uint8_t Get_ID_18FF5612_Sig_ID18FF5612_byte3_bit1_8(void);
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_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_0C010305_Sig_Auto_EcoPow
(
void
);
extern
uint32_t
Get_ID_18FECA03_Sig_SPN
(
void
);
extern
uint8_t
Get_ID_18FECA03_Sig_FMI
(
void
);
...
...
source/Application/CAN_APP_NM/CAN_App/CAN_FUNC.c
View file @
f4d8e204
...
...
@@ -438,7 +438,7 @@ void Can_Set_Buff_18FF2A17(uint8_t CopyData[])
Water_Temp_Level
=
0
;
}
if
((
Coolant_Get_Valid
()
==
1u
)
&&
(
Coolant_Get_CurSeg
()
>=
1
2u
)
&&
(
Temperature
>=
0x97
u
))
if
((
Coolant_Get_Valid
()
==
1u
)
&&
(
Coolant_Get_CurSeg
()
>=
1
1u
)
&&
(
Temperature
>=
0x96
u
))
{
Water_Temp_Level_Flag
=
1u
;
}
...
...
@@ -1040,6 +1040,26 @@ void Can_Set_Buff_180433A2(uint8_t CopyData[])
CopyData
[
7
]
=
0u
;
/* 8 */
}
/*-------------------------------------------------------------------------
* Function Name : Can_Set_Buff_18EA0017
* Description :
* Input : None 18EA0017 (发送定值)
* Output : None
* Return : None
* onther : None
--------------------------------------------------------------------------*/
void
Can_Set_Buff_18EA0017
(
uint8_t
CopyData
[])
{
CopyData
[
0
]
=
0xEDU
;
/* 1 */
CopyData
[
1
]
=
0xFEU
;
/* 2 */
CopyData
[
2
]
=
0x00u
;
/* 3 */
CopyData
[
3
]
=
0xFFu
;
/* 4 */
CopyData
[
4
]
=
0xFFu
;
/* 5 */
CopyData
[
5
]
=
0xFFu
;
/* 6 */
CopyData
[
6
]
=
0xFFu
;
/* 7 */
CopyData
[
7
]
=
0xFFu
;
/* 8 */
}
/*-------------------------------------------------------------------------
* Function Name : Can_Set_Buff_18EF1817
* Description :
...
...
source/Application/CAN_APP_NM/CAN_App/CAN_FUNC.h
View file @
f4d8e204
...
...
@@ -51,6 +51,8 @@ extern void Can_Set_Buff_18033317(uint8_t CopyData[]);
extern
void
Can_Set_Buff_180433A2
(
uint8_t
CopyData
[]);
extern
void
Can_Set_Buff_18EA0017
(
uint8_t
CopyData
[]);
void
Drive_Info_IC1_STATUS_Rx
(
void
);
void
Drive_Info_IC3_STATUS_Rx
(
void
);
...
...
source/Application/Graphic/GUI/GUI.c
View file @
f4d8e204
...
...
@@ -513,9 +513,8 @@ void GUI_Data_Dispaly(uint8_t Mode)
void
GUI_TFTTelltales_Display
(
uint8_t
Mode
)
{
uint32_t
Veh_SpeedLim
=
0u
;
uint32_t
Veh_SpeedLim1
=
0u
;
uint32_t
Veh_SpeedLim2
=
0u
;
uint32_t
Veh_Speed
=
0u
;
uint8_t
CanStatus1
=
0u
;
uint8_t
CanStatus2
=
0u
;
uint8_t
EBSLamp_State
=
0u
;
...
...
@@ -525,11 +524,11 @@ void GUI_TFTTelltales_Display(uint8_t Mode)
/*超速报警指示灯*/
Veh_Speed
=
Common_Get_Disp_V_Speed
();
Veh_Speed
=
Veh_Speed
/
10u
;
Veh_SpeedLim1
=
Get_ID_18EA0021_Sig_CruiseControl_VehicleSpeedSetup
();
Veh_SpeedLim2
=
(
uint32_t
)
Get_ID_18FEED00_Sig_Maximum_Vehicle_Speed_Limit
();
Veh_SpeedLim
=
Veh_SpeedLim1
/
Veh_SpeedLim2
;
if
(
Veh_Speed
>=
Veh_SpeedLim
)
Veh_SpeedLim
=
(
uint32_t
)
Get_ID_18FEED00_Sig_Maximum_Vehicle_Speed_Limit
();
CanStatus1
=
CAN_MSG_Status
(
ID_CanMsg18FEED00_Msg_Count
);
if
((
Veh_Speed
>=
Veh_SpeedLim
)
&&
(
CanStatus1
!=
CAN_SIG_LOST
))
{
GUI_Translate_Display
(
WarningLight_Sprite
,
CN_Alarm_01_1
,
21u
,
GUI_DISP_LEMPY
[
0u
],
GUI_BLENDMODE_SRC_OVER
);
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment