@@ -295,72 +295,72 @@ void BLEAdvertisedDevice::parseAdvertisement(uint8_t *payload, size_t total_len)
 length--;
 
 char *pHex = BLEUtils::buildHexData(nullptr, payload, length);
-log_d("Type: 0x%.2x (%s), length: %d, data: %s", ad_type, BLEUtils::advTypeToString(ad_type), length, pHex);
+log_d("Type: 0x%.2x (%s), length: %d, data: %s", ad_type, BLEUtils::advDataTypeToString(ad_type), length, pHex);
 free(pHex);
 
 switch (ad_type) {
-case 0x09:
+case ESP_BLE_AD_TYPE_NAME_CMPL: // 0x09
 { // Adv Data Type: ESP_BLE_AD_TYPE_NAME_CMPL
 setName(String(reinterpret_cast<char *>(payload), length));
 break;
 } // 0x09
 
-case 0x0A:
+case ESP_BLE_AD_TYPE_TX_PWR: // 0x0A
 { // Adv Data Type: ESP_BLE_AD_TYPE_TX_PWR
 setTXPower(*payload);
 break;
 } // 0x0A
 
-case 0x19:
+case ESP_BLE_AD_TYPE_APPEARANCE: // 0x19
 { // Adv Data Type: ESP_BLE_AD_TYPE_APPEARANCE
 setAppearance(*reinterpret_cast<uint16_t *>(payload));
 break;
 } // 0x19
 
-case 0x01:
+case ESP_BLE_AD_TYPE_FLAG: // 0x01
 { // Adv Data Type: ESP_BLE_AD_TYPE_FLAG
 setAdFlag(*payload);
 break;
 } // 0x01
 
-case 0x02:
-case 0x03:
+case ESP_BLE_AD_TYPE_16SRV_PART: // 0x02
+case ESP_BLE_AD_TYPE_16SRV_CMPL: // 0x03
 { // Adv Data Type: ESP_BLE_AD_TYPE_16SRV_PART/CMPL
 for (int var = 0; var < length / 2; ++var) {
 setServiceUUID(BLEUUID(*reinterpret_cast<uint16_t *>(payload + var * 2)));
 }
 break;
 } // 0x02, 0x03
 
-case 0x04:
-case 0x05:
+case ESP_BLE_AD_TYPE_32SRV_PART: // 0x04
+case ESP_BLE_AD_TYPE_32SRV_CMPL: // 0x05
 { // Adv Data Type: ESP_BLE_AD_TYPE_32SRV_PART/CMPL
 for (int var = 0; var < length / 4; ++var) {
 setServiceUUID(BLEUUID(*reinterpret_cast<uint32_t *>(payload + var * 4)));
 }
 break;
 } // 0x04, 0x05
 
-case 0x07:
+case ESP_BLE_AD_TYPE_128SRV_CMPL: // 0x07
 { // Adv Data Type: ESP_BLE_AD_TYPE_128SRV_CMPL
 setServiceUUID(BLEUUID(payload, 16, false));
 break;
 } // 0x07
 
-case 0x06:
+case ESP_BLE_AD_TYPE_128SRV_PART: // 0x06
 { // Adv Data Type: ESP_BLE_AD_TYPE_128SRV_PART
 setServiceUUID(BLEUUID(payload, 16, false));
 break;
 } // 0x06
 
 // See CSS Part A 1.4 Manufacturer Specific Data
-case 0xFF:
+case ESP_BLE_AD_MANUFACTURER_SPECIFIC_TYPE: // 0xFF
 {
 setManufacturerData(String(reinterpret_cast<char *>(payload), length));
 break;
 } // 0xFF
 
-case 0x16:
+case ESP_BLE_AD_TYPE_SERVICE_DATA: // 0x16
 { // Adv Data Type: ESP_BLE_AD_TYPE_SERVICE_DATA - 2 byte UUID
 if (length < 2) {
 log_e("Length too small for SERVICE_DATA");
@@ -374,7 +374,7 @@ void BLEAdvertisedDevice::parseAdvertisement(uint8_t *payload, size_t total_len)
 break;
 } // 0x16
 
-case 0x20:
+case ESP_BLE_AD_TYPE_32SERVICE_DATA: // 0x20
 { // Adv Data Type: ESP_BLE_AD_TYPE_32SERVICE_DATA - 4 byte UUID
 if (length < 4) {
 log_e("Length too small for 32SERVICE_DATA");
@@ -388,7 +388,7 @@ void BLEAdvertisedDevice::parseAdvertisement(uint8_t *payload, size_t total_len)
 break;
 } // 0x20
 
-case 0x21:
+case ESP_BLE_AD_TYPE_128SERVICE_DATA: // 0x21
 { // Adv Data Type: ESP_BLE_AD_TYPE_128SERVICE_DATA - 16 byte UUID
 if (length < 16) {
 log_e("Length too small for 128SERVICE_DATA");

@@ -638,6 +638,7 @@ int BLEScan::handleGAPEvent(ble_gap_event *event, void *arg) {
 }
 advertisedDevice = new BLEAdvertisedDevice();
 advertisedDevice->setAddress(advertisedAddress);
+advertisedDevice->setAddressType(event->disc.addr.type);
 advertisedDevice->setAdvType(event->disc.event_type);
 pScan->m_scanResults.m_vectorAdvertisedDevices.insert(std::pair<std::string, BLEAdvertisedDevice *>(advertisedAddress.toString().c_str(), advertisedDevice));
 log_i("New advertiser: %s", advertisedAddress.toString().c_str());
@@ -649,7 +650,14 @@ int BLEScan::handleGAPEvent(ble_gap_event *event, void *arg) {
 }
 
 advertisedDevice->setRSSI(event->disc.rssi);
-advertisedDevice->setPayload((uint8_t *)event->disc.data, event->disc.length_data, event->disc.event_type == BLE_HCI_ADV_RPT_EVTYPE_SCAN_RSP);
+
+if (pScan->m_shouldParse) {
+advertisedDevice->parseAdvertisement((uint8_t *)event->disc.data, event->disc.length_data);
+} else {
+advertisedDevice->setPayload((uint8_t *)event->disc.data, event->disc.length_data, event->disc.event_type == BLE_HCI_ADV_RPT_EVTYPE_SCAN_RSP);
+}
+
+advertisedDevice->setScan(pScan);
 
 if (pScan->m_pAdvertisedDeviceCallbacks) {
 // If not active scanning or scan response is not available

@@ -678,6 +678,71 @@ char *BLEUtils::buildHexData(uint8_t *target, uint8_t *source, uint8_t length) {
 return startOfData;
 } // buildHexData
 
+/**
+* @brief Given an advertising data type, return a string representation of the type.
+*
+* For details see ...
+* https://www.bluetooth.com/specifications/assigned-numbers/generic-access-profile
+*
+* @return A string representation of the type.
+*/
+const char *BLEUtils::advDataTypeToString(uint8_t advType) {
+switch (advType) {
+#if ARDUHAL_LOG_LEVEL >= ARDUHAL_LOG_LEVEL_DEBUG
+case ESP_BLE_AD_TYPE_FLAG: // 0x01
+return "ESP_BLE_AD_TYPE_FLAG";
+case ESP_BLE_AD_TYPE_16SRV_PART: // 0x02
+return "ESP_BLE_AD_TYPE_16SRV_PART";
+case ESP_BLE_AD_TYPE_16SRV_CMPL: // 0x03
+return "ESP_BLE_AD_TYPE_16SRV_CMPL";
+case ESP_BLE_AD_TYPE_32SRV_PART: // 0x04
+return "ESP_BLE_AD_TYPE_32SRV_PART";
+case ESP_BLE_AD_TYPE_32SRV_CMPL: // 0x05
+return "ESP_BLE_AD_TYPE_32SRV_CMPL";
+case ESP_BLE_AD_TYPE_128SRV_PART: // 0x06
+return "ESP_BLE_AD_TYPE_128SRV_PART";
+case ESP_BLE_AD_TYPE_128SRV_CMPL: // 0x07
+return "ESP_BLE_AD_TYPE_128SRV_CMPL";
+case ESP_BLE_AD_TYPE_NAME_SHORT: // 0x08
+return "ESP_BLE_AD_TYPE_NAME_SHORT";
+case ESP_BLE_AD_TYPE_NAME_CMPL: // 0x09
+return "ESP_BLE_AD_TYPE_NAME_CMPL";
+case ESP_BLE_AD_TYPE_TX_PWR: // 0x0a
+return "ESP_BLE_AD_TYPE_TX_PWR";
+case ESP_BLE_AD_TYPE_DEV_CLASS: // 0x0b
+return "ESP_BLE_AD_TYPE_DEV_CLASS";
+case ESP_BLE_AD_TYPE_SM_TK: // 0x10
+return "ESP_BLE_AD_TYPE_SM_TK";
+case ESP_BLE_AD_TYPE_SM_OOB_FLAG: // 0x11
+return "ESP_BLE_AD_TYPE_SM_OOB_FLAG";
+case ESP_BLE_AD_TYPE_INT_RANGE: // 0x12
+return "ESP_BLE_AD_TYPE_INT_RANGE";
+case ESP_BLE_AD_TYPE_SOL_SRV_UUID: // 0x14
+return "ESP_BLE_AD_TYPE_SOL_SRV_UUID";
+case ESP_BLE_AD_TYPE_128SOL_SRV_UUID: // 0x15
+return "ESP_BLE_AD_TYPE_128SOL_SRV_UUID";
+case ESP_BLE_AD_TYPE_SERVICE_DATA: // 0x16
+return "ESP_BLE_AD_TYPE_SERVICE_DATA";
+case ESP_BLE_AD_TYPE_PUBLIC_TARGET: // 0x17
+return "ESP_BLE_AD_TYPE_PUBLIC_TARGET";
+case ESP_BLE_AD_TYPE_RANDOM_TARGET: // 0x18
+return "ESP_BLE_AD_TYPE_RANDOM_TARGET";
+case ESP_BLE_AD_TYPE_APPEARANCE: // 0x19
+return "ESP_BLE_AD_TYPE_APPEARANCE";
+case ESP_BLE_AD_TYPE_ADV_INT: // 0x1a
+return "ESP_BLE_AD_TYPE_ADV_INT";
+case ESP_BLE_AD_TYPE_32SOL_SRV_UUID: // 0x1f
+return "ESP_BLE_AD_TYPE_32SOL_SRV_UUID";
+case ESP_BLE_AD_TYPE_32SERVICE_DATA: // 0x20
+return "ESP_BLE_AD_TYPE_32SERVICE_DATA";
+case ESP_BLE_AD_TYPE_128SERVICE_DATA: // 0x21
+return "ESP_BLE_AD_TYPE_128SERVICE_DATA";
+case ESP_BLE_AD_MANUFACTURER_SPECIFIC_TYPE: // 0xff
+return "ESP_BLE_AD_MANUFACTURER_SPECIFIC_TYPE";
+#endif
+default: log_v(" adv data type: 0x%x", advType); return "";
+} // End switch
+} // advDataTypeToString
 
 /*****************************************************************************
 * Bluedroid functions *
@@ -777,71 +842,6 @@ String BLEUtils::adFlagsToString(uint8_t adFlags) {
 return res;
 } // adFlagsToString
 
-/**
-* @brief Given an advertising type, return a string representation of the type.
-*
-* For details see ...
-* https://www.bluetooth.com/specifications/assigned-numbers/generic-access-profile
-*
-* @return A string representation of the type.
-*/
-const char *BLEUtils::advTypeToString(uint8_t advType) {
-switch (advType) {
-#if ARDUHAL_LOG_LEVEL >= ARDUHAL_LOG_LEVEL_DEBUG
-case ESP_BLE_AD_TYPE_FLAG: // 0x01
-return "ESP_BLE_AD_TYPE_FLAG";
-case ESP_BLE_AD_TYPE_16SRV_PART: // 0x02
-return "ESP_BLE_AD_TYPE_16SRV_PART";
-case ESP_BLE_AD_TYPE_16SRV_CMPL: // 0x03
-return "ESP_BLE_AD_TYPE_16SRV_CMPL";
-case ESP_BLE_AD_TYPE_32SRV_PART: // 0x04
-return "ESP_BLE_AD_TYPE_32SRV_PART";
-case ESP_BLE_AD_TYPE_32SRV_CMPL: // 0x05
-return "ESP_BLE_AD_TYPE_32SRV_CMPL";
-case ESP_BLE_AD_TYPE_128SRV_PART: // 0x06
-return "ESP_BLE_AD_TYPE_128SRV_PART";
-case ESP_BLE_AD_TYPE_128SRV_CMPL: // 0x07
-return "ESP_BLE_AD_TYPE_128SRV_CMPL";
-case ESP_BLE_AD_TYPE_NAME_SHORT: // 0x08
-return "ESP_BLE_AD_TYPE_NAME_SHORT";
-case ESP_BLE_AD_TYPE_NAME_CMPL: // 0x09
-return "ESP_BLE_AD_TYPE_NAME_CMPL";
-case ESP_BLE_AD_TYPE_TX_PWR: // 0x0a
-return "ESP_BLE_AD_TYPE_TX_PWR";
-case ESP_BLE_AD_TYPE_DEV_CLASS: // 0x0b
-return "ESP_BLE_AD_TYPE_DEV_CLASS";
-case ESP_BLE_AD_TYPE_SM_TK: // 0x10
-return "ESP_BLE_AD_TYPE_SM_TK";
-case ESP_BLE_AD_TYPE_SM_OOB_FLAG: // 0x11
-return "ESP_BLE_AD_TYPE_SM_OOB_FLAG";
-case ESP_BLE_AD_TYPE_INT_RANGE: // 0x12
-return "ESP_BLE_AD_TYPE_INT_RANGE";
-case ESP_BLE_AD_TYPE_SOL_SRV_UUID: // 0x14
-return "ESP_BLE_AD_TYPE_SOL_SRV_UUID";
-case ESP_BLE_AD_TYPE_128SOL_SRV_UUID: // 0x15
-return "ESP_BLE_AD_TYPE_128SOL_SRV_UUID";
-case ESP_BLE_AD_TYPE_SERVICE_DATA: // 0x16
-return "ESP_BLE_AD_TYPE_SERVICE_DATA";
-case ESP_BLE_AD_TYPE_PUBLIC_TARGET: // 0x17
-return "ESP_BLE_AD_TYPE_PUBLIC_TARGET";
-case ESP_BLE_AD_TYPE_RANDOM_TARGET: // 0x18
-return "ESP_BLE_AD_TYPE_RANDOM_TARGET";
-case ESP_BLE_AD_TYPE_APPEARANCE: // 0x19
-return "ESP_BLE_AD_TYPE_APPEARANCE";
-case ESP_BLE_AD_TYPE_ADV_INT: // 0x1a
-return "ESP_BLE_AD_TYPE_ADV_INT";
-case ESP_BLE_AD_TYPE_32SOL_SRV_UUID: return "ESP_BLE_AD_TYPE_32SOL_SRV_UUID";
-case ESP_BLE_AD_TYPE_32SERVICE_DATA: // 0x20
-return "ESP_BLE_AD_TYPE_32SERVICE_DATA";
-case ESP_BLE_AD_TYPE_128SERVICE_DATA: // 0x21
-return "ESP_BLE_AD_TYPE_128SERVICE_DATA";
-case ESP_BLE_AD_MANUFACTURER_SPECIFIC_TYPE: // 0xff
-return "ESP_BLE_AD_MANUFACTURER_SPECIFIC_TYPE";
-#endif
-default: log_v(" adv data type: 0x%x", advType); return "";
-} // End switch
-} // advTypeToString
-
 esp_gatt_id_t BLEUtils::buildGattId(esp_bt_uuid_t uuid, uint8_t inst_id) {
 esp_gatt_id_t retGattId;
 retGattId.uuid = uuid;
@@ -2076,31 +2076,6 @@ const char *BLEUtils::returnCodeToString(int rc) {
 #endif // #if defined(CONFIG_NIMBLE_ENABLE_RETURN_CODE_TEXT)
 }
 
-/**
-* @brief Convert the advertising type flag to a string.
-* @param advType The type to convert.
-* @return A string representation of the advertising flags.
-*/
-const char *BLEUtils::advTypeToString(uint8_t advType) {
-#if defined(CONFIG_NIMBLE_ENABLE_ADVERTISMENT_TYPE_TEXT)
-switch (advType) {
-case BLE_HCI_ADV_TYPE_ADV_IND: //0
-return "Undirected - Connectable / Scannable";
-case BLE_HCI_ADV_TYPE_ADV_DIRECT_IND_HD: //1
-return "Directed High Duty - Connectable";
-case BLE_HCI_ADV_TYPE_ADV_SCAN_IND: //2
-return "Non-Connectable - Scan Response Available";
-case BLE_HCI_ADV_TYPE_ADV_NONCONN_IND: //3
-return "Non-Connectable - No Scan Response";
-case BLE_HCI_ADV_TYPE_ADV_DIRECT_IND_LD: //4
-return "Directed Low Duty - Connectable";
-default: return "Unknown flag";
-}
-#else // #if defined(CONFIG_NIMBLE_ENABLE_ADVERTISMENT_TYPE_TEXT)
-return "";
-#endif // #if defined(CONFIG_NIMBLE_ENABLE_ADVERTISMENT_TYPE_TEXT)
-} // adFlagsToString
-
 /**
 * @brief Utility function to log the gap event info.
 * @param [in] event A pointer to the gap event structure.

@@ -62,7 +62,7 @@ class BLEUtils {
 
 static char *buildHexData(uint8_t *target, uint8_t *source, uint8_t length);
 static String buildPrintData(uint8_t *source, size_t length);
-static const char *advTypeToString(uint8_t advType);
+static const char *advDataTypeToString(uint8_t advType);
 static String characteristicPropertiesToString(uint8_t prop);
 
 /***************************************************************************