Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
F
firmware
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
External wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Monitor
Service Desk
Analyze
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
card10
firmware
Commits
839c1344
Commit
839c1344
authored
5 years ago
by
rahix
Browse files
Options
Downloads
Plain Diff
Merge 'BLE misc fixes'
See merge request
!367
parents
448ec494
f7bba75c
Branches
Branches containing commit
Tags
Tags containing commit
1 merge request
!367
Ble misc fixes
Pipeline
#4437
passed
5 years ago
Stage: build
Stage: deploy
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
epicardium/ble/ble_main.c
+6
-8
6 additions, 8 deletions
epicardium/ble/ble_main.c
with
6 additions
and
8 deletions
epicardium/ble/ble_main.c
+
6
−
8
View file @
839c1344
...
...
@@ -122,11 +122,9 @@ static const smpCfg_t bleSmpCfg =
16
,
/*! Maximum encryption key length */
3
,
/*! Attempts to trigger 'repeated attempts' timeout */
DM_AUTH_MITM_FLAG
,
/*! Device authentication requirements */
/* TODO: The following three parameters should probably get proper values */
0
,
/*! Maximum 'Repeated attempts' timeout in msec */
0
,
/*! Time msec before attemptExp decreases */
0
,
/*! Exponent to raise attemptTimeout on maxAttempts */
64000
,
/*! Maximum 'Repeated attempts' timeout in msec */
64000
,
/*! Time msec before attemptExp decreases */
2
,
/*! Exponent to raise attemptTimeout on maxAttempts */
};
/* Configuration structure */
...
...
@@ -415,9 +413,9 @@ static void bleProcMsg(bleMsg_t *pMsg)
case
DM_CONN_OPEN_IND
:
connOpen
=
&
pMsg
->
dm
.
connOpen
;
LOG_INFO
(
"ble"
,
"connection from %02X:%02X:%02X:%02X:%02X:%02X opened"
,
connOpen
->
peerAddr
[
0
],
connOpen
->
peerAddr
[
1
],
connOpen
->
peerAddr
[
2
],
connOpen
->
peerAddr
[
3
],
connOpen
->
peerAddr
[
4
],
connOpen
->
peerAddr
[
5
]);
connOpen
->
peerAddr
[
5
],
connOpen
->
peerAddr
[
4
],
connOpen
->
peerAddr
[
3
],
connOpen
->
peerAddr
[
2
],
connOpen
->
peerAddr
[
1
],
connOpen
->
peerAddr
[
0
]);
BasProcMsg
(
&
pMsg
->
hdr
);
uiEvent
=
APP_UI_CONN_OPEN
;
break
;
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment