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
ebcaf57c
Commit
ebcaf57c
authored
Mar 06, 2026
by
何锐
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
✨
feat:优化版本号显示
parent
a40a5b7a
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
7 deletions
+7
-7
CAN_APP.c
YueJin_test_bench/source/Appliciation/CAN_APP.c
+4
-4
Display_Info.c
YueJin_test_bench/source/Appliciation/Display_Info.c
+3
-3
No files found.
YueJin_test_bench/source/Appliciation/CAN_APP.c
View file @
ebcaf57c
...
@@ -35,7 +35,7 @@
...
@@ -35,7 +35,7 @@
#define SWTIME_READ_ORDER2 0x28
#define SWTIME_READ_ORDER2 0x28
//零件号长度
//零件号长度
#define PN_Length
20
#define PN_Length
12
CAN_Frame_st_t
m_msg1
;
CAN_Frame_st_t
m_msg1
;
CAN_Frame_st_t
m_msg2
;
CAN_Frame_st_t
m_msg2
;
...
@@ -666,10 +666,10 @@ uint8_t MCU_PartNumbers_Get(void)
...
@@ -666,10 +666,10 @@ uint8_t MCU_PartNumbers_Get(void)
{
{
for
(
int
i
=
0
;
i
<
7
;
i
++
)
for
(
int
i
=
0
;
i
<
7
;
i
++
)
{
{
if
(
UDS_MMessage_Get
[
i
+
1
]
==
0xAA
)
if
(
(
UDS_MMessage_Get
[
i
+
1
]
==
0xAA
)
||
(
UDS_MMessage_Get
[
i
+
1
]
==
0x00
)
)
{
{
lingjianhao
[
PN_Length
]
=
0xFF
;
lingjianhao
[
PN_Length
]
=
0xFF
;
General_Number_Disp
(
lingjianhao
,
135
,
125
);
General_Number_Disp
(
lingjianhao
,
70
,
100
);
UDS_STEP
=
TIME_READ
;
UDS_STEP
=
TIME_READ
;
break
;
break
;
}
}
...
@@ -760,7 +760,7 @@ void SWINNotApplied(void)
...
@@ -760,7 +760,7 @@ void SWINNotApplied(void)
void
HWINNotApplied
(
void
)
void
HWINNotApplied
(
void
)
{
{
UDS_STEP
++
;
UDS_STEP
++
;
TFT_LCD_Draw_Bmp
(
135
,
100
,
(
uint8_t
*
)
ForkDisplay
);
//显示×,不应用此功能
//
TFT_LCD_Draw_Bmp(135, 100, ( uint8_t * )ForkDisplay);//显示×,不应用此功能
}
}
void
PNNotApplied
(
void
)
void
PNNotApplied
(
void
)
{
{
...
...
YueJin_test_bench/source/Appliciation/Display_Info.c
View file @
ebcaf57c
...
@@ -4282,7 +4282,7 @@ void Display_Version_Info(uint32_t ON_OFF)
...
@@ -4282,7 +4282,7 @@ void Display_Version_Info(uint32_t ON_OFF)
// TFT_LCD_Draw_Bmp(3, 160, ( uint8_t * )gImage_Alarm_12_WordX6_Y165); //24脚输出占空比
// TFT_LCD_Draw_Bmp(3, 160, ( uint8_t * )gImage_Alarm_12_WordX6_Y165); //24脚输出占空比
// TFT_LCD_Draw_Bmp(210, 160, ( uint8_t * )gImage_Alarm_13_ImageX222_Y166); //%
// TFT_LCD_Draw_Bmp(210, 160, ( uint8_t * )gImage_Alarm_13_ImageX222_Y166); //%
// TFT_LCD_Draw_Bmp(3, 290, ( uint8_t * )gImage_gImage_checkVX6_Y165 ); //检测台版本号
// TFT_LCD_Draw_Bmp(3, 290, ( uint8_t * )gImage_gImage_checkVX6_Y165 ); //检测台版本号
uint8_t
mbuff
[
10
]
=
{
2
,
0
,
2
,
6
,
97
,
0
,
2
,
1
,
1
,
0xff
};
uint8_t mbuff [10] = {2,0,2,6,97,0,
3,0,6
,0xff};
General_Number_Disp(mbuff, 115, 200); //检测台版本号
General_Number_Disp(mbuff, 115, 200); //检测台版本号
// General_Number_Disp(UIDNumber, 85, 120); //固定UID数字
// General_Number_Disp(UIDNumber, 85, 120); //固定UID数字
// General_Number_Disp(UIDNumber2, 70, 146); //可调UID数字
// General_Number_Disp(UIDNumber2, 70, 146); //可调UID数字
...
@@ -4292,8 +4292,8 @@ void Display_Version_Info(uint32_t ON_OFF)
...
@@ -4292,8 +4292,8 @@ void Display_Version_Info(uint32_t ON_OFF)
TFT_LCD_Draw_Bmp(3, 25, ( uint8_t * )gImage_pic_01X0_Y0); //外部软件版本号
TFT_LCD_Draw_Bmp(3, 25, ( uint8_t * )gImage_pic_01X0_Y0); //外部软件版本号
TFT_LCD_Draw_Bmp(3, 50, ( uint8_t * )gImage_pic_03X0_Y0); //外部硬件版本号
TFT_LCD_Draw_Bmp(3, 50, ( uint8_t * )gImage_pic_03X0_Y0); //外部硬件版本号
TFT_LCD_Draw_Bmp(3, 75, ( uint8_t * )gImage_pic_02X0_Y0); //软件内部版本号
TFT_LCD_Draw_Bmp(3, 75, ( uint8_t * )gImage_pic_02X0_Y0); //软件内部版本号
TFT_LCD_Draw_Bmp
(
3
,
100
,
(
uint8_t
*
)
gImage_pic_04X0_Y0
);
//硬件内部版本号
//
TFT_LCD_Draw_Bmp(3, 100, ( uint8_t * )gImage_pic_04X0_Y0); //硬件内部版本号
TFT_LCD_Draw_Bmp
(
3
,
1
25
,
(
uint8_t
*
)
gImage_pic_05X0_Y0
);
//零件号
TFT_LCD_Draw_Bmp(3, 1
00
, ( uint8_t * )gImage_pic_05X0_Y0); //零件号
TFT_LCD_Draw_Bmp(3, 175, ( uint8_t * )gImage_JCT_25X0_Y0); //时间
TFT_LCD_Draw_Bmp(3, 175, ( uint8_t * )gImage_JCT_25X0_Y0); //时间
}
}
...
...
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