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
96c4c0e8
Commit
96c4c0e8
authored
Sep 08, 2025
by
何锐
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
✨
feat:随时扫码写入校验版本
parent
4d749bfa
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
30 additions
and
23 deletions
+30
-23
Barcode_Scanner.c
YueJin_test_bench/source/Appliciation/Barcode_Scanner.c
+2
-0
Barcode_Scanner.h
YueJin_test_bench/source/Appliciation/Barcode_Scanner.h
+1
-0
Check_Ctrl.c
YueJin_test_bench/source/Appliciation/Check_Ctrl.c
+11
-9
Key_user.c
YueJin_test_bench/source/Appliciation/Key_user.c
+12
-11
init.c
YueJin_test_bench/source/System/init.c
+4
-3
No files found.
YueJin_test_bench/source/Appliciation/Barcode_Scanner.c
View file @
96c4c0e8
...
@@ -362,6 +362,7 @@ void datacheck(void)
...
@@ -362,6 +362,7 @@ void datacheck(void)
}
}
}
}
uint8_t
cmpresult
=
3
;
uint8_t
cmpresult
=
3
;
uint8_t
copyover
;
void
BarCodeDataGet
(
void
)
void
BarCodeDataGet
(
void
)
{
{
...
@@ -369,6 +370,7 @@ void BarCodeDataGet(void)
...
@@ -369,6 +370,7 @@ void BarCodeDataGet(void)
{
{
memcpy
(
barcode_Msg
,
&
mDataBufPtr1
[
6
],
34
);
memcpy
(
barcode_Msg
,
&
mDataBufPtr1
[
6
],
34
);
memcpy
(
barcode_Msg1
,
&
mDataBufPtr1
[
6
],
34
);
memcpy
(
barcode_Msg1
,
&
mDataBufPtr1
[
6
],
34
);
copyover
=
1
;
}
}
else
else
{
{
...
...
YueJin_test_bench/source/Appliciation/Barcode_Scanner.h
View file @
96c4c0e8
...
@@ -41,4 +41,5 @@ extern uint8_t btmac[6];
...
@@ -41,4 +41,5 @@ extern uint8_t btmac[6];
extern
uint8_t
writeflag
;
extern
uint8_t
writeflag
;
extern
uint8_t
saomafinish
;
extern
uint8_t
saomafinish
;
extern
uint8_t
mimaread
[
35
];
extern
uint8_t
mimaread
[
35
];
extern
uint8_t
copyover
;
#endif
#endif
\ No newline at end of file
YueJin_test_bench/source/Appliciation/Check_Ctrl.c
View file @
96c4c0e8
...
@@ -245,20 +245,22 @@ uint8_t yibiaoshuju[34];
...
@@ -245,20 +245,22 @@ uint8_t yibiaoshuju[34];
case
0
:
case
0
:
if
(
saomafinish
==
0
)
if
(
saomafinish
==
0
)
{
{
for
(
int
i
=
0
;
i
<
34
;
i
++
)
if
(
copyover
)
{
{
if
(
barcode_Msg
[
i
]
!=
erweima
[
i
]
)
for
(
int
i
=
0
;
i
<
34
;
i
++
)
{
{
Display_TFT_Clear
();
if
(
barcode_Msg
[
i
]
!=
erweima
[
i
])
break
;
{
Display_TFT_Clear
();
break
;
}
}
}
}
memcpy
(
erweima
,
barcode_Msg
,
34
);
memcpy
(
erweima
,
barcode_Msg
,
34
);
erweima
[
34
]
=
0xFF
;
erweima
[
34
]
=
0xFF
;
General_Number_Disp
(
erweima
,
3
,
60
);
General_Number_Disp
(
erweima
,
3
,
60
);
}
if
(
writeflag
==
1
||
writeflag
==
3
)
if
(
writeflag
==
1
||
writeflag
==
3
)
{
{
...
...
YueJin_test_bench/source/Appliciation/Key_user.c
View file @
96c4c0e8
...
@@ -17,11 +17,6 @@ void Key_Operation_SW5(Key_Event_en_t enKeyEvent) //下一步
...
@@ -17,11 +17,6 @@ void Key_Operation_SW5(Key_Event_en_t enKeyEvent) //下一步
{
{
zhenduansendStep
=
0
;
zhenduansendStep
=
0
;
zhenduanflag
=
0
;
zhenduanflag
=
0
;
MENU_CHECK_STEP
=
0
;
saomafinish
=
4
;
}
else
if
(
saomafinish
==
4
)
{
MENU_CHECK_STEP_ADD
();
MENU_CHECK_STEP_ADD
();
}
}
}
}
...
@@ -83,14 +78,10 @@ void Key_Operation_SW7(Key_Event_en_t enKeyEvent)
...
@@ -83,14 +78,10 @@ void Key_Operation_SW7(Key_Event_en_t enKeyEvent)
// upkeyflag = 1; //按键加
// upkeyflag = 1; //按键加
if
(
firstpowerflag
==
2
)
if
(
firstpowerflag
==
2
)
{
{
// if(zhenduanflag == 1)
if
(
saomafinish
==
1
)
// {
if
(
saomafinish
==
0
)
{
{
zhenduansendStep
=
5
;
zhenduansendStep
=
5
;
zhenduanflag
=
1
;
}
}
// }
}
}
}
}
else
if
(
enKeyEvent
==
KEY_EVENT_LONG_PRESS
)
else
if
(
enKeyEvent
==
KEY_EVENT_LONG_PRESS
)
...
@@ -107,7 +98,17 @@ void Key_Operation_SW8(Key_Event_en_t enKeyEvent)
...
@@ -107,7 +98,17 @@ void Key_Operation_SW8(Key_Event_en_t enKeyEvent)
{
{
if
(
enKeyEvent
==
KEY_EVENT_SHORT_PRESS
)
if
(
enKeyEvent
==
KEY_EVENT_SHORT_PRESS
)
{
{
// zhenduanflag = 1;
if
(
saomafinish
==
3
)
{
Display_TFT_Clear
();
GUI_Display_Version_Code_Service
(
25
,
20
,
"Please Scan The Code "
,
Letter_Num_11
,
PCodeText_Space_size
);
firstpowerflag
=
0
;
saomafinish
=
0
;
}
else
if
(
saomafinish
==
0
)
{
zhenduanflag
=
1
;
}
}
}
else
if
(
enKeyEvent
==
KEY_EVENT_LONG_PRESS
)
else
if
(
enKeyEvent
==
KEY_EVENT_LONG_PRESS
)
{
{
...
...
YueJin_test_bench/source/System/init.c
View file @
96c4c0e8
...
@@ -118,11 +118,12 @@ void Sys_Startup_Init(void)
...
@@ -118,11 +118,12 @@ void Sys_Startup_Init(void)
LINE_OUT_NEG_03
=
1
;
LINE_OUT_NEG_03
=
1
;
LINE_OUT_NEG_04
=
1
;
LINE_OUT_NEG_04
=
1
;
Display_TFT_Clear
();
//
Display_TFT_Clear();
GUI_Display_Version_Code_Service
(
25
,
20
,
"Please Scan The Code "
,
Letter_Num_11
,
PCodeText_Space_size
);
//
GUI_Display_Version_Code_Service(25, 20, "Please Scan The Code ", Letter_Num_11, PCodeText_Space_size);
/*上电扫码校验功能如果需要扫码校验注释掉firstpowerflag = 2,打开上面两行的注释即可*/
/*上电扫码校验功能如果需要扫码校验注释掉firstpowerflag = 2,打开上面两行的注释即可*/
// firstpowerflag = 2;
firstpowerflag
=
2
;
saomafinish
=
3
;
}
}
/***********************************************************************
/***********************************************************************
...
...
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