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

Add trackr support (#121) 

* Don't use md:0000 id
* Add trackr support
This commit is contained in:
Darrell 2021-11-11 07:32:12 -05:00 committed by GitHub
parent e669a2a90b
commit 5e64649e81
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/BleFingerprint/BleFingerprint.cpp
View File

@ -67,6 +67,11 @@ void BleFingerprint::fingerprint(BLEAdvertisedDevice *advertisedDevice)
asRssi = _parent->getRefRssi() + (advertisedDevice->haveTXPower() ? advertisedDevice->getTXPower() : ITAG_TX);
setId("itag:" + getMac(), ID_TYPE_ITAG);
}
else if (advertisedDevice->isAdvertisingService(trackrUUID))
{
asRssi = advertisedDevice->haveTXPower() ? _parent->getRefRssi() + advertisedDevice->getTXPower() : NO_RSSI;
setId("trackr:" + getMac(), ID_TYPE_TRACKR);
}
else if (advertisedDevice->isAdvertisingService(meaterService))
{
asRssi = advertisedDevice->haveTXPower() ? _parent->getRefRssi() + advertisedDevice->getTXPower() : NO_RSSI;
@ -235,7 +240,7 @@ void BleFingerprint::fingerprint(BLEAdvertisedDevice *advertisedDevice)
mdRssi = advertisedDevice->haveTXPower() ? _parent->getRefRssi() + advertisedDevice->getTXPower() : NO_RSSI;
setId("samsung:" + getMac(), ID_TYPE_MISC);
}
else
else if (manuf != "0000")
{
mdRssi = advertisedDevice->haveTXPower() ? _parent->getRefRssi() + advertisedDevice->getTXPower() : NO_RSSI;
String fingerprint = Sprintf("md:%s:%d", manuf.c_str(), strManufacturerData.length());

5
lib/BleFingerprint/BleFingerprint.h
View File

@ -25,8 +25,9 @@
#define ID_TYPE_MIFIT short(15)
#define ID_TYPE_EXPOSURE short(16)
#define ID_TYPE_ITAG short(17)
#define ID_TYPE_TILE short(18)
#define ID_TYPE_MEATER short(19)
#define ID_TYPE_TRACKR short(18)
#define ID_TYPE_TILE short(19)
#define ID_TYPE_MEATER short(20)
#define ID_TYPE_APPLE_NEARBY short(35)
#define ID_TYPE_APPLE_MODEL short(40)
#define ID_TYPE_APPLE_NAME short(50)

1
lib/BleFingerprint/util.h
View File

@ -10,6 +10,7 @@ static BLEUUID exposureUUID((uint16_t)0xFD6F);
static BLEUUID sonosUUID((uint16_t)0xFE07);
static BLEUUID itagUUID((uint16_t)0xffe0);
static BLEUUID miThermUUID(uint16_t(0x181A));
static BLEUUID trackrUUID((uint16_t)0x0F3E);
static BLEUUID fitbitUUID(0xadabfb00, 0x6e7d, 0x4601, 0xbda2bffaa68956ba);