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

type translation

pull/8738/head
paul-szczepanek-arm 2018-11-08 17:29:54 +00:00 committed by Vincent Coubard
parent 8794c0b43b
commit 78a4bdda8a
3 changed files with 23 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
features/FEATURE_BLE/ble/GapAdvertisingParams.h
View File

@ -440,7 +440,7 @@ class GapExtendedAdvertisingParams {
return _notifyOnScan; return _notifyOnScan;
} }
/**/ /* helper get functions */
uint32_t getMinPrimaryInterval() const { uint32_t getMinPrimaryInterval() const {
return _minInterval; return _minInterval;
@ -450,22 +450,34 @@ class GapExtendedAdvertisingParams {
return _maxInterval; return _maxInterval;
} }
BLEProtocol::AddressBytes_t* getPeerAddress() { BLEProtocol::AddressBytes_t* getPeerAddress() const {
return &_peerAddress; return &_peerAddress;
}; };
ble::peer_address_type_t getPeerAddressType() { ble::peer_address_type_t getPeerAddressType() const {
return _peerAddressType; return _peerAddressType;
}; };
ble::phy_t getPrimaryPhy() { ble::phy_t getPrimaryPhy() const {
return _primaryPhy; return _primaryPhy;
} }
ble::phy_t getSecondaryPhy() { ble::phy_t getSecondaryPhy() const {
return _secondaryPhy; return _secondaryPhy;
} }
bool getChannel37() const {
return _channel37;
}
bool getChannel38() const {
return _channel37;
}
bool getChannel39() const {
return _channel37;
}
private: private:
ble::advertising_type_t _advType; ble::advertising_type_t _advType;
uint32_t _minInterval; uint32_t _minInterval;

3
features/FEATURE_BLE/ble/pal/GapTypes.h
View File

@ -211,6 +211,9 @@ struct advertising_channel_map_t : SafeEnum<advertising_channel_map_t, uint8_t>
*/ */
advertising_channel_map_t(type value) : advertising_channel_map_t(type value) :
SafeEnum<advertising_channel_map_t, uint8_t>(value) { } SafeEnum<advertising_channel_map_t, uint8_t>(value) { }
advertising_channel_map_t(bool ch37, bool ch38, bool ch39) {
SafeEnum<advertising_channel_map_t, uint8_t>(ch37 | (ch38 << 1) | (ch39 << 2)) { }
}; };

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

@ -1619,11 +1619,10 @@ ble_error_t GenericGap::setAdvertisingParams(AdvHandle_t handle, const GapAdvert
return BLE_ERROR_NONE; return BLE_ERROR_NONE;
} }
pal::advertising_event_properties_t event_properties;//TODO pal::advertising_event_properties_t event_properties;
ble::advertising_type_t adv_type = params->getAdvertisingType();
AddressUseType_t use_type; AddressUseType_t use_type;
switch(adv_type) { switch(params->getAdvertisingType()) {
case ADV_SCANNABLE_UNDIRECTED: case ADV_SCANNABLE_UNDIRECTED:
case ADV_NON_CONNECTABLE_UNDIRECTED: case ADV_NON_CONNECTABLE_UNDIRECTED:
case EXT_ADV_NON_CONNECTABLE_DIRECTED: case EXT_ADV_NON_CONNECTABLE_DIRECTED:
@ -1658,7 +1657,7 @@ ble_error_t GenericGap::setAdvertisingParams(AdvHandle_t handle, const GapExtend
return BLE_ERROR_INVALID_PARAM; return BLE_ERROR_INVALID_PARAM;
} }
pal::advertising_channel_map_t channel_map; /*TODO translate*/ pal::advertising_channel_map_t channel_map(params->getChannel37(), params->getChannel38(), params->getChannel39());
pal::advertising_event_properties_t event_properties;//TODO pal::advertising_event_properties_t event_properties;//TODO
//params->getAdvertisingType() //params->getAdvertisingType()