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

Make include, exclude, count prefixes NOT substring matches (#670)

This commit is contained in:
Darrell 2022-09-12 18:35:30 -04:00 committed by GitHub
parent b8a06a7f80
commit 05b37ba7ce
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/BleFingerprint/BleFingerprint.cpp
View File

@ -650,7 +650,7 @@ bool BleFingerprint::shouldCount()
bool prevCounting = counting; bool prevCounting = counting;
if (ignore || !countable || !hasValue) if (ignore || !countable || !hasValue)
counting = false; counting = false;
else if (getMsSinceFirstSeen() <= BleFingerprintCollection::countMs || getMsSinceLastSeen() > BleFingerprintCollection::countMs) else if (getMsSinceLastSeen() > BleFingerprintCollection::countMs)
counting = false; counting = false;
else if (counting && output.value.position > BleFingerprintCollection::countExit) else if (counting && output.value.position > BleFingerprintCollection::countExit)
counting = false; counting = false;

4
lib/BleFingerprint/string_utils.cpp
View File

@ -125,12 +125,12 @@ bool prefixExists(const String &prefixes, const String &s)
if (space > start) if (space > start)
{ {
auto sub = prefixes.substring(start, space); auto sub = prefixes.substring(start, space);
if (s.indexOf(sub) != -1) return true; if (s.indexOf(sub) == 0) return true;
} }
start = space + 1; start = space + 1;
} }
auto sub = prefixes.substring(start); auto sub = prefixes.substring(start);
return !sub.isEmpty() && s.indexOf(sub) != -1; return !sub.isEmpty() && s.indexOf(sub) == 0;
} }
bool spurt(const String &fn, const String &content) bool spurt(const String &fn, const String &content)