MirrorSave
/
ESPresense
mirror of https://github.com/ESPresense/ESPresense.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Better fingerprinting

This commit is contained in:
DTTerastar 2021-03-24 13:16:49 -04:00
parent e37dc9af20
commit 78b80be06f
2 changed files with 32 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
lib/BleFingerprint/BleFingerprint.cpp
View File

@ -49,7 +49,6 @@ StaticJsonDocument<500> BleFingerprint::getJson()
BleFingerprint::BleFingerprint(BLEAdvertisedDevice *advertisedDevice, float initalDistance) BleFingerprint::BleFingerprint(BLEAdvertisedDevice *advertisedDevice, float initalDistance)
{ {
String mac_address = advertisedDevice->getAddress().toString().c_str(); String mac_address = advertisedDevice->getAddress().toString().c_str();
mac_address.replace(":", ""); mac_address.replace(":", "");
mac_address.toLowerCase(); mac_address.toLowerCase();
@ -58,41 +57,24 @@ BleFingerprint::BleFingerprint(BLEAdvertisedDevice *advertisedDevice, float init
Serial.print(mac_address); Serial.print(mac_address);
if (advertisedDevice->haveName()) if (advertisedDevice->haveName())
{ name = String(advertisedDevice->getName().c_str());
String nameBLE = String(advertisedDevice->getName().c_str());
Serial.print(", Name: ");
Serial.print(nameBLE);
doc["name"] = nameBLE;
}
id = mac_address;
doc["mac"] = mac_address; doc["mac"] = mac_address;
std::string strServiceData = advertisedDevice->getServiceData(); std::string strServiceData = advertisedDevice->getServiceData();
uint8_t cServiceData[100]; uint8_t cServiceData[100];
strServiceData.copy((char *)cServiceData, strServiceData.length(), 0); strServiceData.copy((char *)cServiceData, strServiceData.length(), 0);
if (advertisedDevice->haveServiceUUID())
{
for (int i = 0; i < advertisedDevice->getServiceUUIDCount(); i++)
{
std::string sid = advertisedDevice->getServiceUUID(i).toString();
Serial.printf(", sID: %s", sid.c_str());
doc["sid" + String(i)] = sid;
}
}
if (advertisedDevice->haveServiceUUID() && advertisedDevice->getServiceDataUUID().equals(BLEUUID(tileUUID)) == true) if (advertisedDevice->haveServiceUUID() && advertisedDevice->getServiceDataUUID().equals(BLEUUID(tileUUID)) == true)
{ {
id = "tile:" + mac_address; id = "tile:" + mac_address;
Serial.print(", Tile"); Serial.printf(", ID: %s", id.c_str());
doc["name"] = "Tile";
setCalRssi(advertisedDevice->haveTXPower() ? (-advertisedDevice->getTXPower()) - 41 : 0); setCalRssi(advertisedDevice->haveTXPower() ? (-advertisedDevice->getTXPower()) - 41 : 0);
} }
else if (advertisedDevice->haveServiceUUID() && advertisedDevice->getServiceDataUUID().equals(BLEUUID(exposureUUID)) == true) else if (advertisedDevice->haveServiceUUID() && advertisedDevice->getServiceDataUUID().equals(BLEUUID(exposureUUID)) == true)
{ // found covid exposure tracker { // found covid exposure tracker
Serial.print(", Exposure");
id = "exp:" + String(strServiceData.length()); id = "exp:" + String(strServiceData.length());
Serial.printf(", ID: %s", id.c_str());
setCalRssi(advertisedDevice->haveTXPower() ? (-advertisedDevice->getTXPower()) - 41 : 0); setCalRssi(advertisedDevice->haveTXPower() ? (-advertisedDevice->getTXPower()) - 41 : 0);
} }
else if (advertisedDevice->haveServiceUUID() && advertisedDevice->getServiceDataUUID().equals(BLEUUID(beaconUUID)) == true) else if (advertisedDevice->haveServiceUUID() && advertisedDevice->getServiceDataUUID().equals(BLEUUID(beaconUUID)) == true)
@ -120,6 +102,15 @@ BleFingerprint::BleFingerprint(BLEAdvertisedDevice *advertisedDevice, float init
} }
else else
{ {
if (advertisedDevice->haveServiceUUID())
{
for (int i = 0; i < advertisedDevice->getServiceUUIDCount(); i++)
{
std::string sid = advertisedDevice->getServiceUUID(i).toString();
Serial.printf(", sID: %s", sid.c_str());
doc["sid" + String(i)] = sid;
}
}
if (advertisedDevice->haveManufacturerData() == true) if (advertisedDevice->haveManufacturerData() == true)
{ {
std::string strManufacturerData = advertisedDevice->getManufacturerData(); std::string strManufacturerData = advertisedDevice->getManufacturerData();
@ -128,6 +119,8 @@ BleFingerprint::BleFingerprint(BLEAdvertisedDevice *advertisedDevice, float init
strManufacturerData.copy((char *)cManufacturerData, strManufacturerData.length(), 0); strManufacturerData.copy((char *)cManufacturerData, strManufacturerData.length(), 0);
char *mdHex = NimBLEUtils::buildHexData(nullptr, (uint8_t *)strManufacturerData.data(), strManufacturerData.length()); char *mdHex = NimBLEUtils::buildHexData(nullptr, (uint8_t *)strManufacturerData.data(), strManufacturerData.length());
doc["md"] = mdHex;
if (strManufacturerData.length() > 2 && cManufacturerData[0] == 0x4C && cManufacturerData[1] == 0x00) // Apple if (strManufacturerData.length() > 2 && cManufacturerData[0] == 0x4C && cManufacturerData[1] == 0x00) // Apple
{ {
if (strManufacturerData.length() == 25 && cManufacturerData[2] == 0x02 && cManufacturerData[3] == 0x15) if (strManufacturerData.length() == 25 && cManufacturerData[2] == 0x02 && cManufacturerData[3] == 0x15)
@ -140,14 +133,11 @@ BleFingerprint::BleFingerprint(BLEAdvertisedDevice *advertisedDevice, float init
int major = ENDIAN_CHANGE_U16(oBeacon.getMajor()); int major = ENDIAN_CHANGE_U16(oBeacon.getMajor());
int minor = ENDIAN_CHANGE_U16(oBeacon.getMinor()); int minor = ENDIAN_CHANGE_U16(oBeacon.getMinor());
Serial.print(", iBeacon: ");
Serial.print(proximityUUID);
Serial.printf("-%d-%d", major, minor);
doc["major"] = major; doc["major"] = major;
doc["minor"] = minor; doc["minor"] = minor;
id = proximityUUID + "-" + String(major) + "-" + String(minor); id = "iBeacon:" + proximityUUID + "-" + String(major) + "-" + String(minor);
Serial.printf(", ID: %s", id.c_str());
setCalRssi(oBeacon.getSignalPower()); setCalRssi(oBeacon.getSignalPower());
} }
else else
@ -157,19 +147,21 @@ BleFingerprint::BleFingerprint(BLEAdvertisedDevice *advertisedDevice, float init
fingerprint = fingerprint + String(-advertisedDevice->getTXPower()); fingerprint = fingerprint + String(-advertisedDevice->getTXPower());
id = fingerprint; id = fingerprint;
Serial.printf(", ID: %s", id.c_str());
Serial.printf(", Fingerprint: %s", fingerprint.c_str());
setCalRssi(advertisedDevice->haveTXPower() ? (-advertisedDevice->getTXPower()) - 41 : 0); setCalRssi(advertisedDevice->haveTXPower() ? (-advertisedDevice->getTXPower()) - 41 : 0);
} }
} }
else else
{ {
if (advertisedDevice->haveTXPower()) if (strManufacturerData.length() > 2)
doc["txPower"] = -advertisedDevice->getTXPower(); {
String fingerprint = "md:" + String(mdHex).substring(2, 4) + String(mdHex).substring(0, 2) + ":" + String(strManufacturerData.length());
Serial.print(", MD: "); if (advertisedDevice->haveTXPower())
for (int x = 0; x < strManufacturerData.length(); x++) fingerprint = fingerprint + String(-advertisedDevice->getTXPower());
Serial.print(strManufacturerData[x], HEX); id = fingerprint;
Serial.printf(", ID: %s", id.c_str());
}
setCalRssi(advertisedDevice->haveTXPower() ? (-advertisedDevice->getTXPower()) - 41 : 0); setCalRssi(advertisedDevice->haveTXPower() ? (-advertisedDevice->getTXPower()) - 41 : 0);
} }
@ -213,8 +205,13 @@ void BleFingerprint::report(BLEAdvertisedDevice *advertisedDevice)
//Serial.printf(", RSSI: %d (@1m %d)", rssi, calRssi); //Serial.printf(", RSSI: %d (@1m %d)", rssi, calRssi);
//Serial.printf(", Dist: %.1f (orig %.1f)", distance, original); //Serial.printf(", Dist: %.1f (orig %.1f)", distance, original);
//Serial.println(); //Serial.println();
if (id == nullptr && name == nullptr)
return;
doc["id"] = id; if (id != nullptr)
doc["id"] = id;
if (name != nullptr)
doc["name"] = name;
doc["rssi@1m"] = calRssi; doc["rssi@1m"] = calRssi;
doc["rssi"] = rssi; doc["rssi"] = rssi;
doc["raw"] = round(raw * 100.0f) / 100.0f; doc["raw"] = round(raw * 100.0f) / 100.0f;

3
lib/BleFingerprint/BleFingerprint.h
View File

@ -23,7 +23,7 @@ public:
StaticJsonDocument<500> getJson(); StaticJsonDocument<500> getJson();
private: private:
String id; String id, name;
int rssi, calRssi; int rssi, calRssi;
float raw; float raw;
Reading<Differential<float>> output; Reading<Differential<float>> output;
@ -35,5 +35,4 @@ private:
StaticJsonDocument<500> doc; StaticJsonDocument<500> doc;
unsigned long lastReading = 0; unsigned long lastReading = 0;
}; };
#endif #endif