Diff: source/BleManager.cpp

Revision:

78:07bb86e3ce14

Parent:

77:0b505d1e15f4

Child:

79:a2187bbfa407

--- a/source/BleManager.cpp	Fri Mar 15 23:25:30 2019 +0000
+++ b/source/BleManager.cpp	Sat Mar 16 13:05:52 2019 +0000
@@ -58,11 +58,13 @@
  *  back to the applications. You can provide overrides for a selection of events
  *  your application is interested in.
  */
-SMDevice::SMDevice(BLE &ble, events::EventQueue &event_queue, BLEProtocol::AddressBytes_t &peer_address) :
+SMDevice::SMDevice(BLE &ble, events::EventQueue &event_queue, 
+                   BLEProtocol::AddressBytes_t &peer_address, ble_config_t ble_config) :
         _led1(LED1, 0),
         _ble(ble),
         _event_queue(event_queue),
         _peer_address(peer_address),
+        ble_config(ble_config),
         _handle(0),
         _is_connecting(false) { }
 
@@ -360,8 +362,8 @@
 
 /** 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)
-        : SMDevice(ble, event_queue, peer_address) { }
+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()
 {
@@ -411,8 +413,8 @@
      * increases the chances of being seen at the cost of more power */
     //_ble.gap().setAdvertisingInterval(20);
     //_ble.gap().setAdvertisingTimeout(0);
-    _ble.gap().setAdvertisingInterval(1000); /* 1000ms. */
-    _ble.gap().setAdvertisingTimeout(300); /* 16 * 1000ms. */
+    _ble.gap().setAdvertisingInterval(ble_config.advInterval); /* setting in ble_config */
+    _ble.gap().setAdvertisingTimeout(ble_config.advTimeout);   /* setting in ble_config */
 
     error = _ble.gap().startAdvertising();
 
@@ -495,8 +497,8 @@
 
 /** 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)
-    : SMDevice(ble, event_queue, peer_address) { };
+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()
 {