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

Fix minor fingerprint error ("empty sd:") as well as auto update

This commit is contained in:
DTTerastar 2022-07-08 10:22:21 -04:00
parent 5db1804cc4
commit 7d4ddc8eb0
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/BleFingerprint/BleFingerprint.cpp
View File

@ -189,7 +189,7 @@ void BleFingerprint::fingerprintServiceAdvertisements(NimBLEAdvertisedDevice *ad
void BleFingerprint::fingerprintServiceData(NimBLEAdvertisedDevice *advertisedDevice, size_t serviceDataCount, bool haveTxPower, int8_t txPower)
{
asRssi = haveTxPower ? BleFingerprintCollection::refRssi + txPower : NO_RSSI;
String fingerprint = "sd:";
String fingerprint = "";
for (int i = 0; i < serviceDataCount; i++)
{
BLEUUID uuid = advertisedDevice->getServiceDataUUID(i);
@ -275,9 +275,11 @@ void BleFingerprint::fingerprintServiceData(NimBLEAdvertisedDevice *advertisedDe
fingerprint = fingerprint + uuid.toString().c_str();
}
}
if (haveTxPower)
fingerprint = fingerprint + String(-txPower);
setId(fingerprint, ID_TYPE_SD);
if (!fingerprint.isEmpty())
{
if (haveTxPower) fingerprint = fingerprint + String(-txPower);
setId("sd:" + fingerprint, ID_TYPE_SD);
}
}
void BleFingerprint::fingerprintManufactureData(NimBLEAdvertisedDevice *advertisedDevice, bool haveTxPower, int8_t txPower)

1
src/main.h
View File

@ -198,6 +198,7 @@ void firmwareUpdate()
#endif
updateInProgress = true;
mqttClient.disconnect();
NimBLEDevice::getScan()->stop();
fingerprints.setDisable(updateInProgress);
GUI::updateStart();