Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
card10
firmware
Commits
839c1344
Commit
839c1344
authored
Jan 02, 2020
by
Rahix
Browse files
Merge 'BLE misc fixes'
See merge request
card10/firmware!367
parents
448ec494
f7bba75c
Pipeline
#4437
passed with stages
in 2 minutes and 5 seconds
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
epicardium/ble/ble_main.c
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
;
...
...
Write
Preview
Supports
Markdown
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