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

Start of removing NimBLEAddress from fingerprint

This commit is contained in:
DTTerastar 2023-08-22 07:13:46 -04:00
parent 24c7fbb2fe
commit 83b1622fc9
3 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
lib/BleFingerprint/BleFingerprint.cpp
View File

@ -74,7 +74,10 @@ int BleFingerprint::get1mRssi() const {
BleFingerprint::BleFingerprint(BLEAdvertisedDevice *advertisedDevice, float fcmin, float beta, float dcutoff) : oneEuro{OneEuroFilter<float, unsigned long>(1, fcmin, beta, dcutoff)} { BleFingerprint::BleFingerprint(BLEAdvertisedDevice *advertisedDevice, float fcmin, float beta, float dcutoff) : oneEuro{OneEuroFilter<float, unsigned long>(1, fcmin, beta, dcutoff)} {
firstSeenMillis = millis(); firstSeenMillis = millis();
address = NimBLEAddress(advertisedDevice->getAddress());
auto native = advertisedDevice->getAddress().getNative();
memcpy(address, native, 6);
addressType = advertisedDevice->getAddressType(); addressType = advertisedDevice->getAddressType();
newest = recent = oldest = rssi = advertisedDevice->getRSSI(); newest = recent = oldest = rssi = advertisedDevice->getRSSI();
seenCount = 1; seenCount = 1;
@ -91,10 +94,10 @@ void BleFingerprint::fingerprint(NimBLEAdvertisedDevice *advertisedDevice) {
if (advertisedDevice->getAdvType() > 0) if (advertisedDevice->getAdvType() > 0)
connectable = true; connectable = true;
size_t serviceAdvCount = advertisedDevice->getServiceUUIDCount(); const size_t serviceAdvCount = advertisedDevice->getServiceUUIDCount();
size_t serviceDataCount = advertisedDevice->getServiceDataCount(); const size_t serviceDataCount = advertisedDevice->getServiceDataCount();
bool haveTxPower = advertisedDevice->haveTXPower(); const bool haveTxPower = advertisedDevice->haveTXPower();
int8_t txPower = advertisedDevice->getTXPower(); const int8_t txPower = advertisedDevice->getTXPower();
if (serviceAdvCount > 0) fingerprintServiceAdvertisements(advertisedDevice, serviceAdvCount, haveTxPower, txPower); if (serviceAdvCount > 0) fingerprintServiceAdvertisements(advertisedDevice, serviceAdvCount, haveTxPower, txPower);
if (serviceDataCount > 0) fingerprintServiceData(advertisedDevice, serviceDataCount, haveTxPower, txPower); if (serviceDataCount > 0) fingerprintServiceData(advertisedDevice, serviceDataCount, haveTxPower, txPower);
@ -167,7 +170,7 @@ void BleFingerprint::fingerprintAddress() {
break; break;
case BLE_ADDR_RANDOM: case BLE_ADDR_RANDOM:
case BLE_ADDR_RANDOM_ID: { case BLE_ADDR_RANDOM_ID: {
const auto *naddress = address.getNative(); const auto *naddress = address;
if ((naddress[5] & 0xc0) == 0xc0) if ((naddress[5] & 0xc0) == 0xc0)
setId(mac, ID_TYPE_RAND_STATIC_MAC); setId(mac, ID_TYPE_RAND_STATIC_MAC);
else { else {
@ -460,7 +463,7 @@ void BleFingerprint::fill(JsonObject *doc) {
(*doc)[F("raw")] = serialized(String(raw, 2)); (*doc)[F("raw")] = serialized(String(raw, 2));
(*doc)[F("distance")] = serialized(String(output.value.position, 2)); (*doc)[F("distance")] = serialized(String(output.value.position, 2));
(*doc)[F("speed")] = serialized(String(output.value.speed * 1e3f, 2)); (*doc)[F("speed")] = serialized(String(output.value.speed * 1e3f, 2));
(*doc)[F("mac")] = SMacf(address); (*doc)[F("mac")] = getMac();
if (close) (*doc)[F("close")] = true; if (close) (*doc)[F("close")] = true;
(*doc)[F("interval")] = (millis() - firstSeenMillis) / seenCount; (*doc)[F("interval")] = (millis() - firstSeenMillis) / seenCount;

6
lib/BleFingerprint/BleFingerprint.h
View File

@ -84,7 +84,7 @@ public:
void setInitial(int rssi, float distance); void setInitial(int rssi, float distance);
String getMac() const { return SMacf(address); } const String getMac() const { return Sprintf("%02x%02x%02x%02x%02x%02x", address[0], address[1], address[2], address[3], address[4], address[5]); }
short getIdType() const { return idType; } short getIdType() const { return idType; }
@ -100,7 +100,7 @@ public:
void set1mRssi(int8_t rssi) { this->calRssi = rssi; } void set1mRssi(int8_t rssi) { this->calRssi = rssi; }
NimBLEAddress const getAddress() { return address; } const uint8_t* getAddress() const { return reinterpret_cast<const uint8_t*>(address); }
unsigned long getMsSinceLastSeen() const { return lastSeenMillis ? millis() - lastSeenMillis : 4294967295; }; unsigned long getMsSinceLastSeen() const { return lastSeenMillis ? millis() - lastSeenMillis : 4294967295; };
@ -136,7 +136,7 @@ private:
static bool shouldHide(const String &s); static bool shouldHide(const String &s);
bool hasValue = false, added = false, close = false, reported = false, ignore = false, allowQuery = false, isQuerying = false, hidden = false, connectable = false, countable = false, counting = false; bool hasValue = false, added = false, close = false, reported = false, ignore = false, allowQuery = false, isQuerying = false, hidden = false, connectable = false, countable = false, counting = false;
NimBLEAddress address; uint8_t address[6];
String id, name, disc; String id, name, disc;
short int idType = NO_ID_TYPE; short int idType = NO_ID_TYPE;
int rssi = NO_RSSI, newest = NO_RSSI, recent = NO_RSSI, oldest = NO_RSSI; int rssi = NO_RSSI, newest = NO_RSSI, recent = NO_RSSI, oldest = NO_RSSI;

2
lib/BleFingerprint/BleFingerprintCollection.cpp
View File

@ -184,7 +184,7 @@ void CleanupOldFingerprints() {
} }
BleFingerprint *getFingerprintInternal(BLEAdvertisedDevice *advertisedDevice) { BleFingerprint *getFingerprintInternal(BLEAdvertisedDevice *advertisedDevice) {
auto mac = advertisedDevice->getAddress(); auto mac = advertisedDevice->getAddress().getNative();
auto it = std::find_if(fingerprints.rbegin(), fingerprints.rend(), [mac](BleFingerprint *f) { return f->getAddress() == mac; }); auto it = std::find_if(fingerprints.rbegin(), fingerprints.rend(), [mac](BleFingerprint *f) { return f->getAddress() == mac; });
if (it != fingerprints.rend()) if (it != fingerprints.rend())