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

Merge pull request #6151 from pan-/fix-generic-gap-connect 

BLE: Fix generic gap connect
pull/6119/merge
Cruz Monrreal 2018-02-26 14:39:25 -06:00 committed by GitHub
parent daf29dc9f2 e91570e4ba
commit a93342f70b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
features/FEATURE_BLE/source/generic/GenericGap.cpp
View File

@ -44,6 +44,14 @@ static const uint16_t advertising_interval_max = 0x4000;
static const uint16_t supervision_timeout_min = 0x000A; static const uint16_t supervision_timeout_min = 0x000A;
static const uint16_t supervision_timeout_max = 0x0C80; static const uint16_t supervision_timeout_max = 0x0C80;
static const Gap::ConnectionParams_t default_connection_params = {
/* min conn interval */ 50,
/* max conn interval */ 100,
/* slave latency */ 0,
/* supervision timeout */ 600
};
static const GapScanningParams default_scan_params;
/* /*
* Return true if value is included in the range [lower_bound : higher_bound] * Return true if value is included in the range [lower_bound : higher_bound]
@ -491,6 +499,14 @@ ble_error_t GenericGap::connect(
const ConnectionParams_t* connectionParams, const ConnectionParams_t* connectionParams,
const GapScanningParams* scanParams const GapScanningParams* scanParams
) { ) {
if (connectionParams == NULL) {
connectionParams = &default_connection_params;
}
if (scanParams == NULL) {
scanParams = &default_scan_params;
}
if (is_scan_params_valid(scanParams) == false) { if (is_scan_params_valid(scanParams) == false) {
return BLE_ERROR_PARAM_OUT_OF_RANGE; return BLE_ERROR_PARAM_OUT_OF_RANGE;
} }
@ -501,6 +517,9 @@ ble_error_t GenericGap::connect(
// TODO fix upper layer API, address type factorization is incorrect. // TODO fix upper layer API, address type factorization is incorrect.
// Force scan stop before initiating the scan used for connection
stopScan();
return _pal_gap.create_connection( return _pal_gap.create_connection(
scanParams->getInterval(), scanParams->getInterval(),
scanParams->getWindow(), scanParams->getWindow(),