Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Q
QJ_500-7c
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
时昊
QJ_500-7c
Commits
50b6561d
Commit
50b6561d
authored
May 03, 2024
by
薛晓虎
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: 取消串口id 0x03长度判断;添加经典蓝牙连接状态外发
parent
2a7a6009
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
4 deletions
+5
-4
Protocol_User.c
qianjiang/main/Protocol_User.c
+4
-3
main_user.c
qianjiang/main/main_user.c
+1
-1
No files found.
qianjiang/main/Protocol_User.c
View file @
50b6561d
...
...
@@ -230,7 +230,7 @@ static void Protocol_UartHandle(const Protocol_Data_t *pData)
if
(
Prot_User
.
State
>=
Prot_Start
)
{
if
(
pData
->
DataLen
==
33
)
//
if(pData->DataLen == 33)
{
if
(
BT_User
.
HF_Ctrl
!=
pData
->
Data
[
0
])
{
...
...
@@ -314,8 +314,9 @@ void Uart_Send_Id10_Pro(void )
void
Uart_Send_Id12_Pro
(
void
)
{
uint8_t
ID12
[
1
];
ID12
[
0
]
=
Ble_User
.
Ble_Sts
;
uint8_t
ID12
[
1
]
=
{
0
};
ID12
[
0
]
|=
(
uint8_t
)(
BT_User
.
BT_Sts
<<
4
);
ID12
[
0
]
|=
Ble_User
.
Ble_Sts
;
Protocol_Send
(
0x12
,
ID12
,
1
);
}
...
...
qianjiang/main/main_user.c
View file @
50b6561d
...
...
@@ -79,7 +79,7 @@ static void Sys_Run_Tasks(void *arg)
{
testcnt
=
0
;
printf
(
"BT_User.BT_Sts = %d
\r\n
"
,
BT_User
.
BT_Sts
);
//
printf("BT_User.BT_Sts = %d\r\n", BT_User.BT_Sts);
// printf("Ble_User.Navi_Updat = %d\r\n", Ble_User.Navi_Updat);
...
...
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