Upstream/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2024-12-04 13:44:40 +01:00
Code Issues Projects Releases Wiki Activity

fix the problem of missing part of advertising packet when activ… (#868)

Browse Source 
* fix the problem of missing part of advertising packet when active scan is enabled.

* fix for ci-suggest-changes
This commit is contained in:
warpzone 2019-11-21 00:54:25 +09:00 committed by Otto Winter
parent d355543ac9
commit 8421570b18
No known key found for this signature in database
GPG Key ID: 48ED2DDB96D7682C
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
esphome/components/esp32_ble_tracker/esp32_ble_tracker.cpp
View File

@ -324,13 +324,15 @@ void ESPBTDevice::parse_scan_rst(const esp_ble_gap_cb_param_t::ble_scan_result_e
} }
ESP_LOGVV(TAG, "Adv data: %s", ESP_LOGVV(TAG, "Adv data: %s",
hexencode_string(std::string(reinterpret_cast<const char *>(param.ble_adv), param.adv_data_len)).c_str()); hexencode_string(
std::string(reinterpret_cast<const char *>(param.ble_adv), param.adv_data_len + param.scan_rsp_len))
.c_str());
#endif #endif
} }
void ESPBTDevice::parse_adv_(const esp_ble_gap_cb_param_t::ble_scan_result_evt_param &param) { void ESPBTDevice::parse_adv_(const esp_ble_gap_cb_param_t::ble_scan_result_evt_param &param) {
size_t offset = 0; size_t offset = 0;
const uint8_t *payload = param.ble_adv; const uint8_t *payload = param.ble_adv;
uint8_t len = param.adv_data_len; uint8_t len = param.adv_data_len + param.scan_rsp_len;
while (offset + 2 < len) { while (offset + 2 < len) {
const uint8_t field_length = payload[offset++]; // First byte is length of adv record const uint8_t field_length = payload[offset++]; // First byte is length of adv record