Wait for scan response before reporting discovered peripheral

sandeepmistry · yashaswini-hanji · commit da4a5e435698 · 2017-03-27T16:39:36.000-07:00
Only applies to connectable peripherals, non-connecatable
will be reported immediately becase a scan response does
not apply.
diff --git a/libraries/CurieBLE/src/internal/BLEDeviceManager.cpp b/libraries/CurieBLE/src/internal/BLEDeviceManager.cpp
@@ -81,7 +81,7 @@ BLEDeviceManager::BLEDeviceManager():
     memset(_peer_adv_data, 0, sizeof(_peer_adv_data));
     memset(_peer_adv_data_len, 0, sizeof(_peer_adv_data_len));
     memset(_peer_scan_rsp_data, 0, sizeof(_peer_scan_rsp_data));
-    memset(_peer_scan_rsp_data_len, 0, sizeof(_peer_scan_rsp_data_len));
+    memset(_peer_scan_rsp_data_len, -1, sizeof(_peer_scan_rsp_data_len));
     memset(_peer_adv_rssi, 0, sizeof(_peer_adv_rssi));
     
     memset(_peer_adv_connectable, 0, sizeof(_peer_adv_connectable));
@@ -1384,7 +1384,7 @@ BLEDevice BLEDeviceManager::available()
     {
         uint64_t timestamp_delta = timestamp - _peer_adv_mill[i];
         temp = &_peer_adv_buffer[i];
-        if ((timestamp_delta <= 2000) && (max_delta < timestamp_delta))
+        if ((timestamp_delta <= 2000) && (max_delta < timestamp_delta) && (_peer_scan_rsp_data_len[i] >= 0 || !_peer_adv_connectable[i]))
         {
             // Eable the duplicate filter
             if (_adv_duplicate_filter_enabled && 
@@ -1446,7 +1446,7 @@ bool BLEDeviceManager::setAdvertiseBuffer(const bt_addr_le_t* bt_addr,
             if (max_delta > 2000) // expired
             {
                 index = i;
-                _peer_scan_rsp_data_len[index] = 0; // Invalid the scan response
+                _peer_scan_rsp_data_len[index] = -1; // Invalid the scan response
             }
         }
         
diff --git a/libraries/CurieBLE/src/internal/BLEDeviceManager.h b/libraries/CurieBLE/src/internal/BLEDeviceManager.h
@@ -392,7 +392,7 @@ class BLEDeviceManager
     uint8_t    _peer_adv_data[BLE_MAX_ADV_BUFFER_CFG][BLE_MAX_ADV_SIZE];
     uint8_t    _peer_adv_data_len[BLE_MAX_ADV_BUFFER_CFG];
     uint8_t    _peer_scan_rsp_data[BLE_MAX_ADV_BUFFER_CFG][BLE_MAX_ADV_SIZE];
-    uint8_t    _peer_scan_rsp_data_len[BLE_MAX_ADV_BUFFER_CFG];
+    int8_t     _peer_scan_rsp_data_len[BLE_MAX_ADV_BUFFER_CFG];
     int8_t     _peer_adv_rssi[BLE_MAX_ADV_BUFFER_CFG];
     bool       _peer_adv_connectable[BLE_MAX_ADV_BUFFER_CFG];
     

Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,7 @@ BLEDeviceManager::BLEDeviceManager():`
`81`	`81`	`memset(_peer_adv_data, 0, sizeof(_peer_adv_data));`
`82`	`82`	`memset(_peer_adv_data_len, 0, sizeof(_peer_adv_data_len));`
`83`	`83`	`memset(_peer_scan_rsp_data, 0, sizeof(_peer_scan_rsp_data));`
`84`		`- memset(_peer_scan_rsp_data_len, 0, sizeof(_peer_scan_rsp_data_len));`
	`84`	`+ memset(_peer_scan_rsp_data_len, -1, sizeof(_peer_scan_rsp_data_len));`
`85`	`85`	`memset(_peer_adv_rssi, 0, sizeof(_peer_adv_rssi));`
`86`	`86`
`87`	`87`	`memset(_peer_adv_connectable, 0, sizeof(_peer_adv_connectable));`
`@@ -1384,7 +1384,7 @@ BLEDevice BLEDeviceManager::available()`
`1384`	`1384`	`{`
`1385`	`1385`	`uint64_t timestamp_delta = timestamp - _peer_adv_mill[i];`
`1386`	`1386`	`temp = &_peer_adv_buffer[i];`
`1387`		`- if ((timestamp_delta <= 2000) && (max_delta < timestamp_delta))`
	`1387`	`+ if ((timestamp_delta <= 2000) && (max_delta < timestamp_delta) && (_peer_scan_rsp_data_len[i] >= 0 \|\| !_peer_adv_connectable[i]))`
`1388`	`1388`	`{`
`1389`	`1389`	`// Eable the duplicate filter`
`1390`	`1390`	`if (_adv_duplicate_filter_enabled &&`
`@@ -1446,7 +1446,7 @@ bool BLEDeviceManager::setAdvertiseBuffer(const bt_addr_le_t* bt_addr,`
`1446`	`1446`	`if (max_delta > 2000) // expired`
`1447`	`1447`	`{`
`1448`	`1448`	`index = i;`
`1449`		`- _peer_scan_rsp_data_len[index] = 0; // Invalid the scan response`
	`1449`	`+ _peer_scan_rsp_data_len[index] = -1; // Invalid the scan response`
`1450`	`1450`	`}`
`1451`	`1451`	`}`
`1452`	`1452`