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
51ac293e
Commit
51ac293e
authored
Dec 29, 2025
by
梁百峰
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
🐞
fix:修改版本号对比逻辑,增加两个芯片分别对比
parent
f8a5fa84
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
14 additions
and
4 deletions
+14
-4
Display_Info.c
YueJin_test_bench/source/Appliciation/Display_Info.c
+14
-4
No files found.
YueJin_test_bench/source/Appliciation/Display_Info.c
View file @
51ac293e
...
...
@@ -3625,8 +3625,10 @@ void Check_PWM(void)
uint32_t
leftvoltage
;
uint32_t
rightvoltage
;
uint8_t
firstclearflag
=
0
;
uint8_t
nowbanbenhao
=
2
;
uint8_t
nowbanbenhaohoumian
=
22
;
uint8_t
nowbanbenhao
=
0
;
uint8_t
nowbanbenhaohoumian
=
0
;
uint8_t
nowbanbenhaoG031
=
0
;
uint8_t
nowbanbenhaoG031houmian
=
0
;
const
uint16_t
banebenhao1
[]
=
{
35
,
25
};
const
uint16_t
banebenhao2
[]
=
{
190
,
180
};
const
uint16_t
banebenhao3
[]
=
{
105
,
95
};
...
...
@@ -3710,11 +3712,15 @@ void Display_Version_Info(uint32_t ON_OFF)
{
nowbanbenhao
=
1
;
nowbanbenhaohoumian
=
22
;
nowbanbenhaoG031
=
1
;
nowbanbenhaoG031houmian
=
21
;
}
else
if
(
R485_ID4Dh
.
Sig
.
MaterialCode08
==
0x33
)
{
nowbanbenhao
=
1
;
nowbanbenhaohoumian
=
4
;
nowbanbenhaoG031
=
1
;
nowbanbenhaoG031houmian
=
4
;
}
else
{
...
...
@@ -3730,11 +3736,15 @@ void Display_Version_Info(uint32_t ON_OFF)
{
nowbanbenhao
=
2
;
nowbanbenhaohoumian
=
33
;
nowbanbenhaoG031
=
2
;
nowbanbenhaoG031houmian
=
32
;
}
else
if
(
R485_ID4Dh
.
Sig
.
MaterialCode13
==
0x35
)
{
nowbanbenhao
=
1
;
nowbanbenhaohoumian
=
2
;
nowbanbenhaoG031
=
1
;
nowbanbenhaoG031houmian
=
2
;
}
else
{
...
...
@@ -3790,7 +3800,7 @@ void Display_Version_Info(uint32_t ON_OFF)
TFT_LCD_Draw_Bmp
(
3
,
90
+
25
+
25
+
30
+
25
+
30
+
30
+
5
,
(
uint8_t
*
)
gImage_gImage_SV1X6_Y16
);
//软件版本号对比
if
((
R485_ID4Dh
.
Sig
.
ESP322
!=
0
)
&&
(
R485_ID4Dh
.
Sig
.
G0312
!=
0
))
{
if
((
nowbanbenhao
==
R485_ID4Dh
.
Sig
.
ESP322
)
&&
(
nowbanbenhaohoumian
==
R485_ID4Dh
.
Sig
.
ESP321
)
&&
(
nowbanbenhao
==
R485_ID4Dh
.
Sig
.
G0312
)
&&
(
nowbanbenhao
houmian
==
R485_ID4Dh
.
Sig
.
G0311
))
if
((
nowbanbenhao
==
R485_ID4Dh
.
Sig
.
ESP322
)
&&
(
nowbanbenhaohoumian
==
R485_ID4Dh
.
Sig
.
ESP321
)
&&
(
nowbanbenhao
G031
==
R485_ID4Dh
.
Sig
.
G0312
)
&&
(
nowbanbenhaoG031
houmian
==
R485_ID4Dh
.
Sig
.
G0311
))
{
TFT_LCD_Draw_Bmp
(
200
,
90
+
25
+
25
+
30
+
25
+
30
+
30
,
(
uint8_t
*
)
gImage_dui
);
//软件版本号对比 对
firstpowerflag
=
2
;
...
...
@@ -3826,7 +3836,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(210, 160, ( uint8_t * )gImage_Alarm_13_ImageX222_Y166); //%
TFT_LCD_Draw_Bmp
(
3
,
290
,
(
uint8_t
*
)
gImage_gImage_checkVX6_Y165
);
//检测台版本号
uint8_t
mbuff
[
7
]
=
{
2
,
5
,
1
,
2
,
1
,
9
,
0xff
};
uint8_t
mbuff
[
7
]
=
{
2
,
5
,
1
,
2
,
2
,
9
,
0xff
};
General_Number_Disp
(
mbuff
,
160
,
290
);
}
...
...
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