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
4a60b863
Commit
4a60b863
authored
Aug 27, 2025
by
何锐
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
✨
feat:l连接蓝牙时显示蓝牙名
parent
3e74870b
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
17 additions
and
10 deletions
+17
-10
Check_Ctrl.c
YueJin_test_bench/source/Appliciation/Check_Ctrl.c
+11
-4
Display_Info.c
YueJin_test_bench/source/Appliciation/Display_Info.c
+1
-1
Key_user.c
YueJin_test_bench/source/Appliciation/Key_user.c
+2
-2
R485_Communication_Matrix.c
...est_bench/source/Appliciation/R485_Communication_Matrix.c
+2
-2
R485_Communication_Matrix.h
...est_bench/source/Appliciation/R485_Communication_Matrix.h
+1
-1
No files found.
YueJin_test_bench/source/Appliciation/Check_Ctrl.c
View file @
4a60b863
...
...
@@ -309,12 +309,19 @@ uint8_t yibiaoshuju[34];
break
;
case
3
:
blename
[
4
]
=
0xFF
;
// if(recvflag111 == 1)
// blename[4] = 0xFF;
// // if(recvflag111 == 1)
// // {
// if((blename[0]+blename[1]+blename[2]+blename[3]) != 0)
// {
if
((
blename
[
0
]
+
blename
[
1
]
+
blename
[
2
]
+
blename
[
3
])
!=
0
)
// General_Number_Disp(blename, 3, 165);
// }
blename
[
4
]
=
0xFF
;
GUI_Display_Version_Code_Service
(
3
,
150
,
"BT Name is "
,
Letter_Num_11
,
PCodeText_Space_size
);
if
(((
blename
[
0
]
+
blename
[
1
]
+
blename
[
2
]
+
blename
[
3
])
!=
0
)
&&
(
blename
[
0
]
!=
0xFF
)
&&
(
blename
[
1
]
!=
0xFF
)
&&
(
blename
[
2
]
!=
0xFF
)
&&
(
blename
[
3
]
!=
0xFF
))
{
General_Number_Disp
(
blename
,
3
,
165
);
General_Number_Disp
(
blename
,
110
,
154
);
}
// recvflag111 = 0;
// }
...
...
YueJin_test_bench/source/Appliciation/Display_Info.c
View file @
4a60b863
...
...
@@ -2882,7 +2882,7 @@ void Display_Sub(void)
}
uint32_t
Get_Display_Type
(
void
)
{
if
(
connectbleFlag
==
1
)
if
(
BlueTooth
==
1
)
{
return
3
;
}
...
...
YueJin_test_bench/source/Appliciation/Key_user.c
View file @
4a60b863
...
...
@@ -202,7 +202,7 @@ void Key_Operation_SW3(Key_Event_en_t enKeyEvent)
Confirmkeycount
++
;
if
(
Confirmkeycount
>=
5
)
{
fsijnifvs
=
1
;
mimayanzhengjieguo
=
1
;
Confirmkeycount
=
0
;
MENU_CHECK_STEP_ADD
();
}
...
...
@@ -210,7 +210,7 @@ void Key_Operation_SW3(Key_Event_en_t enKeyEvent)
else
{
Confirmkeycount
==
0
;
fsijnifvs
=
0
;
mimayanzhengjieguo
=
0
;
}
}
else
if
(
enKeyEvent
==
KEY_EVENT_LONG_PRESS
)
...
...
YueJin_test_bench/source/Appliciation/R485_Communication_Matrix.c
View file @
4a60b863
...
...
@@ -381,7 +381,7 @@ uint32_t R485_Send_0xD2(void)
return
u32sendendflag
;
}
uint8_t
fsijnifvs
=
0
;
uint8_t
mimayanzhengjieguo
=
0
;
uint32_t
R485_Send_0xD3
(
void
)
{
memset
(
R485_IDD3h
.
Msg
,
0xFF
,
26
);
...
...
@@ -434,7 +434,7 @@ uint32_t R485_Send_0xD3(void)
R485_IDD3h
.
Sig
.
PasswordUnlockCommand
=
0x01
;
//密码开机
R485_IDD3h
.
Sig
.
PasswordCanbeEnter
=
0x02
;
//开机次数
if
(
fsijnifvs
==
1
)
if
(
mimayanzhengjieguo
==
1
)
{
R485_IDD3h
.
Sig
.
PasswordAuthResult
=
0x00
;
//密码认证结果
}
...
...
YueJin_test_bench/source/Appliciation/R485_Communication_Matrix.h
View file @
4a60b863
...
...
@@ -1881,5 +1881,5 @@ extern uint8_t name1;
extern
uint8_t
name2
;
extern
uint8_t
R485_0x80_msg
[
64
];
extern
uint8_t
fsijnifvs
;
extern
uint8_t
mimayanzhengjieguo
;
#endif
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