this is using the mbed os version 5-13-1
Diff: source/BleManager.cpp
- Branch:
- PassingRegression
- Revision:
- 116:2296cf274661
- Parent:
- 113:888e262ff0a9
- Child:
- 118:8df0e9c2ee3f
--- a/source/BleManager.cpp Sun May 19 11:25:28 2019 +0000
+++ b/source/BleManager.cpp Sun May 19 13:09:27 2019 +0000
@@ -61,7 +61,7 @@
* your application is interested in.
*/
SMDevice::SMDevice(BLE &ble, events::EventQueue &event_queue,
- BLEProtocol::AddressBytes_t &peer_address, ble_config_t ble_config) :
+ BLEProtocol::AddressBytes_t &peer_address, ble_config_t *ble_config) :
_ble(ble),
_event_queue(event_queue),
_peer_address(peer_address),
@@ -202,7 +202,7 @@
true,
false,
SecurityManager::IO_CAPS_DISPLAY_ONLY, // SecurityManager::IO_CAPS_NONE
- ble_config.pairingKey,
+ ble_config->pairingKey,
false,
db_path
);
@@ -384,7 +384,7 @@
/** A peripheral device will advertise, accept the connection and request
* a change in link security. */
-SMDevicePeripheral::SMDevicePeripheral(BLE &ble, events::EventQueue &event_queue, BLEProtocol::AddressBytes_t &peer_address, ble_config_t ble_config)
+SMDevicePeripheral::SMDevicePeripheral(BLE &ble, events::EventQueue &event_queue, BLEProtocol::AddressBytes_t &peer_address, ble_config_t *ble_config)
: SMDevice(ble, event_queue, peer_address, ble_config) { }
void SMDevicePeripheral::start()
@@ -401,8 +401,8 @@
/* add device name */
advertising_data.addData(
GapAdvertisingData::COMPLETE_LOCAL_NAME,
- (const uint8_t *)ble_config.deviceName,
- strlen(ble_config.deviceName)
+ (const uint8_t *)ble_config->deviceName,
+ strlen(ble_config->deviceName)
);
/* Setup primary service */
uart = new UARTService(_ble);
@@ -435,8 +435,8 @@
* increases the chances of being seen at the cost of more power */
//_ble.gap().setAdvertisingInterval(20);
//_ble.gap().setAdvertisingTimeout(0);
- _ble.gap().setAdvertisingInterval(ble_config.advInterval); /* setting in ble_config */
- _ble.gap().setAdvertisingTimeout(ble_config.advTimeout); /* setting in ble_config */
+ _ble.gap().setAdvertisingInterval(ble_config->advInterval); /* setting in ble_config */
+ _ble.gap().setAdvertisingTimeout(ble_config->advTimeout); /* setting in ble_config */
error = _ble.gap().startAdvertising(ble::LEGACY_ADVERTISING_HANDLE);
@@ -520,7 +520,7 @@
/** A central device will scan, connect to a peer and request pairing. */
-SMDeviceCentral::SMDeviceCentral(BLE &ble, events::EventQueue &event_queue, BLEProtocol::AddressBytes_t &peer_address, ble_config_t ble_config)
+SMDeviceCentral::SMDeviceCentral(BLE &ble, events::EventQueue &event_queue, BLEProtocol::AddressBytes_t &peer_address, ble_config_t *ble_config)
: SMDevice(ble, event_queue, peer_address, ble_config) { };
void SMDeviceCentral::start()