From 66fe3a93e10e45bbd3f236f30d555a4305853076 Mon Sep 17 00:00:00 2001 From: Ashley Gittins Date: Thu, 12 Oct 2023 04:25:31 +0000 Subject: [PATCH] (fix) Still breaking head against adv logic --- custom_components/bermuda/__init__.py | 28 ++++++++++++++++++++++----- 1 file changed, 23 insertions(+), 5 deletions(-) diff --git a/custom_components/bermuda/__init__.py b/custom_components/bermuda/__init__.py index 762613f..c0c096f 100644 --- a/custom_components/bermuda/__init__.py +++ b/custom_components/bermuda/__init__.py @@ -544,11 +544,29 @@ def _refresh_area_by_min_distance(self, device: BermudaDevice): if scanner.rssi_distance < self.options.get( CONF_MAX_RADIUS, DEFAULT_MAX_RADIUS ): # It's inside max_radius... - if closest_scanner is None or ( - scanner.rssi_distance < closest_scanner.rssi_distance - or scanner.stamp > closest_scanner.stamp - ADVERT_FRESHTIME - ): # This scanner is closer, and the advert is still fresh in comparison.. - closest_scanner = scanner + if closest_scanner is None: + # no encumbent, we win! (unless we don't have a stamp to validate our claim) + # FIXME: This effectively excludes HCI/usb adaptors currently since we + # haven't found a way to get ad timestamps from HA's bluez yet. + if scanner.stamp > 0: + closest_scanner = scanner + else: + # is it fresh enough to win on proximity alone? + is_fresh_enough = ( + scanner.stamp > closest_scanner.stamp - ADVERT_FRESHTIME + ) + # is it so much fresher that it wins outright? + is_fresher = ( + scanner.stamp > closest_scanner.stamp + ADVERT_FRESHTIME + ) + # is it closer? + is_closer = scanner.rssi_distance < closest_scanner.rssi_distance + + if is_fresher or ( + is_closer and is_fresh_enough + ): # This scanner is closer, and the advert is still fresh in comparison.. + closest_scanner = scanner + if closest_scanner is not None: # We found a winner old_area = device.area_name