Skip to content
Snippets Groups Projects
Commit 839c1344 authored by rahix's avatar rahix
Browse files

Merge 'BLE misc fixes'

See merge request card10/firmware!367
parents 448ec494 f7bba75c
No related branches found
No related tags found
No related merge requests found
...@@ -122,11 +122,9 @@ static const smpCfg_t bleSmpCfg = ...@@ -122,11 +122,9 @@ static const smpCfg_t bleSmpCfg =
16, /*! Maximum encryption key length */ 16, /*! Maximum encryption key length */
3, /*! Attempts to trigger 'repeated attempts' timeout */ 3, /*! Attempts to trigger 'repeated attempts' timeout */
DM_AUTH_MITM_FLAG, /*! Device authentication requirements */ DM_AUTH_MITM_FLAG, /*! Device authentication requirements */
64000, /*! Maximum 'Repeated attempts' timeout in msec */
/* TODO: The following three parameters should probably get proper values */ 64000, /*! Time msec before attemptExp decreases */
0, /*! Maximum 'Repeated attempts' timeout in msec */ 2, /*! Exponent to raise attemptTimeout on maxAttempts */
0, /*! Time msec before attemptExp decreases */
0, /*! Exponent to raise attemptTimeout on maxAttempts */
}; };
/* Configuration structure */ /* Configuration structure */
...@@ -415,9 +413,9 @@ static void bleProcMsg(bleMsg_t *pMsg) ...@@ -415,9 +413,9 @@ static void bleProcMsg(bleMsg_t *pMsg)
case DM_CONN_OPEN_IND: case DM_CONN_OPEN_IND:
connOpen = &pMsg->dm.connOpen; connOpen = &pMsg->dm.connOpen;
LOG_INFO("ble", "connection from %02X:%02X:%02X:%02X:%02X:%02X opened", LOG_INFO("ble", "connection from %02X:%02X:%02X:%02X:%02X:%02X opened",
connOpen->peerAddr[0], connOpen->peerAddr[1], connOpen->peerAddr[5], connOpen->peerAddr[4],
connOpen->peerAddr[2], connOpen->peerAddr[3], connOpen->peerAddr[3], connOpen->peerAddr[2],
connOpen->peerAddr[4], connOpen->peerAddr[5]); connOpen->peerAddr[1], connOpen->peerAddr[0]);
BasProcMsg(&pMsg->hdr); BasProcMsg(&pMsg->hdr);
uiEvent = APP_UI_CONN_OPEN; uiEvent = APP_UI_CONN_OPEN;
break; break;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment