summaryrefslogtreecommitdiff
path: root/sensor/patchedBLE/src/BLEScan.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'sensor/patchedBLE/src/BLEScan.cpp')
-rw-r--r--sensor/patchedBLE/src/BLEScan.cpp119
1 files changed, 79 insertions, 40 deletions
diff --git a/sensor/patchedBLE/src/BLEScan.cpp b/sensor/patchedBLE/src/BLEScan.cpp
index 3046b7c..d851a47 100644
--- a/sensor/patchedBLE/src/BLEScan.cpp
+++ b/sensor/patchedBLE/src/BLEScan.cpp
@@ -8,7 +8,6 @@
#if defined(CONFIG_BT_ENABLED)
-#include <esp_log.h>
#include <esp_err.h>
#include <map>
@@ -17,11 +16,15 @@
#include "BLEScan.h"
#include "BLEUtils.h"
#include "GeneralUtils.h"
-#ifdef ARDUINO_ARCH_ESP32
+#if defined(ARDUINO_ARCH_ESP32) && defined(CONFIG_ARDUHAL_ESP_LOG)
#include "esp32-hal-log.h"
+#define LOG_TAG ""
+#else
+#include "esp_log.h"
+static const char* LOG_TAG = "BLEScan";
#endif
-static const char* LOG_TAG = "BLEScan";
+
/**
@@ -50,20 +53,19 @@ void BLEScan::handleGAPEvent(
switch(event) {
- // ESP_GAP_BLE_SCAN_RESULT_EVT
- // ---------------------------
- // scan_rst:
- // esp_gap_search_evt_t search_evt
- // esp_bd_addr_t bda
- // esp_bt_dev_type_t dev_type
- // esp_ble_addr_type_t ble_addr_type
- // esp_ble_evt_type_t ble_evt_type
- // int rssi
- // uint8_t ble_adv[ESP_BLE_ADV_DATA_LEN_MAX]
- // int flag
- // int num_resps
- // uint8_t adv_data_len
- // uint8_t scan_rsp_len
+ // ---------------------------
+ // scan_rst:
+ // esp_gap_search_evt_t search_evt
+ // esp_bd_addr_t bda
+ // esp_bt_dev_type_t dev_type
+ // esp_ble_addr_type_t ble_addr_type
+ // esp_ble_evt_type_t ble_evt_type
+ // int rssi
+ // uint8_t ble_adv[ESP_BLE_ADV_DATA_LEN_MAX]
+ // int flag
+ // int num_resps
+ // uint8_t adv_data_len
+ // uint8_t scan_rsp_len
case ESP_GAP_BLE_SCAN_RESULT_EVT: {
switch(param->scan_rst.search_evt) {
@@ -73,11 +75,12 @@ void BLEScan::handleGAPEvent(
// Event that indicates that the duration allowed for the search has completed or that we have been
// asked to stop.
case ESP_GAP_SEARCH_INQ_CMPL_EVT: {
+ ESP_LOGW(LOG_TAG, "ESP_GAP_SEARCH_INQ_CMPL_EVT");
m_stopped = true;
+ m_semaphoreScanEnd.give();
if (m_scanCompleteCB != nullptr) {
m_scanCompleteCB(m_scanResults);
}
- m_semaphoreScanEnd.give();
break;
} // ESP_GAP_SEARCH_INQ_CMPL_EVT
@@ -95,33 +98,37 @@ void BLEScan::handleGAPEvent(
BLEAddress advertisedAddress(param->scan_rst.bda);
bool found = false;
- for (int i=0; i<m_scanResults.getCount(); i++) {
- if (m_scanResults.getDevice(i).getAddress().equals(advertisedAddress)) {
- found = true;
- break;
- }
+ if (m_scanResults.m_vectorAdvertisedDevices.count(advertisedAddress.toString()) != 0) {
+ found = true;
}
+
if (found && !m_wantDuplicates) { // If we found a previous entry AND we don't want duplicates, then we are done.
ESP_LOGD(LOG_TAG, "Ignoring %s, already seen it.", advertisedAddress.toString().c_str());
+ vTaskDelay(1); // <--- allow to switch task in case we scan infinity and dont have new devices to report, or we are blocked here
break;
}
// We now construct a model of the advertised device that we have just found for the first
// time.
- BLEAdvertisedDevice advertisedDevice;
- advertisedDevice.setAddress(advertisedAddress);
- advertisedDevice.setRSSI(param->scan_rst.rssi);
- advertisedDevice.setAdFlag(param->scan_rst.flag);
- advertisedDevice.parseAdvertisement((uint8_t*)param->scan_rst.ble_adv);
- advertisedDevice.setScan(this);
+ // ESP_LOG_BUFFER_HEXDUMP(LOG_TAG, (uint8_t*)param->scan_rst.ble_adv, param->scan_rst.adv_data_len + param->scan_rst.scan_rsp_len, ESP_LOG_DEBUG);
+ // ESP_LOGW(LOG_TAG, "bytes length: %d + %d, addr type: %d", param->scan_rst.adv_data_len, param->scan_rst.scan_rsp_len, param->scan_rst.ble_addr_type);
+ BLEAdvertisedDevice *advertisedDevice = new BLEAdvertisedDevice();
+ advertisedDevice->setAddress(advertisedAddress);
+ advertisedDevice->setRSSI(param->scan_rst.rssi);
+ advertisedDevice->setAdFlag(param->scan_rst.flag);
+ advertisedDevice->parseAdvertisement((uint8_t*)param->scan_rst.ble_adv, param->scan_rst.adv_data_len + param->scan_rst.scan_rsp_len);
+ advertisedDevice->setScan(this);
+ advertisedDevice->setAddressType(param->scan_rst.ble_addr_type);
- if (m_pAdvertisedDeviceCallbacks) {
- m_pAdvertisedDeviceCallbacks->onResult(advertisedDevice);
+ if (!found) { // If we have previously seen this device, don't record it again.
+ m_scanResults.m_vectorAdvertisedDevices.insert(std::pair<std::string, BLEAdvertisedDevice*>(advertisedAddress.toString(), advertisedDevice));
}
- if (!found) { // If we have previously seen this device, don't record it again.
- m_scanResults.m_vectorAdvertisedDevices.push_back(advertisedDevice);
+ if (m_pAdvertisedDeviceCallbacks) {
+ m_pAdvertisedDeviceCallbacks->onResult(*advertisedDevice);
}
+ if(found)
+ delete advertisedDevice;
break;
} // ESP_GAP_SEARCH_INQ_RES_EVT
@@ -190,15 +197,23 @@ void BLEScan::setWindow(uint16_t windowMSecs) {
* @brief Start scanning.
* @param [in] duration The duration in seconds for which to scan.
* @param [in] scanCompleteCB A function to be called when scanning has completed.
+ * @param [in] are we continue scan (true) or we want to clear stored devices (false)
* @return True if scan started or false if there was an error.
*/
-bool BLEScan::start(uint32_t duration, void (*scanCompleteCB)(BLEScanResults)) {
+bool BLEScan::start(uint32_t duration, void (*scanCompleteCB)(BLEScanResults), bool is_continue) {
ESP_LOGD(LOG_TAG, ">> start(duration=%d)", duration);
m_semaphoreScanEnd.take(std::string("start"));
m_scanCompleteCB = scanCompleteCB; // Save the callback to be invoked when the scan completes.
- m_scanResults.m_vectorAdvertisedDevices.clear();
+ // if we are connecting to devices that are advertising even after being connected, multiconnecting peripherals
+ // then we should not clear map or we will connect the same device few times
+ if(!is_continue) {
+ for(auto _dev : m_scanResults.m_vectorAdvertisedDevices){
+ delete _dev.second;
+ }
+ m_scanResults.m_vectorAdvertisedDevices.clear();
+ }
esp_err_t errRc = ::esp_ble_gap_set_scan_params(&m_scan_params);
@@ -228,8 +243,8 @@ bool BLEScan::start(uint32_t duration, void (*scanCompleteCB)(BLEScanResults)) {
* @param [in] duration The duration in seconds for which to scan.
* @return The BLEScanResults.
*/
-BLEScanResults BLEScan::start(uint32_t duration) {
- if(start(duration, nullptr)) {
+BLEScanResults BLEScan::start(uint32_t duration, bool is_continue) {
+ if(start(duration, nullptr, is_continue)) {
m_semaphoreScanEnd.wait("start"); // Wait for the semaphore to release.
}
return m_scanResults;
@@ -246,17 +261,24 @@ void BLEScan::stop() {
esp_err_t errRc = ::esp_ble_gap_stop_scanning();
m_stopped = true;
+ m_semaphoreScanEnd.give();
if (errRc != ESP_OK) {
ESP_LOGE(LOG_TAG, "esp_ble_gap_stop_scanning: err: %d, text: %s", errRc, GeneralUtils::errorToString(errRc));
return;
}
- m_semaphoreScanEnd.give();
-
ESP_LOGD(LOG_TAG, "<< stop()");
} // stop
+// delete peer device from cache after disconnecting, it is required in case we are connecting to devices with not public address
+void BLEScan::erase(BLEAddress address) {
+ ESP_LOGI(LOG_TAG, "erase device: %s", address.toString().c_str());
+ BLEAdvertisedDevice *advertisedDevice = m_scanResults.m_vectorAdvertisedDevices.find(address.toString())->second;
+ m_scanResults.m_vectorAdvertisedDevices.erase(address.toString());
+ delete advertisedDevice;
+}
+
/**
* @brief Dump the scan results to the log.
@@ -285,8 +307,25 @@ int BLEScanResults::getCount() {
* @return The device at the specified index.
*/
BLEAdvertisedDevice BLEScanResults::getDevice(uint32_t i) {
- return m_vectorAdvertisedDevices.at(i);
+ uint32_t x = 0;
+ BLEAdvertisedDevice dev = *m_vectorAdvertisedDevices.begin()->second;
+ for (auto it = m_vectorAdvertisedDevices.begin(); it != m_vectorAdvertisedDevices.end(); it++) {
+ dev = *it->second;
+ if (x==i) break;
+ x++;
+ }
+ return dev;
}
+BLEScanResults BLEScan::getResults() {
+ return m_scanResults;
+}
+
+void BLEScan::clearResults() {
+ for(auto _dev : m_scanResults.m_vectorAdvertisedDevices){
+ delete _dev.second;
+ }
+ m_scanResults.m_vectorAdvertisedDevices.clear();
+}
#endif /* CONFIG_BT_ENABLED */
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-18 17:36:48 +0000