From 8222d1a1335314c56d9ffae1b09d898cf84a9e14 Mon Sep 17 00:00:00 2001
From: Darrell <DT@Terastar.biz>
Date: Thu, 31 Mar 2022 16:59:37 -0400
Subject: [PATCH] Use only unique portion of advertisement (#431)

---
 lib/BleFingerprint/BleFingerprint.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/BleFingerprint/BleFingerprint.cpp b/lib/BleFingerprint/BleFingerprint.cpp
index fc85b8a..fa3dcc5 100644
--- a/lib/BleFingerprint/BleFingerprint.cpp
+++ b/lib/BleFingerprint/BleFingerprint.cpp
@@ -189,10 +189,10 @@ void BleFingerprint::fingerprintServiceData(NimBLEAdvertisedDevice *advertisedDe
             setId("exp:" + String(strServiceData.length()), ID_TYPE_EXPOSURE);
             disc = hexStr(strServiceData).c_str();
         }
-        else if (uuid == smartTagUUID)
+        else if (uuid == smartTagUUID && strServiceData.length() == 20)
         { // found Samsung smart tag
             asRssi = haveTxPower ? BleFingerprintCollection::refRssi + txPower : NO_RSSI;
-            setId(String("smarttag:") + hexStr(strServiceData).c_str(), ID_TYPE_SMARTTAG);
+            setId(String("smarttag:") + hexStr(strServiceData).substr(8, 16).c_str(), ID_TYPE_SMARTTAG);
         }
         else if (uuid == miThermUUID)
         {