Discovery responses now match to the exact repeater based on full key

Removed error log that displayed dropped packets based on user filter
Added debug logs around distance measuring
Bluetooth timeout after 15 seconds now provides a clean, user-friendly message

Author: MrAlders0n

.claude/settings.local.json

@@ -33,7 +33,8 @@
       "Bash(flutter test:*)",
       "WebFetch(domain:raw.githubusercontent.com)",
       "Bash(file:*)",
-      "Bash(wc:*)"
+      "Bash(wc:*)",
+      "Bash(xargs cat:*)"
     ]
   }
 }

android/local.properties

@@ -2,4 +2,4 @@ sdk.dir=/opt/homebrew/share/android-commandlinetools
 flutter.sdk=/opt/homebrew/share/flutter
 flutter.buildMode=release
 flutter.versionName=1.0.0
-flutter.versionCode=1770694673
+flutter.versionCode=1770696177

debuglog/meshmapper-debug-1770323201.txt

@@ -5,10 +5,10 @@ COCOAPODS_PARALLEL_CODE_SIGN=true
 FLUTTER_TARGET=lib/main.dart
 FLUTTER_BUILD_DIR=build
 FLUTTER_BUILD_NAME=1.0.0
-FLUTTER_BUILD_NUMBER=1770694673
+FLUTTER_BUILD_NUMBER=1770696177
 EXCLUDED_ARCHS[sdk=iphonesimulator*]=i386
 EXCLUDED_ARCHS[sdk=iphoneos*]=armv7
-DART_DEFINES=QVBQX1ZFUlNJT049QVBQLTE3NzA2OTQ2NzM=,RkxVVFRFUl9WRVJTSU9OPTMuMzguOQ==,RkxVVFRFUl9DSEFOTkVMPXN0YWJsZQ==,RkxVVFRFUl9HSVRfVVJMPWh0dHBzOi8vZ2l0aHViLmNvbS9mbHV0dGVyL2ZsdXR0ZXIuZ2l0,RkxVVFRFUl9GUkFNRVdPUktfUkVWSVNJT049NjczMjNkZTI4NQ==,RkxVVFRFUl9FTkdJTkVfUkVWSVNJT049NTg3YzE4Zjg3Mw==,RkxVVFRFUl9EQVJUX1ZFUlNJT049My4xMC44
+DART_DEFINES=QVBQX1ZFUlNJT049QVBQLTE3NzA2OTYxNzc=,RkxVVFRFUl9WRVJTSU9OPTMuMzguOQ==,RkxVVFRFUl9DSEFOTkVMPXN0YWJsZQ==,RkxVVFRFUl9HSVRfVVJMPWh0dHBzOi8vZ2l0aHViLmNvbS9mbHV0dGVyL2ZsdXR0ZXIuZ2l0,RkxVVFRFUl9GUkFNRVdPUktfUkVWSVNJT049NjczMjNkZTI4NQ==,RkxVVFRFUl9FTkdJTkVfUkVWSVNJT049NTg3YzE4Zjg3Mw==,RkxVVFRFUl9EQVJUX1ZFUlNJT049My4xMC44
 DART_OBFUSCATION=false
 TRACK_WIDGET_CREATION=false
 TREE_SHAKE_ICONS=true

debuglog/meshmapper-debug-1770757854.txt

@@ -6,8 +6,8 @@ export "COCOAPODS_PARALLEL_CODE_SIGN=true"
 export "FLUTTER_TARGET=lib/main.dart"
 export "FLUTTER_BUILD_DIR=build"
 export "FLUTTER_BUILD_NAME=1.0.0"
-export "FLUTTER_BUILD_NUMBER=1770694673"
-export "DART_DEFINES=QVBQX1ZFUlNJT049QVBQLTE3NzA2OTQ2NzM=,RkxVVFRFUl9WRVJTSU9OPTMuMzguOQ==,RkxVVFRFUl9DSEFOTkVMPXN0YWJsZQ==,RkxVVFRFUl9HSVRfVVJMPWh0dHBzOi8vZ2l0aHViLmNvbS9mbHV0dGVyL2ZsdXR0ZXIuZ2l0,RkxVVFRFUl9GUkFNRVdPUktfUkVWSVNJT049NjczMjNkZTI4NQ==,RkxVVFRFUl9FTkdJTkVfUkVWSVNJT049NTg3YzE4Zjg3Mw==,RkxVVFRFUl9EQVJUX1ZFUlNJT049My4xMC44"
+export "FLUTTER_BUILD_NUMBER=1770696177"
+export "DART_DEFINES=QVBQX1ZFUlNJT049QVBQLTE3NzA2OTYxNzc=,RkxVVFRFUl9WRVJTSU9OPTMuMzguOQ==,RkxVVFRFUl9DSEFOTkVMPXN0YWJsZQ==,RkxVVFRFUl9HSVRfVVJMPWh0dHBzOi8vZ2l0aHViLmNvbS9mbHV0dGVyL2ZsdXR0ZXIuZ2l0,RkxVVFRFUl9GUkFNRVdPUktfUkVWSVNJT049NjczMjNkZTI4NQ==,RkxVVFRFUl9FTkdJTkVfUkVWSVNJT049NTg3YzE4Zjg3Mw==,RkxVVFRFUl9EQVJUX1ZFUlNJT049My4xMC44"
 export "DART_OBFUSCATION=false"
 export "TRACK_WIDGET_CREATION=false"
 export "TREE_SHAKE_ICONS=true"

ios/Flutter/Generated.xcconfig

@@ -202,13 +202,15 @@ class DiscoveredNodeEntry {
   final double localSnr;        // SNR as seen by local device (dB)
   final int localRssi;          // RSSI as seen by local device (dBm)
   final double remoteSnr;       // SNR as seen by remote node (dB)
+  final String? pubkeyHex;      // Full public key hex (64 chars) for exact repeater matching
 
   DiscoveredNodeEntry({
     required this.repeaterId,
     required this.nodeType,
     required this.localSnr,
     required this.localRssi,
     required this.remoteSnr,
+    this.pubkeyHex,
   });
 
   /// Get short display label: "(R)" for REPEATER, "(RM)" for ROOM

ios/Flutter/flutter_export_environment.sh

@@ -49,10 +49,16 @@ class MarkerRepeaterInfo extends HiveObject {
   @HiveField(2)
   final int rssi;
 
+  /// Full public key hex from DISC responses (64 chars) for exact repeater matching.
+  /// Null for TX/RX pings which only have 1-byte IDs.
+  @HiveField(3)
+  final String? pubkeyHex;
+
   MarkerRepeaterInfo({
     required this.repeaterId,
     required this.snr,
     required this.rssi,
+    this.pubkeyHex,
   });
 }
 

lib/models/log_entry.dart

@@ -1223,6 +1223,7 @@ class AppStateProvider extends ChangeNotifier with WidgetsBindingObserver {
               repeaterId: n.repeaterId,
               snr: n.localSnr,
               rssi: n.localRssi,
+              pubkeyHex: n.pubkeyHex,
             )).toList();
           }
         }
@@ -1338,7 +1339,12 @@ class AppStateProvider extends ChangeNotifier with WidgetsBindingObserver {
         }
       } else {
         _isAuthError = false;
-        _connectionError = errorStr.replaceFirst('Exception: ', '');
+        // Provide clean user-facing messages for common BLE errors
+        if (errorStr.contains('timeout') || errorStr.contains('Timeout') || errorStr.contains('timed out')) {
+          _connectionError = 'Bluetooth connection scan timed out';
+        } else {
+          _connectionError = errorStr.replaceFirst('Exception: ', '');
+        }
       }
       _connectionStep = ConnectionStep.error;
       notifyListeners();