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
f39181a0
Commit
f39181a0
authored
Jan 19, 2026
by
何锐
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
✨
feat:去掉版本号校验
parent
7ba02730
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
6 deletions
+6
-6
Check_Ctrl.c
YueJin_test_bench/source/Appliciation/Check_Ctrl.c
+3
-3
Display_Info.c
YueJin_test_bench/source/Appliciation/Display_Info.c
+2
-2
Key_user.c
YueJin_test_bench/source/Appliciation/Key_user.c
+1
-1
No files found.
YueJin_test_bench/source/Appliciation/Check_Ctrl.c
View file @
f39181a0
...
...
@@ -71,8 +71,8 @@ void Function_Check_Ctrl(uint32_t cmd);
void
MENU_CHECK_STEP_ADD
(
void
)
{
if
(
jiaoyan
==
1
)
{
//
if(jiaoyan == 1)
//
{
MENU_CHECK_STEP
++
;
if
(
MENU_CHECK_STEP
>
14
)
...
...
@@ -87,7 +87,7 @@ void MENU_CHECK_STEP_ADD(void)
{
MENU_CHECK_STEP
=
1
;
}
}
//
}
}
void
MENU_CHECK_STEP_SUB
(
void
)
...
...
YueJin_test_bench/source/Appliciation/Display_Info.c
View file @
f39181a0
...
...
@@ -4890,6 +4890,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((puranhoumian + houmian7926 + houmian7106) != 0)
{
jiaoyan = 2;
if((puranhoumian == nowpuran) && (houmian7926 == now7926) && (houmian7106 == now7106) && \
((R485_IDB4h.Sig.PY32F072_APP_PV == 1) && (R485_IDB4h.Sig.JL7926_APP_PV == 1) && (R485_IDB4h.Sig.JL7106_APP_PV == 1)))
{
...
...
@@ -4899,7 +4900,6 @@ void Display_Version_Info(uint32_t ON_OFF)
else
{
TFT_LCD_Draw_Bmp(200, 90+25+25+30+25+30+30, ( uint8_t * )gImage_cuo ); //软件版本号对比 错
jiaoyan = 0;
//正在调试取消版本号对比 想要取消版本号对比将上方注释掉并解开下方注释即可
// TFT_LCD_Draw_Bmp(200, 90+25+25+30+25+30+30, ( uint8_t * )gImage_dui ); //软件版本号对比 对
// firstpowerflag = 2;
...
...
@@ -4925,7 +4925,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,6,0,1,1,
6
,0xff};
uint8_t mbuff [7] = {2,6,0,1,1,
5
,0xff};
General_Number_Disp(mbuff, 160, 290);
}
...
...
YueJin_test_bench/source/Appliciation/Key_user.c
View file @
f39181a0
...
...
@@ -407,7 +407,7 @@ void EnterVersionNumber(void)
if
(
enterdelaytime
<=
600
)
//等待开机动画
{
if
(
jiaoyan
==
1
)
if
(
(
jiaoyan
==
1
)
||
(
jiaoyan
==
2
)
)
{
if
(
entermenutime
<=
200
)
{
...
...
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