smarthome/esphome
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

wip

Browse Source
This commit is contained in:
Maxim Slipenko 2023-12-30 18:50:12 +03:00
parent d021d7c29d
commit 4dbb575a15
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
components/esp32_presense/BleFingerprint.cpp
View File

@ -19,7 +19,7 @@ class ClientCallbacks : public BLEClientCallbacks {
static ClientCallbacks clientCB; static ClientCallbacks clientCB;
BleFingerprint::BleFingerprint(BLEAdvertisedDevice *advertisedDevice, float fcmin, float beta, float dcutoff) : filteredDistance{FilteredDistance(fcmin, beta, dcutoff)} { BleFingerprint::BleFingerprint(BLEAdvertisedDevice *advertisedDevice, float fcmin, float beta, float dcutoff) : filteredDistance{FilteredDistance(fcmin, beta, dcutoff)} {
firstSeenMillis = millis(); firstSeenMillis = esphome::millis();
address = NimBLEAddress(advertisedDevice->getAddress()); address = NimBLEAddress(advertisedDevice->getAddress());
addressType = advertisedDevice->getAddressType(); addressType = advertisedDevice->getAddressType();
rssi = advertisedDevice->getRSSI(); rssi = advertisedDevice->getRSSI();
@ -70,10 +70,10 @@ bool BleFingerprint::setId(const std::string &newId, short newIdType, const std:
qryAttempts = 0; qryAttempts = 0;
if (rssi < -80) { if (rssi < -80) {
qryDelayMillis = 30000; qryDelayMillis = 30000;
lastQryMillis = millis(); lastQryMillis = esphome::millis();
} else if (rssi < -70) { } else if (rssi < -70) {
qryDelayMillis = 5000; qryDelayMillis = 5000;
lastQryMillis = millis(); lastQryMillis = esphome::millis();
} }
} }
} }
@ -411,7 +411,7 @@ void BleFingerprint::fingerprintManufactureData(NimBLEAdvertisedDevice *advertis
} }
bool BleFingerprint::seen(BLEAdvertisedDevice *advertisedDevice) { bool BleFingerprint::seen(BLEAdvertisedDevice *advertisedDevice) {
lastSeenMillis = millis(); lastSeenMillis = esphome::millis();
reported = false; reported = false;
seenCount++; seenCount++;
@ -465,7 +465,7 @@ bool BleFingerprint::report(JsonObject *doc) {
if (maxDistance > 0 && dist > maxDistance) if (maxDistance > 0 && dist > maxDistance)
return false; return false;
auto now = millis(); auto now = esphome::millis();
if ((abs(dist - lastReported) < BleFingerprintCollection::skipDistance) && (lastReportedMillis > 0) && (now - lastReportedMillis < BleFingerprintCollection::skipMs)) if ((abs(dist - lastReported) < BleFingerprintCollection::skipDistance) && (lastReportedMillis > 0) && (now - lastReportedMillis < BleFingerprintCollection::skipMs))
return false; return false;
@ -483,7 +483,7 @@ bool BleFingerprint::query() {
if (!allowQuery || isQuerying) return false; if (!allowQuery || isQuerying) return false;
if (rssi < -90) return false; // Too far away if (rssi < -90) return false; // Too far away
auto now = millis(); auto now = esphome::millis();
if (now - lastSeenMillis > 5) return false; // Haven't seen lately if (now - lastSeenMillis > 5) return false; // Haven't seen lately
if (now - lastQryMillis < qryDelayMillis) return false; // Too soon if (now - lastQryMillis < qryDelayMillis) return false; // Too soon

2
components/esp32_presense/BleFingerprint.h
View File

@ -20,8 +20,6 @@
#include "esphome/core/time.h" #include "esphome/core/time.h"
#define TAG "esp32_presense" #define TAG "esp32_presense"
#define millis esphome::millis
// #define delay esphome::delay
#define NO_RSSI int8_t(-128) #define NO_RSSI int8_t(-128)