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

fix names

pull/8738/head
paul-szczepanek-arm 2018-11-11 21:25:52 +00:00 committed by Vincent Coubard
parent bd8b7fa87f
commit b98326150d
4 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
features/FEATURE_BLE/ble/Gap.h
View File

@ -1517,7 +1517,7 @@ public:
virtual ble_error_t connect( virtual ble_error_t connect(
TargetPeerAddressType_t peerAddressType, TargetPeerAddressType_t peerAddressType,
const BLEProtocol::AddressBytes_t &peerAddress, const BLEProtocol::AddressBytes_t &peerAddress,
const ExtendedConnectParameters_t &connectionParams const GapExtendedConnectParameters_t &connectionParams
) { ) {
(void)peerAddressType; (void)peerAddressType;
(void)peerAddress; (void)peerAddress;

20
features/FEATURE_BLE/ble/gap/ExtendedConnectParameters.h
View File

@ -24,10 +24,10 @@
* @{ * @{
*/ */
class ExtendedConnectParameters_t { class GapExtendedConnectParameters_t {
static const uint8_t MAX_PARAM_PHYS = 3; static const uint8_t MAX_PARAM_PHYS = 3;
public: public:
ExtendedConnectParameters_t() : GapExtendedConnectParameters_t() :
_filterPolicy(ble::SCAN_POLICY_FILTER_ALL_ADV), _filterPolicy(ble::SCAN_POLICY_FILTER_ALL_ADV),
_ownAddressType(ble::own_address_type_t::PUBLIC) _ownAddressType(ble::own_address_type_t::PUBLIC)
{ {
@ -46,7 +46,7 @@ public:
/* setters */ /* setters */
ExtendedConnectParameters_t& setScanParamteres( GapExtendedConnectParameters_t& setScanParameters(
uint32_t scanInterval_us, uint32_t scanInterval_us,
uint32_t scanWindow_us, uint32_t scanWindow_us,
ble::phy_t phy = ble::phy_t::LE_1M ble::phy_t phy = ble::phy_t::LE_1M
@ -59,7 +59,7 @@ public:
return *this; return *this;
} }
ExtendedConnectParameters_t& setConnectionParamteres( GapExtendedConnectParameters_t& setConnectionParameters(
uint16_t minConnectionInterval_ms, uint16_t minConnectionInterval_ms,
uint16_t maxConnectionInterval_ms, uint16_t maxConnectionInterval_ms,
uint16_t slaveLatency, uint16_t slaveLatency,
@ -80,7 +80,7 @@ public:
return *this; return *this;
} }
ExtendedConnectParameters_t& setScanParamteres( GapExtendedConnectParameters_t& setScanParamteres(
ble::own_address_type_t ownAddress ble::own_address_type_t ownAddress
) { ) {
_ownAddressType = ownAddress; _ownAddressType = ownAddress;
@ -88,7 +88,7 @@ public:
return *this; return *this;
} }
ExtendedConnectParameters_t& setScanParamteres( GapExtendedConnectParameters_t& setScanParamteres(
ble::scanning_policy_mode_t filterPolicy ble::scanning_policy_mode_t filterPolicy
) { ) {
_filterPolicy = filterPolicy; _filterPolicy = filterPolicy;
@ -96,7 +96,7 @@ public:
return *this; return *this;
} }
ExtendedConnectParameters_t& togglePhy( GapExtendedConnectParameters_t& togglePhy(
bool phy1M, bool phy1M,
bool phy2M, bool phy2M,
bool phyCoded bool phyCoded
@ -108,7 +108,7 @@ public:
return *this; return *this;
} }
ExtendedConnectParameters_t& disablePhy( GapExtendedConnectParameters_t& disablePhy(
ble::phy_t phy = ble::phy_t::LE_1M ble::phy_t phy = ble::phy_t::LE_1M
) { ) {
handlePhyToggle(phy, false); handlePhyToggle(phy, false);
@ -116,7 +116,7 @@ public:
return *this; return *this;
} }
ExtendedConnectParameters_t& enablePhy( GapExtendedConnectParameters_t& enablePhy(
ble::phy_t phy = ble::phy_t::LE_1M ble::phy_t phy = ble::phy_t::LE_1M
) { ) {
handlePhyToggle(phy, true); handlePhyToggle(phy, true);
@ -134,7 +134,7 @@ public:
return _filterPolicy; return _filterPolicy;
} }
uint8_t getNumberOfEnabledPhys() { uint8_t getNumberOfEnabledPhys() const {
return (_enabledPhy[ble::phy_t::LE_1M] * 1 + return (_enabledPhy[ble::phy_t::LE_1M] * 1 +
_enabledPhy[ble::phy_t::LE_2M] * 1 + _enabledPhy[ble::phy_t::LE_2M] * 1 +
_enabledPhy[ble::phy_t::LE_CODED] * 1); _enabledPhy[ble::phy_t::LE_CODED] * 1);

2
features/FEATURE_BLE/ble/generic/GenericGap.h
View File

@ -237,7 +237,7 @@ public:
virtual ble_error_t connect( virtual ble_error_t connect(
ble::target_peer_address_type_t peerAddressType, ble::target_peer_address_type_t peerAddressType,
const BLEProtocol::AddressBytes_t &peerAddress, const BLEProtocol::AddressBytes_t &peerAddress,
const ExtendedConnectParameters_t &connectionParams const GapExtendedConnectParameters_t &connectionParams
); );
/** /**

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

@ -605,9 +605,11 @@ ble_error_t GenericGap::connect(
ble_error_t GenericGap::connect( ble_error_t GenericGap::connect(
ble::target_peer_address_type_t peerAddressType, ble::target_peer_address_type_t peerAddressType,
const BLEProtocol::AddressBytes_t &peerAddress, const BLEProtocol::AddressBytes_t &peerAddress,
const ExtendedConnectParameters_t &connectionParams const GapExtendedConnectParameters_t &connectionParams
) { ) {
if (!connectionParams.getNumberOfEnabledPhys()) {
return BLE_ERROR_INVALID_PARAM;
}
return _pal_gap.extended_create_connection( return _pal_gap.extended_create_connection(
(ble::pal::initiator_policy_t::type)connectionParams.getFilterPolicy(), (ble::pal::initiator_policy_t::type)connectionParams.getFilterPolicy(),
(ble::pal::own_address_type_t::type)connectionParams.getOwnAddressType().value(), (ble::pal::own_address_type_t::type)connectionParams.getOwnAddressType().value(),