Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
J
jiancetai
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
陈家乐
jiancetai
Commits
61cea658
Commit
61cea658
authored
Sep 03, 2025
by
何锐
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
✨
feat:根据仪表更新硬件版本号格式
parent
73312f4b
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
24 additions
and
6 deletions
+24
-6
Display_Info.c
YueJin_test_bench/source/Appliciation/Display_Info.c
+2
-2
Display_Info.h
YueJin_test_bench/source/Appliciation/Display_Info.h
+1
-1
Key.h
YueJin_test_bench/source/Appliciation/Key.h
+1
-1
RSCAN.c
YueJin_test_bench/source/Driver/CAN/RSCAN.c
+20
-2
No files found.
YueJin_test_bench/source/Appliciation/Display_Info.c
View file @
61cea658
...
...
@@ -32,7 +32,7 @@ uint16_t decimal_candata[14];
uint8_t
canData1
[
8
];
//暂存软件版本号数据用
uint8_t
canData4
[
8
];
//暂存硬件版本号数据用
uint8_t
canData2
[
14
];
uint8_t canData3[
1
0];
uint8_t
canData3
[
2
0
];
uint8_t
can_car_Data
[
8
];
...
...
@@ -4669,7 +4669,7 @@ const uint16_t CurrentDigitNum15PosX_2[] = {108, 98};
uint8_t
Detecting_Set_Version
[
5
]
=
{
0x56
,
0x31
,
0x30
,
0x32
,
0xff
};
void
Display_Can_Receive_Data
(
uint16_t
X
,
uint8_t
Y
)
{
if(canData3[9] == 0XFF && canData2[13] == 0XFF && All_Flag.u8flag[8] == 1)
if
(
canData3
[
1
9
]
==
0XFF
&&
canData2
[
13
]
==
0XFF
&&
All_Flag
.
u8flag
[
8
]
==
1
)
{
General_Number_Disp
(
canData2
,
X
+
70
,
Y
);
General_Number_Disp
(
canData3
,
X
+
70
,
Y
+
50
);
...
...
YueJin_test_bench/source/Appliciation/Display_Info.h
View file @
61cea658
...
...
@@ -116,7 +116,7 @@ typedef struct {
}
Learning_Card
;
extern
uint8_t
canData1
[
8
];
extern
uint8_t
canData2
[
14
];
extern
uint8_t
canData3
[
1
0
];
extern
uint8_t
canData3
[
2
0
];
extern
uint8_t
canData4
[
8
];
extern
uint8_t
UUIDX
;
extern
uint8_t
UIDNumber2
[
19
];
...
...
YueJin_test_bench/source/Appliciation/Key.h
View file @
61cea658
...
...
@@ -145,7 +145,7 @@ extern uint16_t testtime;
extern
uint8_t
canData1
[
8
];
extern
uint8_t
canData2
[
14
];
extern
uint8_t
canData3
[
1
0
];
extern
uint8_t
canData3
[
2
0
];
extern
uint8_t
canData4
[
8
];
extern
uint32_t
Quiescent_Current
[
5
];
...
...
YueJin_test_bench/source/Driver/CAN/RSCAN.c
View file @
61cea658
...
...
@@ -134,7 +134,7 @@ extern uint8_t Diagnosis_banbenhao_flag;
extern
uint8_t
canData1
[
8
];
extern
uint8_t
canData2
[
14
];
extern
uint8_t
canData3
[
1
0
];
extern
uint8_t
canData3
[
2
0
];
typedef
struct
{
...
...
@@ -879,7 +879,25 @@ void RSCAN0_CH4_Receive(CAN_Frame_st_t *pstCANFrame)
canData3
[
6
]
=
canData4
[
4
];
canData3
[
7
]
=
canData4
[
5
];
canData3
[
8
]
=
canData4
[
6
];
canData3
[
9
]
=
0XFF
;
canData3
[
9
]
=
canData4
[
7
];
}
else
if
(
pstCANFrame
->
unCANData
.
u8CANData
[
0
]
==
0x22
)
{
memcpy
(
canData4
,
pstCANFrame
->
unCANData
.
u8CANData
,
pstCANFrame
->
u8CANLEN
);
canData3
[
10
]
=
canData4
[
1
];
canData3
[
11
]
=
canData4
[
2
];
canData3
[
12
]
=
canData4
[
3
];
canData3
[
13
]
=
canData4
[
4
];
canData3
[
14
]
=
canData4
[
5
];
canData3
[
15
]
=
canData4
[
6
];
canData3
[
16
]
=
canData4
[
7
];
}
else
if
(
pstCANFrame
->
unCANData
.
u8CANData
[
0
]
==
0x23
)
{
memcpy
(
canData4
,
pstCANFrame
->
unCANData
.
u8CANData
,
pstCANFrame
->
u8CANLEN
);
canData3
[
17
]
=
canData4
[
1
];
canData3
[
18
]
=
canData4
[
2
];
canData3
[
19
]
=
0XFF
;
}
}
...
...
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