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
e53f6b3e
Commit
e53f6b3e
authored
Mar 23, 2022
by
hu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
调整BUG
parent
b3aa1672
Changes
8
Show whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
236 additions
and
172 deletions
+236
-172
GUI.c
source/Application/Graphic/GUI/GUI.c
+1
-0
Menu_user.c
source/Application/Graphic/Menu/Menu_user.c
+96
-35
RTE_CAN.c
source/Application/RTE/RTE_CAN.c
+0
-1
EOL_Para.c
source/Application/UDS/APP/Common/EOL_Para.c
+96
-96
EOL_Para.h
source/Application/UDS/APP/Common/EOL_Para.h
+31
-30
UDS_Common.c
source/Application/UDS/APP/Common/UDS_Common.c
+2
-2
UDS_19Service_Main.c
...ce/Application/UDS/APP/UDS_19Service/UDS_19Service_Main.c
+7
-7
DoCAN_ISO15765.c
source/Application/UDS/TP/DoCAN_ISO15765.c
+3
-1
No files found.
source/Application/Graphic/GUI/GUI.c
View file @
e53f6b3e
...
...
@@ -1355,6 +1355,7 @@ void GUI_AVG_FuelSpeed_Display(uint8_t Mode)
}
else
if
(
Mode
==
GUI_DISP_MODE_BLANK
)
{
;
/*Do Nothing !*/
}
else
{
...
...
source/Application/Graphic/Menu/Menu_user.c
View file @
e53f6b3e
...
...
@@ -9,6 +9,7 @@
#include "Common_Interface.h"
#include "RTE_TIME.h"
#include "kwp2000_service.h"
#include "RTE_CAN.h"
uint8_t
bMenuSwFlag
;
uint8_t
g_ClearWin1
;
...
...
@@ -141,42 +142,42 @@ const _MenuOptTab MenuOptTab[] =
/*93*/
{
_FAC_DSP_LEVEL0MENU_1
,
_MN_IDX_NULL
,
_MN_IDX_NULL
,
_MN_IDX_NULL
,
LevelF1_2Menu_4Enter
,
LevelF1_2Menu_4Do
,
LevelF1_2Menu_4Exit
},
/*94*/
{
_MN_IDX_NULL
,
_MN_IDX_NULL
,
_FAC_DSP_LEVEL1_3MENU_2
,
_FAC_DSP_LEVEL1MENU_3
,
LevelF1_3Menu_1Enter
,
LevelF1_3Menu_1Do
,
LevelF1_3Menu_1Exit
},
/*95*/
{
_MN_IDX_NULL
,
_FAC_DSP_LEVEL1_3MENU_1
,
_MN_IDX_NULL
,
_FAC_DSP_LEVEL1MENU_3
,
LevelF1_3Menu_2Enter
,
LevelF1_3Menu_2Do
,
LevelF1_3Menu_2Exit
},
/*
01
*/
{
_FAC_DSP_LEVEL1_6MENU_2
,
_MN_IDX_NULL
,
_MN_IDX_NULL
,
_FAC_DSP_LEVEL1MENU_6
,
LevelF1_6Menu_1Enter
,
LevelF1_6Menu_1Do
,
LevelF1_6Menu_1Exit
},
/*
02
*/
{
_FAC_DSP_LEVEL1MENU_6
,
_MN_IDX_NULL
,
_MN_IDX_NULL
,
_FAC_DSP_LEVEL1_6MENU_1
,
LevelF1_6Menu_2Enter
,
LevelF1_6Menu_2Do
,
LevelF1_6Menu_2Exit
},
/*
96
*/
{
_FAC_DSP_LEVEL1_6MENU_2
,
_MN_IDX_NULL
,
_MN_IDX_NULL
,
_FAC_DSP_LEVEL1MENU_6
,
LevelF1_6Menu_1Enter
,
LevelF1_6Menu_1Do
,
LevelF1_6Menu_1Exit
},
/*
97
*/
{
_FAC_DSP_LEVEL1MENU_6
,
_MN_IDX_NULL
,
_MN_IDX_NULL
,
_FAC_DSP_LEVEL1_6MENU_1
,
LevelF1_6Menu_2Enter
,
LevelF1_6Menu_2Do
,
LevelF1_6Menu_2Exit
},
/*9
6
*/
{
_MN_IDX_NULL
,
_MN_IDX_NULL
,
_MN_IDX_NULL
,
_FAC_DSP_LEVEL1MENU_1
,
LevelF1_1Menu_1Enter
,
LevelF1_1Menu_1Do
,
LevelF1_1Menu_1Exit
},
/*9
7
*/
{
_MN_IDX_NULL
,
_MN_IDX_NULL
,
_MN_IDX_NULL
,
_FAC_DSP_LEVEL1MENU_1
,
LevelF1_1Menu_2Enter
,
LevelF1_1Menu_2Do
,
LevelF1_1Menu_2Exit
},
/*
98
*/
{
_MN_IDX_NULL
,
_MN_IDX_NULL
,
_MN_IDX_NULL
,
_FAC_DSP_LEVEL1MENU_1
,
LevelF1_1Menu_3Enter
,
LevelF1_1Menu_3Do
,
LevelF1_1Menu_3Exit
},
/*
99
*/
{
_MN_IDX_NULL
,
_MN_IDX_NULL
,
_MN_IDX_NULL
,
_FAC_DSP_LEVEL1MENU_1
,
LevelF1_1Menu_4Enter
,
LevelF1_1Menu_4Do
,
LevelF1_1Menu_4Exit
},
/*9
8
*/
{
_MN_IDX_NULL
,
_MN_IDX_NULL
,
_MN_IDX_NULL
,
_FAC_DSP_LEVEL1MENU_1
,
LevelF1_1Menu_1Enter
,
LevelF1_1Menu_1Do
,
LevelF1_1Menu_1Exit
},
/*9
9
*/
{
_MN_IDX_NULL
,
_MN_IDX_NULL
,
_MN_IDX_NULL
,
_FAC_DSP_LEVEL1MENU_1
,
LevelF1_1Menu_2Enter
,
LevelF1_1Menu_2Do
,
LevelF1_1Menu_2Exit
},
/*
00
*/
{
_MN_IDX_NULL
,
_MN_IDX_NULL
,
_MN_IDX_NULL
,
_FAC_DSP_LEVEL1MENU_1
,
LevelF1_1Menu_3Enter
,
LevelF1_1Menu_3Do
,
LevelF1_1Menu_3Exit
},
/*
01
*/
{
_MN_IDX_NULL
,
_MN_IDX_NULL
,
_MN_IDX_NULL
,
_FAC_DSP_LEVEL1MENU_1
,
LevelF1_1Menu_4Enter
,
LevelF1_1Menu_4Do
,
LevelF1_1Menu_4Exit
},
/*0
0
*/
{
_MN_IDX_NULL
,
_MN_IDX_NULL
,
_MN_IDX_NULL
,
_FAC_DSP_LEVEL1MENU_5
,
LevelF2_5Menu_1Enter
,
LevelF2_5Menu_1Do
,
LevelF2_5Menu_1Exit
},
/*0
2
*/
{
_MN_IDX_NULL
,
_MN_IDX_NULL
,
_MN_IDX_NULL
,
_FAC_DSP_LEVEL1MENU_5
,
LevelF2_5Menu_1Enter
,
LevelF2_5Menu_1Do
,
LevelF2_5Menu_1Exit
},
/*经销商模式*/
/*0
1
*/
{
_DEA_DSP_LEVEL1MENU_1
,
_MN_IDX_NULL
,
_MN_IDX_NULL
,
_MN_IDX_NULL
,
LevelD0Menu_1Enter
,
LevelD0Menu_1Do
,
LevelD0Menu_1Exit
},
/*0
2
*/
{
_DEA_DSP_LEVEL1_1MENU_1
,
_MN_IDX_NULL
,
_DEA_DSP_LEVEL1MENU_2
,
_MN_IDX_NULL
,
LevelD1Menu_1Enter
,
LevelD1Menu_1Do
,
LevelD1Menu_1Exit
},
/*0
3
*/
{
_DEA_DSP_LEVEL1_2MENU_1
,
_DEA_DSP_LEVEL1MENU_1
,
_DEA_DSP_LEVEL1MENU_3
,
_MN_IDX_NULL
,
LevelD1Menu_2Enter
,
LevelD1Menu_2Do
,
LevelD1Menu_2Exit
},
/*0
4
*/
{
_DEA_DSP_LEVEL1_3MENU_1
,
_DEA_DSP_LEVEL1MENU_2
,
_DEA_DSP_LEVEL1MENU_4
,
_MN_IDX_NULL
,
LevelD1Menu_3Enter
,
LevelD1Menu_3Do
,
LevelD1Menu_3Exit
},
/*0
5
*/
{
_MN_IDX_NULL
,
_DEA_DSP_LEVEL1MENU_3
,
_DEA_DSP_LEVEL1MENU_5
,
_MN_IDX_NULL
,
LevelD1Menu_4Enter
,
LevelD1Menu_4Do
,
LevelD1Menu_4Exit
},
/*0
6
*/
{
_DEA_DSP_LEVEL2_5MENU_1
,
_DEA_DSP_LEVEL1MENU_4
,
_DEA_DSP_LEVEL1MENU_6
,
_MN_IDX_NULL
,
LevelD1Menu_5Enter
,
LevelD1Menu_5Do
,
LevelD1Menu_5Exit
},
/*0
7
*/
{
_DEA_DSP_LEVEL1_6MENU_1
,
_DEA_DSP_LEVEL1MENU_5
,
_MN_IDX_NULL
,
_MN_IDX_NULL
,
LevelD1Menu_6Enter
,
LevelD1Menu_6Do
,
LevelD1Menu_6Exit
},
/*
08
*/
{
_MN_IDX_NULL
,
_MN_IDX_NULL
,
_MN_IDX_NULL
,
_DEA_DSP_LEVEL1MENU_1
,
LevelD1_1Menu_1Enter
,
LevelD1_1Menu_1Do
,
LevelD1_1Menu_1Exit
},
/*
09
*/
{
_DEA_DSP_LEVEL1_2MENU_2
,
_MN_IDX_NULL
,
_MN_IDX_NULL
,
_DEA_DSP_LEVEL1MENU_2
,
LevelD1_2Menu_1Enter
,
LevelD1_2Menu_1Do
,
LevelD1_2Menu_1Exit
},
/*1
0
*/
{
_DEA_DSP_LEVEL1_2MENU_3
,
_MN_IDX_NULL
,
_MN_IDX_NULL
,
_DEA_DSP_LEVEL1_2MENU_1
,
LevelD1_2Menu_2Enter
,
LevelD1_2Menu_2Do
,
LevelD1_2Menu_2Exit
},
/*1
1
*/
{
_MN_IDX_NULL
,
_MN_IDX_NULL
,
_MN_IDX_NULL
,
_MN_IDX_NULL
,
LevelD1_2Menu_3Enter
,
LevelD1_2Menu_3Do
,
LevelD1_2Menu_3Exit
},
/*1
2
*/
{
_DEA_DSP_LEVEL0MENU_1
,
_MN_IDX_NULL
,
_MN_IDX_NULL
,
_MN_IDX_NULL
,
LevelD1_2Menu_4Enter
,
LevelD1_2Menu_4Do
,
LevelD1_2Menu_4Exit
},
/*1
3
*/
{
_MN_IDX_NULL
,
_MN_IDX_NULL
,
_DEA_DSP_LEVEL1_3MENU_2
,
_DEA_DSP_LEVEL1MENU_3
,
LevelD1_3Menu_1Enter
,
LevelD1_3Menu_1Do
,
LevelD1_3Menu_1Exit
},
/*1
4
*/
{
_MN_IDX_NULL
,
_DEA_DSP_LEVEL1_3MENU_1
,
_MN_IDX_NULL
,
_DEA_DSP_LEVEL1MENU_3
,
LevelD1_3Menu_2Enter
,
LevelD1_3Menu_2Do
,
LevelD1_3Menu_2Exit
},
/*
01
*/
{
_DEA_DSP_LEVEL1_6MENU_2
,
_MN_IDX_NULL
,
_MN_IDX_NULL
,
_DEA_DSP_LEVEL1MENU_6
,
LevelD1_6Menu_1Enter
,
LevelD1_6Menu_1Do
,
LevelD1_6Menu_1Exit
},
/*
02
*/
{
_DEA_DSP_LEVEL1MENU_6
,
_MN_IDX_NULL
,
_MN_IDX_NULL
,
_DEA_DSP_LEVEL1_6MENU_1
,
LevelD1_6Menu_2Enter
,
LevelD1_6Menu_2Do
,
LevelD1_6Menu_2Exit
},
/*1
5
*/
{
_MN_IDX_NULL
,
_MN_IDX_NULL
,
_MN_IDX_NULL
,
_DEA_DSP_LEVEL1MENU_1
,
LevelF1_1Menu_1Enter
,
LevelF1_1Menu_1Do
,
LevelF1_1Menu_1Exit
},
/*
16
*/
{
_MN_IDX_NULL
,
_MN_IDX_NULL
,
_MN_IDX_NULL
,
_DEA_DSP_LEVEL1MENU_1
,
LevelF1_1Menu_2Enter
,
LevelF1_1Menu_2Do
,
LevelF1_1Menu_2Exit
},
/*
17
*/
{
_MN_IDX_NULL
,
_MN_IDX_NULL
,
_MN_IDX_NULL
,
_DEA_DSP_LEVEL1MENU_1
,
LevelF1_1Menu_3Enter
,
LevelF1_1Menu_3Do
,
LevelF1_1Menu_3Exit
},
/*
18
*/
{
_MN_IDX_NULL
,
_MN_IDX_NULL
,
_MN_IDX_NULL
,
_DEA_DSP_LEVEL1MENU_1
,
LevelF1_1Menu_4Enter
,
LevelF1_1Menu_4Do
,
LevelF1_1Menu_4Exit
},
/*
19
*/
{
_MN_IDX_NULL
,
_MN_IDX_NULL
,
_MN_IDX_NULL
,
_DEA_DSP_LEVEL1MENU_5
,
LevelD2_5Menu_1Enter
,
LevelD2_5Menu_1Do
,
LevelD2_5Menu_1Exit
},
/*0
3
*/
{
_DEA_DSP_LEVEL1MENU_1
,
_MN_IDX_NULL
,
_MN_IDX_NULL
,
_MN_IDX_NULL
,
LevelD0Menu_1Enter
,
LevelD0Menu_1Do
,
LevelD0Menu_1Exit
},
/*0
4
*/
{
_DEA_DSP_LEVEL1_1MENU_1
,
_MN_IDX_NULL
,
_DEA_DSP_LEVEL1MENU_2
,
_MN_IDX_NULL
,
LevelD1Menu_1Enter
,
LevelD1Menu_1Do
,
LevelD1Menu_1Exit
},
/*0
5
*/
{
_DEA_DSP_LEVEL1_2MENU_1
,
_DEA_DSP_LEVEL1MENU_1
,
_DEA_DSP_LEVEL1MENU_3
,
_MN_IDX_NULL
,
LevelD1Menu_2Enter
,
LevelD1Menu_2Do
,
LevelD1Menu_2Exit
},
/*0
6
*/
{
_DEA_DSP_LEVEL1_3MENU_1
,
_DEA_DSP_LEVEL1MENU_2
,
_DEA_DSP_LEVEL1MENU_4
,
_MN_IDX_NULL
,
LevelD1Menu_3Enter
,
LevelD1Menu_3Do
,
LevelD1Menu_3Exit
},
/*0
7
*/
{
_MN_IDX_NULL
,
_DEA_DSP_LEVEL1MENU_3
,
_DEA_DSP_LEVEL1MENU_5
,
_MN_IDX_NULL
,
LevelD1Menu_4Enter
,
LevelD1Menu_4Do
,
LevelD1Menu_4Exit
},
/*0
8
*/
{
_DEA_DSP_LEVEL2_5MENU_1
,
_DEA_DSP_LEVEL1MENU_4
,
_DEA_DSP_LEVEL1MENU_6
,
_MN_IDX_NULL
,
LevelD1Menu_5Enter
,
LevelD1Menu_5Do
,
LevelD1Menu_5Exit
},
/*0
9
*/
{
_DEA_DSP_LEVEL1_6MENU_1
,
_DEA_DSP_LEVEL1MENU_5
,
_MN_IDX_NULL
,
_MN_IDX_NULL
,
LevelD1Menu_6Enter
,
LevelD1Menu_6Do
,
LevelD1Menu_6Exit
},
/*
10
*/
{
_MN_IDX_NULL
,
_MN_IDX_NULL
,
_MN_IDX_NULL
,
_DEA_DSP_LEVEL1MENU_1
,
LevelD1_1Menu_1Enter
,
LevelD1_1Menu_1Do
,
LevelD1_1Menu_1Exit
},
/*
11
*/
{
_DEA_DSP_LEVEL1_2MENU_2
,
_MN_IDX_NULL
,
_MN_IDX_NULL
,
_DEA_DSP_LEVEL1MENU_2
,
LevelD1_2Menu_1Enter
,
LevelD1_2Menu_1Do
,
LevelD1_2Menu_1Exit
},
/*1
2
*/
{
_DEA_DSP_LEVEL1_2MENU_3
,
_MN_IDX_NULL
,
_MN_IDX_NULL
,
_DEA_DSP_LEVEL1_2MENU_1
,
LevelD1_2Menu_2Enter
,
LevelD1_2Menu_2Do
,
LevelD1_2Menu_2Exit
},
/*1
3
*/
{
_MN_IDX_NULL
,
_MN_IDX_NULL
,
_MN_IDX_NULL
,
_MN_IDX_NULL
,
LevelD1_2Menu_3Enter
,
LevelD1_2Menu_3Do
,
LevelD1_2Menu_3Exit
},
/*1
4
*/
{
_DEA_DSP_LEVEL0MENU_1
,
_MN_IDX_NULL
,
_MN_IDX_NULL
,
_MN_IDX_NULL
,
LevelD1_2Menu_4Enter
,
LevelD1_2Menu_4Do
,
LevelD1_2Menu_4Exit
},
/*1
5
*/
{
_MN_IDX_NULL
,
_MN_IDX_NULL
,
_DEA_DSP_LEVEL1_3MENU_2
,
_DEA_DSP_LEVEL1MENU_3
,
LevelD1_3Menu_1Enter
,
LevelD1_3Menu_1Do
,
LevelD1_3Menu_1Exit
},
/*1
6
*/
{
_MN_IDX_NULL
,
_DEA_DSP_LEVEL1_3MENU_1
,
_MN_IDX_NULL
,
_DEA_DSP_LEVEL1MENU_3
,
LevelD1_3Menu_2Enter
,
LevelD1_3Menu_2Do
,
LevelD1_3Menu_2Exit
},
/*
17
*/
{
_DEA_DSP_LEVEL1_6MENU_2
,
_MN_IDX_NULL
,
_MN_IDX_NULL
,
_DEA_DSP_LEVEL1MENU_6
,
LevelD1_6Menu_1Enter
,
LevelD1_6Menu_1Do
,
LevelD1_6Menu_1Exit
},
/*
18
*/
{
_DEA_DSP_LEVEL1MENU_6
,
_MN_IDX_NULL
,
_MN_IDX_NULL
,
_DEA_DSP_LEVEL1_6MENU_1
,
LevelD1_6Menu_2Enter
,
LevelD1_6Menu_2Do
,
LevelD1_6Menu_2Exit
},
/*1
9
*/
{
_MN_IDX_NULL
,
_MN_IDX_NULL
,
_MN_IDX_NULL
,
_DEA_DSP_LEVEL1MENU_1
,
LevelF1_1Menu_1Enter
,
LevelF1_1Menu_1Do
,
LevelF1_1Menu_1Exit
},
/*
20
*/
{
_MN_IDX_NULL
,
_MN_IDX_NULL
,
_MN_IDX_NULL
,
_DEA_DSP_LEVEL1MENU_1
,
LevelF1_1Menu_2Enter
,
LevelF1_1Menu_2Do
,
LevelF1_1Menu_2Exit
},
/*
21
*/
{
_MN_IDX_NULL
,
_MN_IDX_NULL
,
_MN_IDX_NULL
,
_DEA_DSP_LEVEL1MENU_1
,
LevelF1_1Menu_3Enter
,
LevelF1_1Menu_3Do
,
LevelF1_1Menu_3Exit
},
/*
22
*/
{
_MN_IDX_NULL
,
_MN_IDX_NULL
,
_MN_IDX_NULL
,
_DEA_DSP_LEVEL1MENU_1
,
LevelF1_1Menu_4Enter
,
LevelF1_1Menu_4Do
,
LevelF1_1Menu_4Exit
},
/*
23
*/
{
_MN_IDX_NULL
,
_MN_IDX_NULL
,
_MN_IDX_NULL
,
_DEA_DSP_LEVEL1MENU_5
,
LevelD2_5Menu_1Enter
,
LevelD2_5Menu_1Do
,
LevelD2_5Menu_1Exit
},
};
void
NextMenu
(
_MENU_IDX
idx
)
{
...
...
@@ -550,7 +551,27 @@ void Level2Menu_6Exit(void)
/*----二级菜单----故障代码----子菜单系列*/
/*发动机故障*/
void
Level2_1Menu_1Enter
(
void
)
{}
{
//03 19 02 0C 55 55 55 55
_CAN_Msg
canMag
;
canMag
.
MsgID
=
0x7E0u
;
canMag
.
MsgDLC
=
8u
;
canMag
.
MsgPro
=
0u
;
canMag
.
MsgStd
=
0u
;
canMag
.
MsgRTR
=
0u
;
canMag
.
Msg
[
0u
]
=
0x03u
;
canMag
.
Msg
[
1u
]
=
0x19u
;
canMag
.
Msg
[
2u
]
=
0x02u
;
canMag
.
Msg
[
3u
]
=
0x0Cu
;
canMag
.
Msg
[
4u
]
=
0x55u
;
canMag
.
Msg
[
5u
]
=
0x55u
;
canMag
.
Msg
[
6u
]
=
0x55u
;
canMag
.
Msg
[
7u
]
=
0x55u
;
Can_Write
(
&
canMag
);
}
static
uint8_t
DTCNumDis
=
1u
;
void
Level2_1Menu_1Do
(
void
)
{
...
...
@@ -1816,7 +1837,27 @@ void LevelF0Menu_1Exit(void)
/*----工厂模式----DTC显示-----*/
void
LevelF1Menu_1Enter
(
void
)
{}
{
//03 19 02 0C 55 55 55 55
_CAN_Msg
canMag
;
canMag
.
MsgID
=
0x7E0u
;
canMag
.
MsgDLC
=
8u
;
canMag
.
MsgPro
=
0u
;
canMag
.
MsgStd
=
0u
;
canMag
.
MsgRTR
=
0u
;
canMag
.
Msg
[
0u
]
=
0x03u
;
canMag
.
Msg
[
1u
]
=
0x19u
;
canMag
.
Msg
[
2u
]
=
0x02u
;
canMag
.
Msg
[
3u
]
=
0x0Cu
;
canMag
.
Msg
[
4u
]
=
0x55u
;
canMag
.
Msg
[
5u
]
=
0x55u
;
canMag
.
Msg
[
6u
]
=
0x55u
;
canMag
.
Msg
[
7u
]
=
0x55u
;
Can_Write
(
&
canMag
);
}
void
LevelF1Menu_1Do
(
void
)
{
GUI_OftenShow_Display
();
...
...
@@ -2053,7 +2094,27 @@ void LevelD0Menu_1Exit(void)
/*----经销商模式----DTC显示----*/
void
LevelD1Menu_1Enter
(
void
)
{}
{
//03 19 02 0C 55 55 55 55
_CAN_Msg
canMag
;
canMag
.
MsgID
=
0x7E0u
;
canMag
.
MsgDLC
=
8u
;
canMag
.
MsgPro
=
0u
;
canMag
.
MsgStd
=
0u
;
canMag
.
MsgRTR
=
0u
;
canMag
.
Msg
[
0u
]
=
0x03u
;
canMag
.
Msg
[
1u
]
=
0x19u
;
canMag
.
Msg
[
2u
]
=
0x02u
;
canMag
.
Msg
[
3u
]
=
0x0Cu
;
canMag
.
Msg
[
4u
]
=
0x55u
;
canMag
.
Msg
[
5u
]
=
0x55u
;
canMag
.
Msg
[
6u
]
=
0x55u
;
canMag
.
Msg
[
7u
]
=
0x55u
;
Can_Write
(
&
canMag
);
}
void
LevelD1Menu_1Do
(
void
)
{
GUI_OftenShow_Display
();
...
...
source/Application/RTE/RTE_CAN.c
View file @
e53f6b3e
#include "Rscan.h"
#include "GPIO.h"
#include "dr7f701441.dvf.h"
...
...
source/Application/UDS/APP/Common/EOL_Para.c
View file @
e53f6b3e
source/Application/UDS/APP/Common/EOL_Para.h
View file @
e53f6b3e
...
...
@@ -98,4 +98,5 @@ uint8_t Val_EOL_60D0_DriveForm(void);
uint8_t
Val_EOL_60D1_BatteryCapacity
(
void
);
/*电池管理系统*/
uint8_t
Val_EOL_60D2_BatteryManagement
(
void
);
#endif
\ No newline at end of file
source/Application/UDS/APP/Common/UDS_Common.c
View file @
e53f6b3e
...
...
@@ -28,8 +28,8 @@ const uint8_t Ser22_DID_F18C[20] = {0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x
/*IC 系列号*/
const
uint8_t
Ser22_DID_F190
[
17
]
=
{
0x20
,
0x20
,
0x20
,
0x20
,
0x20
,
0x20
,
0x20
,
0x20
,
0x20
,
0x20
,
0x20
,
0x20
,
0x20
,
0x20
,
0x20
,
0x20
,
0x20
};
/*车辆标识号 VIN*/
const
uint8_t
Ser22_DID_F193
[
6
]
=
{
'V'
,
'
3'
,
'.'
,
'1
'
,
'.'
,
'0'
};
/*IC 硬件版本号 SystemSupplierECUHardwareVersionNumberApp*/
const
uint8_t
Ser22_DID_F195
[
6
]
=
{
'V'
,
'
3
'
,
'.'
,
'1'
,
'.'
,
'0'
};
/*IC 逻辑程序软件版本号 SystemSupplierECUSoftwareInformationApp*/
const
uint8_t
Ser22_DID_F193
[
6
]
=
{
'V'
,
'
1'
,
'.'
,
'2
'
,
'.'
,
'0'
};
/*IC 硬件版本号 SystemSupplierECUHardwareVersionNumberApp*/
const
uint8_t
Ser22_DID_F195
[
6
]
=
{
'V'
,
'
1
'
,
'.'
,
'1'
,
'.'
,
'0'
};
/*IC 逻辑程序软件版本号 SystemSupplierECUSoftwareInformationApp*/
DiagMSGUnion
DiagMSG
;
DiagFlagUnion
DiagFlag
;
...
...
source/Application/UDS/APP/UDS_19Service/UDS_19Service_Main.c
View file @
e53f6b3e
...
...
@@ -18,7 +18,7 @@ void UDS_Service_19_Indication(uint32_t A_TA_type, uint16_t A_Length, uint8_t A_
{
NRC
=
UDS_19Service_NRC7F
();
/*19服务会话是否支持验证*/
}
if
(
NRC
==
positiveResponse
)
if
(
NRC
==
positiveResponse
)
{
UDS_19Service_NRC13_MinLengthCheck
();
/*19服务最小长度验证*/
}
...
...
@@ -119,7 +119,7 @@ void UDS_19Service_Sub01(void)
uint16_t
DTCCount
=
0u
;
for
(
i
=
0u
;
i
<
sizeof
(
DTCToDFlashInfo
.
DTC
)
/
sizeof
(
DTCUnion
);
++
i
)
{
if
(
DTCList
[
i
][
1u
])
if
(
DTCList
[
i
][
1u
])
{
DTCStatus
=
DTCToDFlashInfo
.
DTC
[
i
].
DTCStatus
&
DTCMask
;
if
(
DTCStatus
&
DiagMSG
.
msgData
.
SidDetail
.
Data
[
0
])
...
...
@@ -146,7 +146,7 @@ void UDS_19Service_Sub02(void)
uint32_t
DTC
=
0u
;
for
(
i
=
0u
;
i
<
sizeof
(
DTCToDFlashInfo
.
DTC
)
/
sizeof
(
DTCUnion
);
++
i
)
{
if
(
DTCList
[
i
][
1u
])
if
(
DTCList
[
i
][
1u
])
{
DTCStatus
=
DTCToDFlashInfo
.
DTC
[
i
].
DTCStatus
&
DTCMask
;
if
(
DTCStatus
&
DiagMSG
.
msgData
.
SidDetail
.
Data
[
0
])
...
...
@@ -222,7 +222,7 @@ void UDS_19Service_Sub0A(void)
DiagMSG
.
msgData
.
SidDetail
.
Data
[
count
++
]
=
DTCMask
;
for
(
i
=
0u
;
i
<
sizeof
(
DTCToDFlashInfo
.
DTC
)
/
sizeof
(
DTCUnion
);
++
i
)
{
if
(
DTCList
[
i
][
1u
])
if
(
DTCList
[
i
][
1u
])
{
DTC
=
getDTCNumber
(
i
);
DTCStatus
=
DTCToDFlashInfo
.
DTC
[
i
].
DTCStatus
&
DTCMask
;
...
...
source/Application/UDS/TP/DoCAN_ISO15765.c
View file @
e53f6b3e
...
...
@@ -265,6 +265,8 @@ void DoCAN_L_Data_Request ( uint32_t Identifier, uint8_t dlc, uint8_t Data[] )
Can_Write
(
&
canMag
);
//RSCAN0_SendCH0_TxBuf0(LinkTxCtrl.Identifier, 8U, 1U, LinkTxCtrl.Data);
#else
canMag
.
u8CANLEN
=
dlc
;
Can_Write
(
&
canMag
);
//RSCAN0_SendCH0_TxBuf0(LinkTxCtrl.Identifier, 8U, 1U, LinkTxCtrl.Data);
#endif
...
...
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