ScStw/esp-nimble-cpp
2
0
Fork 0
mirror of https://github.com/h2zero/esp-nimble-cpp.git synced 2024-11-24 22:20:55 +01:00
Code Issues Projects Releases Packages Wiki Activity

[BREAKING] - Refactor NimBLEScan

Browse source 
* General code cleanup
* `NimBLEScan::start` will no longer clear cache or results if scanning is already in progress.
* `NimBLEScan::clearResults` will now reset the vector capacity to 0.
* `NimBLEScan::stop` will no longer call the `onScanEnd` callback as the caller should know its been stopped when this is called.
* `NimBLEScan::clearDuplicateCache` has been removed as it was problematic and only for the esp32. Stop and start the scanner for the same effect.
* `NimBLEScan::start` takes a new bool parameter `restart`, default `true`, that will restart an already in progress scan and clear the duplicate filter so all devices will be discovered again.
* Scan response data that is received without advertisement first will now create the device and send a callback.
This commit is contained in:
h2zero 2024-11-18 09:37:46 -07:00 committed by h2zero
parent 5f2730de02
commit c31c4ea4f3
3 changed files with 162 additions and 232 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/NimBLEDevice.cpp
View file

@ -723,15 +723,7 @@ void NimBLEDevice::onReset(int reason) {
m_synced = false; m_synced = false;
NIMBLE_LOGE(LOG_TAG, "Resetting state; reason=%d, %s", reason, NimBLEUtils::returnCodeToString(reason)); NIMBLE_LOGE(LOG_TAG, "Host reset; reason=%d, %s", reason, NimBLEUtils::returnCodeToString(reason));
# if defined(CONFIG_BT_NIMBLE_ROLE_OBSERVER)
if (m_initialized) {
if (m_pScan != nullptr) {
m_pScan->onHostReset();
}
}
# endif
} // onReset } // onReset
/** /**

304
src/NimBLEScan.cpp
View file

@ -15,39 +15,31 @@
#include "nimconfig.h" #include "nimconfig.h"
#if defined(CONFIG_BT_ENABLED) && defined(CONFIG_BT_NIMBLE_ROLE_OBSERVER) #if defined(CONFIG_BT_ENABLED) && defined(CONFIG_BT_NIMBLE_ROLE_OBSERVER)
#include "NimBLEScan.h" # include "NimBLEScan.h"
#include "NimBLEDevice.h" # include "NimBLEDevice.h"
#include "NimBLELog.h" # include "NimBLELog.h"
#include <string> # include <string>
#include <climits> # include <climits>
static const char* LOG_TAG = "NimBLEScan"; static const char* LOG_TAG = "NimBLEScan";
/** /**
* @brief Scan constuctor. * @brief Scan constructor.
*/ */
NimBLEScan::NimBLEScan() { NimBLEScan::NimBLEScan()
m_scan_params.filter_policy = BLE_HCI_SCAN_FILT_NO_WL; : m_pScanCallbacks{nullptr},
m_scan_params.passive = 1; // If set, don’t send scan requests to advertisers (i.e., don’t request additional advertising data). // default interval + window, no whitelist scan filter,not limited scan, no scan response, filter_duplicates
m_scan_params.itvl = 0; // This is defined as the time interval from when the Controller started its last LE scan until it begins the subsequent LE scan. (units=0.625 msec) m_scanParams{0, 0, BLE_HCI_SCAN_FILT_NO_WL, 0, 1, 1},
m_scan_params.window = 0; // The duration of the LE scan. LE_Scan_Window shall be less than or equal to LE_Scan_Interval (units=0.625 msec) m_duration{BLE_HS_FOREVER},
m_scan_params.limited = 0; // If set, only discover devices in limited discoverable mode. m_pTaskData{nullptr},
m_scan_params.filter_duplicates = 1; // If set, the controller ignores all but the first advertisement from each device. m_maxResults{0xFF} {}
m_pScanCallbacks = nullptr;
m_ignoreResults = false;
m_pTaskData = nullptr;
m_duration = BLE_HS_FOREVER; // make sure this is non-zero in the event of a host reset
m_maxResults = 0xFF;
}
/** /**
* @brief Scan destructor, release any allocated resources. * @brief Scan destructor, release any allocated resources.
*/ */
NimBLEScan::~NimBLEScan() { NimBLEScan::~NimBLEScan() {
clearResults(); clearResults();
} }
/** /**
@ -55,32 +47,26 @@ NimBLEScan::~NimBLEScan() {
* @param [in] event The event type for this event. * @param [in] event The event type for this event.
* @param [in] param Parameter data for this event. * @param [in] param Parameter data for this event.
*/ */
/*STATIC*/
int NimBLEScan::handleGapEvent(ble_gap_event* event, void* arg) { int NimBLEScan::handleGapEvent(ble_gap_event* event, void* arg) {
(void)arg; (void)arg;
NimBLEScan* pScan = NimBLEDevice::getScan(); NimBLEScan* pScan = NimBLEDevice::getScan();
switch(event->type) { switch (event->type) {
case BLE_GAP_EVENT_EXT_DISC: case BLE_GAP_EVENT_EXT_DISC:
case BLE_GAP_EVENT_DISC: { case BLE_GAP_EVENT_DISC: {
if(pScan->m_ignoreResults) { # if CONFIG_BT_NIMBLE_EXT_ADV
NIMBLE_LOGI(LOG_TAG, "Scan op in progress - ignoring results"); const auto& disc = event->ext_disc;
return 0; const bool isLegacyAdv = disc.props & BLE_HCI_ADV_LEGACY_MASK;
} const auto event_type = isLegacyAdv ? disc.legacy_event_type : disc.props;
#if CONFIG_BT_NIMBLE_EXT_ADV # else
const auto& disc = event->ext_disc; const auto& disc = event->disc;
const bool isLegacyAdv = disc.props & BLE_HCI_ADV_LEGACY_MASK; const bool isLegacyAdv = true;
const auto event_type = isLegacyAdv ? disc.legacy_event_type : disc.props; const auto event_type = disc.event_type;
#else # endif
const auto& disc = event->disc;
const bool isLegacyAdv = true;
const auto event_type = disc.event_type;
#endif
NimBLEAddress advertisedAddress(disc.addr); NimBLEAddress advertisedAddress(disc.addr);
// Examine our list of ignored addresses and stop processing if we don't want to see it or are already connected // stop processing if we don't want to see it or are already connected
if(NimBLEDevice::isIgnored(advertisedAddress)) { if (NimBLEDevice::isIgnored(advertisedAddress)) {
NIMBLE_LOGI(LOG_TAG, "Ignoring device: address: %s", advertisedAddress.toString().c_str()); NIMBLE_LOGI(LOG_TAG, "Ignoring device: address: %s", advertisedAddress.toString().c_str());
return 0; return 0;
} }
@ -88,77 +74,79 @@ int NimBLEScan::handleGapEvent(ble_gap_event* event, void* arg) {
NimBLEAdvertisedDevice* advertisedDevice = nullptr; NimBLEAdvertisedDevice* advertisedDevice = nullptr;
// If we've seen this device before get a pointer to it from the vector // If we've seen this device before get a pointer to it from the vector
for(auto &it: pScan->m_scanResults.m_advertisedDevicesVector) { for (auto& ad : pScan->m_scanResults.m_deviceVec) {
#if CONFIG_BT_NIMBLE_EXT_ADV # if CONFIG_BT_NIMBLE_EXT_ADV
// Same address but different set ID should create a new advertised device. // Same address but different set ID should create a new advertised device.
if (it->getAddress() == advertisedAddress && it->getSetId() == disc.sid) { if (ad->getAddress() == advertisedAddress && ad->getSetId() == disc.sid) {
#else # else
if (it->getAddress() == advertisedAddress) { if (ad->getAddress() == advertisedAddress) {
#endif # endif
advertisedDevice = it; advertisedDevice = ad;
break; break;
} }
} }
// If we haven't seen this device before; create a new instance and insert it in the vector. // If we haven't seen this device before; create a new instance and insert it in the vector.
// Otherwise just update the relevant parameters of the already known device. // Otherwise just update the relevant parameters of the already known device.
if (advertisedDevice == nullptr && if (advertisedDevice == nullptr) {
(!isLegacyAdv || event_type != BLE_HCI_ADV_RPT_EVTYPE_SCAN_RSP)) { if (event_type == BLE_HCI_ADV_RPT_EVTYPE_SCAN_RSP) {
NIMBLE_LOGW(LOG_TAG, "Scan response without advertisement: %s", advertisedAddress.toString().c_str());
}
// Check if we have reach the scan results limit, ignore this one if so. // Check if we have reach the scan results limit, ignore this one if so.
// We still need to store each device when maxResults is 0 to be able to append the scan results // We still need to store each device when maxResults is 0 to be able to append the scan results
if (pScan->m_maxResults > 0 && pScan->m_maxResults < 0xFF && if (pScan->m_maxResults > 0 && pScan->m_maxResults < 0xFF &&
(pScan->m_scanResults.m_advertisedDevicesVector.size() >= pScan->m_maxResults)) { (pScan->m_scanResults.m_deviceVec.size() >= pScan->m_maxResults)) {
return 0; return 0;
} }
advertisedDevice = new NimBLEAdvertisedDevice(event, event_type); advertisedDevice = new NimBLEAdvertisedDevice(event, event_type);
pScan->m_scanResults.m_advertisedDevicesVector.push_back(advertisedDevice); pScan->m_scanResults.m_deviceVec.push_back(advertisedDevice);
NIMBLE_LOGI(LOG_TAG, "New advertiser: %s", advertisedAddress.toString().c_str()); NIMBLE_LOGI(LOG_TAG, "New advertiser: %s", advertisedAddress.toString().c_str());
} else if (advertisedDevice != nullptr) { } else if (advertisedDevice != nullptr) {
advertisedDevice->update(event, event_type); advertisedDevice->update(event, event_type);
NIMBLE_LOGI(LOG_TAG, "Updated advertiser: %s", advertisedAddress.toString().c_str()); NIMBLE_LOGI(LOG_TAG, "Updated advertiser: %s", advertisedAddress.toString().c_str());
} else { } else {
// Scan response from unknown device // unknown device
return 0; return 0;
} }
if (pScan->m_pScanCallbacks) { if (pScan->m_pScanCallbacks) {
if (advertisedDevice->m_callbackSent == 0 || !pScan->m_scan_params.filter_duplicates) { if (advertisedDevice->m_callbackSent == 0 || !pScan->m_scanParams.filter_duplicates) {
advertisedDevice->m_callbackSent = 1; advertisedDevice->m_callbackSent = 1;
pScan->m_pScanCallbacks->onDiscovered(advertisedDevice); pScan->m_pScanCallbacks->onDiscovered(advertisedDevice);
} }
if (pScan->m_scan_params.filter_duplicates && advertisedDevice->m_callbackSent >= 2) { if (pScan->m_scanParams.filter_duplicates && advertisedDevice->m_callbackSent >= 2) {
return 0; return 0;
} }
// If not active scanning or scan response is not available // If not active scanning or scan response is not available
// or extended advertisement scanning, report the result to the callback now. // or extended advertisement scanning, report the result to the callback now.
if(pScan->m_scan_params.passive || !isLegacyAdv || if (pScan->m_scanParams.passive || !isLegacyAdv ||
(advertisedDevice->getAdvType() != BLE_HCI_ADV_TYPE_ADV_IND && (advertisedDevice->getAdvType() != BLE_HCI_ADV_TYPE_ADV_IND &&
advertisedDevice->getAdvType() != BLE_HCI_ADV_TYPE_ADV_SCAN_IND)) advertisedDevice->getAdvType() != BLE_HCI_ADV_TYPE_ADV_SCAN_IND)) {
{
advertisedDevice->m_callbackSent = 2; advertisedDevice->m_callbackSent = 2;
pScan->m_pScanCallbacks->onResult(advertisedDevice); pScan->m_pScanCallbacks->onResult(advertisedDevice);
// Otherwise, wait for the scan response so we can report the complete data. // Otherwise, wait for the scan response so we can report the complete data.
} else if (isLegacyAdv && event_type == BLE_HCI_ADV_RPT_EVTYPE_SCAN_RSP) { } else if (isLegacyAdv && event_type == BLE_HCI_ADV_RPT_EVTYPE_SCAN_RSP) {
advertisedDevice->m_callbackSent = 2; advertisedDevice->m_callbackSent = 2;
pScan->m_pScanCallbacks->onResult(advertisedDevice); pScan->m_pScanCallbacks->onResult(advertisedDevice);
} }
// If not storing results and we have invoked the callback, delete the device. // If not storing results and we have invoked the callback, delete the device.
if(pScan->m_maxResults == 0 && advertisedDevice->m_callbackSent >= 2) { if (pScan->m_maxResults == 0 && advertisedDevice->m_callbackSent >= 2) {
pScan->erase(advertisedAddress); pScan->erase(advertisedAddress);
} }
} }
return 0; return 0;
} }
case BLE_GAP_EVENT_DISC_COMPLETE: {
NIMBLE_LOGD(LOG_TAG, "discovery complete; reason=%d",
event->disc_complete.reason);
if(pScan->m_maxResults == 0) { case BLE_GAP_EVENT_DISC_COMPLETE: {
NIMBLE_LOGD(LOG_TAG, "discovery complete; reason=%d", event->disc_complete.reason);
if (pScan->m_maxResults == 0) {
pScan->clearResults(); pScan->clearResults();
} }
@ -166,7 +154,7 @@ int NimBLEScan::handleGapEvent(ble_gap_event* event, void* arg) {
pScan->m_pScanCallbacks->onScanEnd(pScan->m_scanResults); pScan->m_pScanCallbacks->onScanEnd(pScan->m_scanResults);
} }
if(pScan->m_pTaskData != nullptr) { if (pScan->m_pTaskData != nullptr) {
NimBLEUtils::taskRelease(*pScan->m_pTaskData, event->disc_complete.reason); NimBLEUtils::taskRelease(*pScan->m_pTaskData, event->disc_complete.reason);
} }
@ -176,8 +164,7 @@ int NimBLEScan::handleGapEvent(ble_gap_event* event, void* arg) {
default: default:
return 0; return 0;
} }
} // gapEventHandler } // handleGapEvent
/** /**
* @brief Should we perform an active or passive scan? * @brief Should we perform an active or passive scan?
@ -185,10 +172,9 @@ int NimBLEScan::handleGapEvent(ble_gap_event* event, void* arg) {
* @param [in] active If true, we perform an active scan otherwise a passive scan. * @param [in] active If true, we perform an active scan otherwise a passive scan.
*/ */
void NimBLEScan::setActiveScan(bool active) { void NimBLEScan::setActiveScan(bool active) {
m_scan_params.passive = !active; m_scanParams.passive = !active;
} // setActiveScan } // setActiveScan
/** /**
* @brief Set whether or not the BLE controller should only report results * @brief Set whether or not the BLE controller should only report results
* from devices it has not already seen. * from devices it has not already seen.
@ -197,20 +183,18 @@ void NimBLEScan::setActiveScan(bool active) {
* duplicate devices once the limit is reached. * duplicate devices once the limit is reached.
*/ */
void NimBLEScan::setDuplicateFilter(bool enabled) { void NimBLEScan::setDuplicateFilter(bool enabled) {
m_scan_params.filter_duplicates = enabled; m_scanParams.filter_duplicates = enabled;
} // setDuplicateFilter } // setDuplicateFilter
/** /**
* @brief Set whether or not the BLE controller only report scan results * @brief Set whether or not the BLE controller only reports scan results
* from devices advertising in limited discovery mode, i.e. directed advertising. * from devices advertising in limited discovery mode.
* @param [in] enabled If true, only limited discovery devices will be in scan results. * @param [in] enabled If true, only limited discovery devices will be in scan results.
*/ */
void NimBLEScan::setLimitedOnly(bool enabled) { void NimBLEScan::setLimitedOnly(bool enabled) {
m_scan_params.limited = enabled; m_scanParams.limited = enabled;
} // setLimited } // setLimited
/** /**
* @brief Sets the scan filter policy. * @brief Sets the scan filter policy.
* @param [in] filter Can be one of: * @param [in] filter Can be one of:
@ -230,10 +214,9 @@ void NimBLEScan::setLimitedOnly(bool enabled) {
* resolvable private address. * resolvable private address.
*/ */
void NimBLEScan::setFilterPolicy(uint8_t filter) { void NimBLEScan::setFilterPolicy(uint8_t filter) {
m_scan_params.filter_policy = filter; m_scanParams.filter_policy = filter;
} // setFilterPolicy } // setFilterPolicy
/** /**
* @brief Sets the max number of results to store. * @brief Sets the max number of results to store.
* @param [in] maxResults The number of results to limit storage to\n * @param [in] maxResults The number of results to limit storage to\n
@ -243,7 +226,6 @@ void NimBLEScan::setMaxResults(uint8_t maxResults) {
m_maxResults = maxResults; m_maxResults = maxResults;
} }
/** /**
* @brief Set the call backs to be invoked. * @brief Set the call backs to be invoked.
* @param [in] pScanCallbacks Call backs to be invoked. * @param [in] pScanCallbacks Call backs to be invoked.
@ -254,25 +236,22 @@ void NimBLEScan::setScanCallbacks(NimBLEScanCallbacks* pScanCallbacks, bool want
m_pScanCallbacks = pScanCallbacks; m_pScanCallbacks = pScanCallbacks;
} // setScanCallbacks } // setScanCallbacks
/** /**
* @brief Set the interval to scan. * @brief Set the interval to scan.
* @param [in] intervalMSecs The scan interval (how often) in milliseconds. * @param [in] intervalMSecs The scan interval (how often) in milliseconds.
*/ */
void NimBLEScan::setInterval(uint16_t intervalMSecs) { void NimBLEScan::setInterval(uint16_t intervalMSecs) {
m_scan_params.itvl = intervalMSecs / 0.625; m_scanParams.itvl = intervalMSecs / 0.625;
} // setInterval } // setInterval
/** /**
* @brief Set the window to actively scan. * @brief Set the window to actively scan.
* @param [in] windowMSecs How long to actively scan. * @param [in] windowMSecs How long to actively scan.
*/ */
void NimBLEScan::setWindow(uint16_t windowMSecs) { void NimBLEScan::setWindow(uint16_t windowMSecs) {
m_scan_params.window = windowMSecs / 0.625; m_scanParams.window = windowMSecs / 0.625;
} // setWindow } // setWindow
/** /**
* @brief Get the status of the scanner. * @brief Get the status of the scanner.
* @return true if scanning or scan starting. * @return true if scanning or scan starting.
@ -281,14 +260,15 @@ bool NimBLEScan::isScanning() {
return ble_gap_disc_active(); return ble_gap_disc_active();
} }
/** /**
* @brief Start scanning. * @brief Start scanning.
* @param [in] duration The duration in milliseconds for which to scan. 0 == scan forever. * @param [in] duration The duration in milliseconds for which to scan. 0 == scan forever.
* @param [in] is_continue Set to true to save previous scan results, false to clear them. * @param [in] is_continue Set to true to save previous scan results, false to clear them.
* @param [in] restart Set to true to restart the scan if already in progress.
* this is useful to clear the duplicate filter so all devices are reported again.
* @return True if scan started or false if there was an error. * @return True if scan started or false if there was an error.
*/ */
bool NimBLEScan::start(uint32_t duration, bool is_continue) { bool NimBLEScan::start(uint32_t duration, bool is_continue, bool restart) {
NIMBLE_LOGD(LOG_TAG, ">> start: duration=%" PRIu32, duration); NIMBLE_LOGD(LOG_TAG, ">> start: duration=%" PRIu32, duration);
if (ble_gap_conn_active()) { if (ble_gap_conn_active()) {
@ -296,51 +276,52 @@ bool NimBLEScan::start(uint32_t duration, bool is_continue) {
return false; return false;
} }
if (isScanning()) {
if (restart) {
NIMBLE_LOGI(LOG_TAG, "Scan already in progress, restarting it");
if (!stop()) {
return false;
}
} else {
NIMBLE_LOGI(LOG_TAG, "Scan already in progress");
return true;
}
}
if (!is_continue) {
clearResults();
}
// Save the duration in the case that the host is reset so we can reuse it. // Save the duration in the case that the host is reset so we can reuse it.
m_duration = duration; m_duration = duration;
// If 0 duration specified then we assume a continuous scan is desired. // If 0 duration specified then we assume a continuous scan is desired.
if(duration == 0){ if (duration == 0) {
duration = BLE_HS_FOREVER; duration = BLE_HS_FOREVER;
} }
// Set the flag to ignore the results while we are deleting the vector
if(!is_continue) {
m_ignoreResults = true;
}
# if CONFIG_BT_NIMBLE_EXT_ADV # if CONFIG_BT_NIMBLE_EXT_ADV
ble_gap_ext_disc_params scan_params; ble_gap_ext_disc_params scan_params;
scan_params.passive = m_scan_params.passive; scan_params.passive = m_scanParams.passive;
scan_params.itvl = m_scan_params.itvl; scan_params.itvl = m_scanParams.itvl;
scan_params.window = m_scan_params.window; scan_params.window = m_scanParams.window;
int rc = ble_gap_ext_disc(NimBLEDevice::m_ownAddrType, int rc = ble_gap_ext_disc(NimBLEDevice::m_ownAddrType,
duration/10, duration / 10,
0, 0,
m_scan_params.filter_duplicates, m_scanParams.filter_duplicates,
m_scan_params.filter_policy, m_scanParams.filter_policy,
m_scan_params.limited, m_scanParams.limited,
&scan_params, &scan_params,
&scan_params, &scan_params,
NimBLEScan::handleGapEvent, NimBLEScan::handleGapEvent,
NULL); NULL);
#else # else
int rc = ble_gap_disc(NimBLEDevice::m_ownAddrType, int rc = ble_gap_disc(NimBLEDevice::m_ownAddrType, duration, &m_scanParams, NimBLEScan::handleGapEvent, NULL);
duration, # endif
&m_scan_params, switch (rc) {
NimBLEScan::handleGapEvent,
NULL);
#endif
switch(rc) {
case 0: case 0:
if(!is_continue) {
clearResults();
}
break;
case BLE_HS_EALREADY: case BLE_HS_EALREADY:
// Clear the cache if already scanning in case an advertiser was missed. NIMBLE_LOGD(LOG_TAG, "Scan started");
clearDuplicateCache();
break; break;
case BLE_HS_EBUSY: case BLE_HS_EBUSY:
@ -355,21 +336,14 @@ bool NimBLEScan::start(uint32_t duration, bool is_continue) {
break; break;
default: default:
NIMBLE_LOGE(LOG_TAG, "Error initiating GAP discovery procedure; rc=%d, %s", NIMBLE_LOGE(LOG_TAG, "Error starting scan; rc=%d, %s", rc, NimBLEUtils::returnCodeToString(rc));
rc, NimBLEUtils::returnCodeToString(rc));
break; break;
} }
m_ignoreResults = false;
NIMBLE_LOGD(LOG_TAG, "<< start()"); NIMBLE_LOGD(LOG_TAG, "<< start()");
return rc == 0 || rc == BLE_HS_EALREADY;
if(rc != 0 && rc != BLE_HS_EALREADY) {
return false;
}
return true;
} // start } // start
/** /**
* @brief Stop an in progress scan. * @brief Stop an in progress scan.
* @return True if successful. * @return True if successful.
@ -383,15 +357,11 @@ bool NimBLEScan::stop() {
return false; return false;
} }
if(m_maxResults == 0) { if (m_maxResults == 0) {
clearResults(); clearResults();
} }
if (rc != BLE_HS_EALREADY && m_pScanCallbacks != nullptr) { if (m_pTaskData != nullptr) {
m_pScanCallbacks->onScanEnd(m_scanResults);
}
if(m_pTaskData != nullptr) {
NimBLEUtils::taskRelease(*m_pTaskData); NimBLEUtils::taskRelease(*m_pTaskData);
} }
@ -399,56 +369,32 @@ bool NimBLEScan::stop() {
return true; return true;
} // stop } // stop
/**
* @brief Clears the duplicate scan filter cache.
*/
void NimBLEScan::clearDuplicateCache() {
#ifdef CONFIG_IDF_TARGET_ESP32 // Not available for ESP32C3
esp_ble_scan_dupilcate_list_flush();
#endif
}
/** /**
* @brief Delete peer device from the scan results vector. * @brief Delete peer device from the scan results vector.
* @param [in] address The address of the device to delete from the results. * @param [in] address The address of the device to delete from the results.
* @details After disconnecting, it may be required in the case we were connected to a device without a public address. * @details After disconnecting, it may be required in the case we were connected to a device without a public address.
*/ */
void NimBLEScan::erase(const NimBLEAddress &address) { void NimBLEScan::erase(const NimBLEAddress& address) {
NIMBLE_LOGD(LOG_TAG, "erase device: %s", address.toString().c_str()); NIMBLE_LOGD(LOG_TAG, "erase device: %s", address.toString().c_str());
for (auto it = m_scanResults.m_deviceVec.begin(); it != m_scanResults.m_deviceVec.end(); ++it) {
for(auto it = m_scanResults.m_advertisedDevicesVector.begin(); it != m_scanResults.m_advertisedDevicesVector.end(); ++it) { if ((*it)->getAddress() == address) {
if((*it)->getAddress() == address) {
delete *it; delete *it;
m_scanResults.m_advertisedDevicesVector.erase(it); m_scanResults.m_deviceVec.erase(it);
break; break;
} }
} }
} }
/**
* @brief Called when host reset, we set a flag to stop scanning until synced.
*/
void NimBLEScan::onHostReset() {
m_ignoreResults = true;
}
/** /**
* @brief If the host reset and re-synced this is called. * @brief If the host reset and re-synced this is called.
* If the application was scanning indefinitely with a callback, restart it. * If the application was scanning indefinitely with a callback, restart it.
*/ */
void NimBLEScan::onHostSync() { void NimBLEScan::onHostSync() {
m_ignoreResults = false; if (m_duration == 0 && m_pScanCallbacks != nullptr) {
if(m_duration == 0 && m_pScanCallbacks != nullptr) {
start(0, false); start(0, false);
} }
} }
/** /**
* @brief Start scanning and block until scanning has been completed. * @brief Start scanning and block until scanning has been completed.
* @param [in] duration The duration in milliseconds for which to scan. * @param [in] duration The duration in milliseconds for which to scan.
@ -456,14 +402,19 @@ void NimBLEScan::onHostSync() {
* @return The scan results. * @return The scan results.
*/ */
NimBLEScanResults NimBLEScan::getResults(uint32_t duration, bool is_continue) { NimBLEScanResults NimBLEScan::getResults(uint32_t duration, bool is_continue) {
if(duration == 0) { if (duration == 0) {
NIMBLE_LOGW(LOG_TAG, "Blocking scan called with duration = forever"); NIMBLE_LOGW(LOG_TAG, "Blocking scan called with duration = forever");
} }
if (m_pTaskData != nullptr) {
NIMBLE_LOGE(LOG_TAG, "Scan already in progress");
return m_scanResults;
}
NimBLETaskData taskData; NimBLETaskData taskData;
m_pTaskData = &taskData; m_pTaskData = &taskData;
if(start(duration, is_continue)) { if (start(duration, is_continue)) {
NimBLEUtils::taskWait(taskData, BLE_NPL_TIME_FOREVER); NimBLEUtils::taskWait(taskData, BLE_NPL_TIME_FOREVER);
} }
@ -471,7 +422,6 @@ NimBLEScanResults NimBLEScan::getResults(uint32_t duration, bool is_continue) {
return m_scanResults; return m_scanResults;
} // getResults } // getResults
/** /**
* @brief Get the results of the scan. * @brief Get the results of the scan.
* @return NimBLEScanResults object. * @return NimBLEScanResults object.
@ -480,39 +430,34 @@ NimBLEScanResults NimBLEScan::getResults() {
return m_scanResults; return m_scanResults;
} }
/** /**
* @brief Clear the results of the scan. * @brief Clear the results of the scan.
*/ */
void NimBLEScan::clearResults() { void NimBLEScan::clearResults() {
for(auto &it: m_scanResults.m_advertisedDevicesVector) { for (auto& it : m_scanResults.m_deviceVec) {
delete it; delete it;
} }
m_scanResults.m_advertisedDevicesVector.clear(); std::vector<NimBLEAdvertisedDevice*>().swap(m_scanResults.m_deviceVec);
clearDuplicateCache(); } // clearResults
}
/** /**
* @brief Dump the scan results to the log. * @brief Dump the scan results to the log.
*/ */
void NimBLEScanResults::dump() { void NimBLEScanResults::dump() {
NIMBLE_LOGD(LOG_TAG, ">> Dump scan results:"); NIMBLE_LOGD(LOG_TAG, ">> Dump scan results:");
for (int i=0; i<getCount(); i++) { for (int i = 0; i < getCount(); i++) {
NIMBLE_LOGI(LOG_TAG, "- %s", getDevice(i).toString().c_str()); NIMBLE_LOGI(LOG_TAG, "- %s", getDevice(i).toString().c_str());
} }
} // dump } // dump
/** /**
* @brief Get the count of devices found in the last scan. * @brief Get the count of devices found in the last scan.
* @return The number of devices found in the last scan. * @return The number of devices found in the last scan.
*/ */
int NimBLEScanResults::getCount() { int NimBLEScanResults::getCount() {
return m_advertisedDevicesVector.size(); return m_deviceVec.size();
} // getCount } // getCount
/** /**
* @brief Return the specified device at the given index. * @brief Return the specified device at the given index.
* The index should be between 0 and getCount()-1. * The index should be between 0 and getCount()-1.
@ -520,38 +465,35 @@ int NimBLEScanResults::getCount() {
* @return The device at the specified index. * @return The device at the specified index.
*/ */
NimBLEAdvertisedDevice NimBLEScanResults::getDevice(uint32_t i) { NimBLEAdvertisedDevice NimBLEScanResults::getDevice(uint32_t i) {
return *m_advertisedDevicesVector[i]; return *m_deviceVec[i];
} }
/** /**
* @brief Get iterator to the beginning of the vector of advertised device pointers. * @brief Get iterator to the beginning of the vector of advertised device pointers.
* @return An iterator to the beginning of the vector of advertised device pointers. * @return An iterator to the beginning of the vector of advertised device pointers.
*/ */
std::vector<NimBLEAdvertisedDevice*>::iterator NimBLEScanResults::begin() { std::vector<NimBLEAdvertisedDevice*>::iterator NimBLEScanResults::begin() {
return m_advertisedDevicesVector.begin(); return m_deviceVec.begin();
} }
/** /**
* @brief Get iterator to the end of the vector of advertised device pointers. * @brief Get iterator to the end of the vector of advertised device pointers.
* @return An iterator to the end of the vector of advertised device pointers. * @return An iterator to the end of the vector of advertised device pointers.
*/ */
std::vector<NimBLEAdvertisedDevice*>::iterator NimBLEScanResults::end() { std::vector<NimBLEAdvertisedDevice*>::iterator NimBLEScanResults::end() {
return m_advertisedDevicesVector.end(); return m_deviceVec.end();
} }
/** /**
* @brief Get a pointer to the specified device at the given address. * @brief Get a pointer to the specified device at the given address.
* If the address is not found a nullptr is returned. * If the address is not found a nullptr is returned.
* @param [in] address The address of the device. * @param [in] address The address of the device.
* @return A pointer to the device at the specified address. * @return A pointer to the device at the specified address.
*/ */
NimBLEAdvertisedDevice *NimBLEScanResults::getDevice(const NimBLEAddress &address) { NimBLEAdvertisedDevice* NimBLEScanResults::getDevice(const NimBLEAddress& address) {
for(size_t index = 0; index < m_advertisedDevicesVector.size(); index++) { for (size_t index = 0; index < m_deviceVec.size(); index++) {
if(m_advertisedDevicesVector[index]->getAddress() == address) { if (m_deviceVec[index]->getAddress() == address) {
return m_advertisedDevicesVector[index]; return m_deviceVec[index];
} }
} }

80
src/NimBLEScan.h
View file

@ -17,16 +17,16 @@
#include "nimconfig.h" #include "nimconfig.h"
#if defined(CONFIG_BT_ENABLED) && defined(CONFIG_BT_NIMBLE_ROLE_OBSERVER) #if defined(CONFIG_BT_ENABLED) && defined(CONFIG_BT_NIMBLE_ROLE_OBSERVER)
#include "NimBLEAdvertisedDevice.h" # include "NimBLEAdvertisedDevice.h"
#include "NimBLEUtils.h" # include "NimBLEUtils.h"
#if defined(CONFIG_NIMBLE_CPP_IDF) # if defined(CONFIG_NIMBLE_CPP_IDF)
#include "host/ble_gap.h" # include "host/ble_gap.h"
#else # else
#include "nimble/nimble/host/include/host/ble_gap.h" # include "nimble/nimble/host/include/host/ble_gap.h"
#endif # endif
#include <vector> # include <vector>
class NimBLEDevice; class NimBLEDevice;
class NimBLEScan; class NimBLEScan;
@ -42,17 +42,17 @@ class NimBLEAddress;
* index (starting at 0) of the desired device. * index (starting at 0) of the desired device.
*/ */
class NimBLEScanResults { class NimBLEScanResults {
public: public:
void dump(); void dump();
int getCount(); int getCount();
NimBLEAdvertisedDevice getDevice(uint32_t i); NimBLEAdvertisedDevice getDevice(uint32_t i);
std::vector<NimBLEAdvertisedDevice*>::iterator begin(); std::vector<NimBLEAdvertisedDevice*>::iterator begin();
std::vector<NimBLEAdvertisedDevice*>::iterator end(); std::vector<NimBLEAdvertisedDevice*>::iterator end();
NimBLEAdvertisedDevice *getDevice(const NimBLEAddress &address); NimBLEAdvertisedDevice* getDevice(const NimBLEAddress& address);
private: private:
friend NimBLEScan; friend NimBLEScan;
std::vector<NimBLEAdvertisedDevice*> m_advertisedDevicesVector; std::vector<NimBLEAdvertisedDevice*> m_deviceVec;
}; };
/** /**
@ -61,48 +61,44 @@ private:
* Scanning is associated with a %BLE client that is attempting to locate BLE servers. * Scanning is associated with a %BLE client that is attempting to locate BLE servers.
*/ */
class NimBLEScan { class NimBLEScan {
public: public:
bool start(uint32_t duration, bool is_continue = false); bool start(uint32_t duration, bool is_continue = false, bool restart = true);
bool isScanning(); bool isScanning();
void setScanCallbacks(NimBLEScanCallbacks* pScanCallbacks, bool wantDuplicates = false); void setScanCallbacks(NimBLEScanCallbacks* pScanCallbacks, bool wantDuplicates = false);
void setActiveScan(bool active); void setActiveScan(bool active);
void setInterval(uint16_t intervalMSecs); void setInterval(uint16_t intervalMSecs);
void setWindow(uint16_t windowMSecs); void setWindow(uint16_t windowMSecs);
void setDuplicateFilter(bool enabled); void setDuplicateFilter(bool enabled);
void setLimitedOnly(bool enabled); void setLimitedOnly(bool enabled);
void setFilterPolicy(uint8_t filter); void setFilterPolicy(uint8_t filter);
void clearDuplicateCache(); bool stop();
bool stop(); void clearResults();
void clearResults(); NimBLEScanResults getResults();
NimBLEScanResults getResults(); NimBLEScanResults getResults(uint32_t duration, bool is_continue = false);
NimBLEScanResults getResults(uint32_t duration, bool is_continue = false); void setMaxResults(uint8_t maxResults);
void setMaxResults(uint8_t maxResults); void erase(const NimBLEAddress& address);
void erase(const NimBLEAddress &address);
private:
private:
friend class NimBLEDevice; friend class NimBLEDevice;
NimBLEScan(); NimBLEScan();
~NimBLEScan(); ~NimBLEScan();
static int handleGapEvent(ble_gap_event* event, void* arg); static int handleGapEvent(ble_gap_event* event, void* arg);
void onHostReset(); void onHostSync();
void onHostSync();
NimBLEScanCallbacks* m_pScanCallbacks; NimBLEScanCallbacks* m_pScanCallbacks;
ble_gap_disc_params m_scan_params; ble_gap_disc_params m_scanParams;
bool m_ignoreResults; NimBLEScanResults m_scanResults;
NimBLEScanResults m_scanResults; uint32_t m_duration;
uint32_t m_duration; NimBLETaskData* m_pTaskData;
NimBLETaskData *m_pTaskData; uint8_t m_maxResults;
uint8_t m_maxResults;
}; };
/** /**
* @brief A callback handler for callbacks associated device scanning. * @brief A callback handler for callbacks associated device scanning.
*/ */
class NimBLEScanCallbacks { class NimBLEScanCallbacks {
public: public:
virtual ~NimBLEScanCallbacks() {} virtual ~NimBLEScanCallbacks() {}
/** /**