ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

BLE NRF51: Defer connection to a common function. 

The soft device is not consistent as it is required to force the connection to a resolved resolvable address so it should be known if the  target is an identity address.
pull/6932/head
Vincent Coubard 2018-05-22 17:37:57 +01:00
parent d427fcfb59
commit 755cf5fa5f
2 changed files with 24 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF51/source/nRF5xGap.cpp
View File

@ -458,7 +458,11 @@ ble_error_t nRF5xGap::connect(
return BLE_ERROR_INVALID_PARAM;
}
return connect(peerAddr, legacy_address, connectionParams, scanParamsIn);
bool identity =
peerAddrType == peer_address_type_t::PUBLIC_IDENTITY ||
peerAddrType == peer_address_type_t::RANDOM_STATIC_IDENTITY;
return connect(peerAddr, legacy_address, connectionParams, scanParamsIn, identity);
}
ble_error_t nRF5xGap::connect(
@ -466,6 +470,18 @@ ble_error_t nRF5xGap::connect(
LegacyAddressType_t peerAddrType,
const ConnectionParams_t *connectionParams,
const GapScanningParams *scanParamsIn
) {
return connect(peerAddr, peerAddrType, connectionParams, scanParamsIn, /* identity */ false);
}
ble_error_t nRF5xGap::connect(
const Address_t peerAddr,
LegacyAddressType_t peerAddrType,
const ConnectionParams_t *connectionParams,
const GapScanningParams *scanParamsIn,
bool identity
) {
ble_gap_addr_t addr;
ble_gap_addr_t* addr_ptr = &addr;
@ -485,7 +501,7 @@ ble_error_t nRF5xGap::connect(
connParams.conn_sup_timeout = 600;
}
ble_gap_scan_params_t scanParams ={0};
ble_gap_scan_params_t scanParams = { 0 };
#if (NRF_SD_BLE_API_VERSION <= 2)
/* Allocate the stack's whitelist statically */
@ -513,6 +529,11 @@ ble_error_t nRF5xGap::connect(
whitelistIrkPtrs[i] = (ble_gap_irk_t*) entries[i].peer_irk.data();
}
whitelist.irk_count = limit;
if (identity) {
scanParams.selective = true;
addr_ptr = NULL;
}
}
set_private_resolvable_address();

1
features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF51/source/nRF5xGap.h
View File

@ -80,6 +80,7 @@ public:
virtual ble_error_t stopAdvertising(void);
virtual ble_error_t connect(const Address_t, ble::peer_address_type_t peerAddrType, const ConnectionParams_t *connectionParams, const GapScanningParams *scanParams);
virtual ble_error_t connect(const Address_t, BLEProtocol::AddressType_t peerAddrType, const ConnectionParams_t *connectionParams, const GapScanningParams *scanParams);
ble_error_t connect(const Address_t, BLEProtocol::AddressType_t peerAddrType, const ConnectionParams_t *connectionParams, const GapScanningParams *scanParams, bool identity);
virtual ble_error_t disconnect(Handle_t connectionHandle, DisconnectionReason_t reason);
virtual ble_error_t disconnect(DisconnectionReason_t reason);