Multi-hop CARpeater packets now strip the CARpeater hop and report coverage from the underlying repeater with null SNR/RSSI, instead of being dropped entirely. Single-hop packets and discovery responses are still dropped. The -30 dBm failsafe is bypassed for packets matching your CARpeater prefix but stays active for everything else.

Author: MrAlders0n

.build_version

@@ -1 +1 @@
-1.0.1
+1.1.0

lib/models/log_entry.dart

@@ -31,29 +31,31 @@ class TxLogEntry {
   String toCsv() {
     final eventsStr = events.isEmpty
         ? 'None'
-        : events.map((e) => '${e.repeaterId}(${e.snr.toStringAsFixed(2)})').join(',');
+        : events.map((e) => e.snr != null ? '${e.repeaterId}(${e.snr!.toStringAsFixed(2)})' : '${e.repeaterId}(null)').join(',');
     return '${timestamp.toIso8601String()},$latitude,$longitude,$power,$eventsStr';
   }
 }
 
 /// RX Event (repeater that heard a TX ping)
 class RxEvent {
   final String repeaterId; // Hex ID (e.g., "4e", "b7")
-  final double snr; // Signal-to-noise ratio in dB
-  final int rssi; // RSSI in dBm
+  final double? snr; // Signal-to-noise ratio in dB (null for CARpeater pass-through)
+  final int? rssi; // RSSI in dBm (null for CARpeater pass-through)
 
   RxEvent({
     required this.repeaterId,
-    required this.snr,
-    this.rssi = 0,
+    this.snr,
+    this.rssi,
   });
 
   /// Get SNR color severity (red, orange, green)
+  /// Returns null for CARpeater pass-through (no signal data)
   /// Reference: getSnrSeverityClass() in wardrive.js
-  SnrSeverity get severity {
-    if (snr <= -1) {
+  SnrSeverity? get severity {
+    if (snr == null) return null;
+    if (snr! <= -1) {
       return SnrSeverity.poor; // Red: -12 to -1 dB
-    } else if (snr <= 5) {
+    } else if (snr! <= 5) {
       return SnrSeverity.fair; // Orange: 0 to 5 dB
     } else {
       return SnrSeverity.good; // Green: 6 to 13+ dB
@@ -66,8 +68,8 @@ class RxEvent {
 class RxLogEntry {
   final DateTime timestamp;
   final String repeaterId; // Hex ID (e.g., "4e", "b7")
-  final double snr; // Signal-to-noise ratio in dB
-  final int rssi; // Received signal strength indicator in dBm
+  final double? snr; // Signal-to-noise ratio in dB (null for CARpeater pass-through)
+  final int? rssi; // Received signal strength indicator in dBm (null for CARpeater pass-through)
   final int pathLength; // Number of hops
   final int header; // Packet header byte
   final double latitude;
@@ -76,8 +78,8 @@ class RxLogEntry {
   RxLogEntry({
     required this.timestamp,
     required this.repeaterId,
-    required this.snr,
-    required this.rssi,
+    this.snr,
+    this.rssi,
     required this.pathLength,
     required this.header,
     required this.latitude,
@@ -97,10 +99,12 @@ class RxLogEntry {
   }
 
   /// Get SNR color severity
-  SnrSeverity get severity {
-    if (snr <= -1) {
+  /// Returns null for CARpeater pass-through (no signal data)
+  SnrSeverity? get severity {
+    if (snr == null) return null;
+    if (snr! <= -1) {
       return SnrSeverity.poor;
-    } else if (snr <= 5) {
+    } else if (snr! <= 5) {
       return SnrSeverity.fair;
     } else {
       return SnrSeverity.good;
@@ -109,7 +113,7 @@ class RxLogEntry {
 
   /// Get CSV row
   String toCsv() {
-    return '${timestamp.toIso8601String()},$repeaterId,$snr,$rssi,'
+    return '${timestamp.toIso8601String()},$repeaterId,${snr ?? 'null'},${rssi ?? 'null'},'
         '$pathLength,0x${header.toRadixString(16).padLeft(2, '0')},'
         '$latitude,$longitude';
   }

lib/models/ping_data.dart

@@ -111,14 +111,14 @@ class RxPing {
 /// Repeater that heard a TX ping (from echo tracking)
 class HeardRepeater {
   final String repeaterId; // Hex ID (e.g., "4e", "77")
-  final double snr; // Best SNR observed
-  final int rssi; // RSSI in dBm
+  final double? snr; // Best SNR observed (null for CARpeater pass-through)
+  final int? rssi; // RSSI in dBm (null for CARpeater pass-through)
   final int seenCount; // How many times this repeater was heard
 
   const HeardRepeater({
     required this.repeaterId,
-    required this.snr,
-    this.rssi = 0,
+    this.snr,
+    this.rssi,
     this.seenCount = 1,
   });
 }

lib/providers/app_state_provider.dart

@@ -1129,7 +1129,7 @@ class AppStateProvider extends ChangeNotifier with WidgetsBindingObserver {
       // Handle real-time echo updates - update TxLogEntry as echoes are received
       _pingService!.onEchoReceived = (txPing, repeater, isNew) {
         debugLog('[APP] ========== ECHO CALLBACK RECEIVED ==========');
-        debugLog('[APP] Real-time echo: ${repeater.repeaterId} (SNR: ${repeater.snr}, isNew: $isNew)');
+        debugLog('[APP] Real-time echo: ${repeater.repeaterId} (SNR: ${repeater.snr ?? 'null'}, isNew: $isNew)');
         debugLog('[APP] TxLogEntries count: ${_txLogEntries.length}');
 
         // Find the matching TxLogEntry and update its events
@@ -1216,8 +1216,8 @@ class AppStateProvider extends ChangeNotifier with WidgetsBindingObserver {
           if (lastTx.events.isNotEmpty) {
             repeaters = lastTx.events.map((e) => MarkerRepeaterInfo(
               repeaterId: e.repeaterId,
-              snr: e.snr,
-              rssi: e.rssi,
+              snr: e.snr ?? 0.0,
+              rssi: e.rssi ?? 0,
             )).toList();
           }
         }
@@ -1404,6 +1404,10 @@ class AppStateProvider extends ChangeNotifier with WidgetsBindingObserver {
     _txTracker = TxTracker();
     _txTracker!.disableRssiFilter = _preferences.disableRssiFilter;
 
+    // Set CARpeater prefix for pass-through (replaces shouldIgnoreRepeater)
+    _txTracker!.carpeaterPrefix = _preferences.ignoreCarpeater ? _preferences.ignoreRepeaterId : null;
+    debugLog('[APP] TxTracker.carpeaterPrefix set to ${_txTracker!.carpeaterPrefix ?? 'null'}');
+
     // Log TX carpeater drops to error log (without navigating to error tab)
     _txTracker!.onCarpeaterDrop = (String repeaterId, String reason) {
       debugLog('[APP] TX carpeater drop: repeater=$repeaterId, reason=$reason');
@@ -1412,37 +1416,16 @@ class AppStateProvider extends ChangeNotifier with WidgetsBindingObserver {
     };
     debugLog('[APP] TxTracker.onCarpeaterDrop callback SET');
 
-    // Function to check if repeater should be ignored (carpeater filter)
-    _txTracker!.shouldIgnoreRepeater = (String repeaterId) {
-      final prefs = _preferences;
-      if (prefs.ignoreCarpeater && prefs.ignoreRepeaterId != null) {
-        final ignored = prefs.ignoreRepeaterId!.toUpperCase();
-        return repeaterId.toUpperCase() == ignored;
-      }
-      return false;
-    };
-    debugLog('[APP] TxTracker.shouldIgnoreRepeater callback SET');
-
     // Create RX logger (stored for use when enabling Passive Mode)
     _rxLogger = RxLogger(
-      // Function to check if repeater should be ignored (carpeater filter)
-      shouldIgnoreRepeater: (String repeaterId) {
-        // Check user preferences for ignored repeater ID
-        final prefs = _preferences;
-        if (prefs.ignoreCarpeater && prefs.ignoreRepeaterId != null) {
-          // Case-insensitive comparison (both uppercase)
-          final ignored = prefs.ignoreRepeaterId!.toUpperCase();
-          final current = repeaterId.toUpperCase();
-          return current == ignored;
-        }
-        return false;
-      },
+      // CARpeater prefix for pass-through (replaces shouldIgnoreRepeater)
+      carpeaterPrefix: _preferences.ignoreCarpeater ? _preferences.ignoreRepeaterId : null,
       // Immediate observation callback - fires when packet is first validated
       // Creates pin IMMEDIATELY for NEW repeaters (first time in current batch)
       onObservation: (observation) {
         try {
           debugLog('[APP] Immediate RX observation: repeater=${observation.repeaterId}, '
-              'snr=${observation.snr}, location=${observation.lat.toStringAsFixed(5)},${observation.lon.toStringAsFixed(5)}');
+              'snr=${observation.snr ?? 'null'}, location=${observation.lat.toStringAsFixed(5)},${observation.lon.toStringAsFixed(5)}');
 
           // Log current batch tracking state for debugging
           debugLog('[APP] Current batch tracking: ${_currentBatchRepeaters.length} repeaters: $_currentBatchRepeaters');
@@ -1457,8 +1440,8 @@ class AppStateProvider extends ChangeNotifier with WidgetsBindingObserver {
               longitude: observation.lon,
               repeaterId: observation.repeaterId,
               timestamp: DateTime.now(),
-              snr: observation.snr,
-              rssi: observation.rssi,
+              snr: observation.snr ?? 0.0,
+              rssi: observation.rssi ?? 0,
             );
             _rxPings.add(rxPing);
             if (_rxPings.length > _maxMapPins) _rxPings.removeAt(0);
@@ -1480,8 +1463,8 @@ class AppStateProvider extends ChangeNotifier with WidgetsBindingObserver {
               repeaters: [
                 MarkerRepeaterInfo(
                   repeaterId: observation.repeaterId,
-                  snr: observation.snr,
-                  rssi: observation.rssi,
+                  snr: observation.snr ?? 0.0,
+                  rssi: observation.rssi ?? 0,
                 ),
               ],
             );
@@ -1501,7 +1484,7 @@ class AppStateProvider extends ChangeNotifier with WidgetsBindingObserver {
         try {
           debugLog('[APP] ========== BATCH FLUSH CALLBACK ==========');
           debugLog('[APP] Finalized RX entry (best SNR): repeater=${entry.repeaterId}, '
-              'snr=${entry.snr}, location=${entry.lat.toStringAsFixed(5)},${entry.lon.toStringAsFixed(5)}');
+              'snr=${entry.snr ?? 'null'}, location=${entry.lat.toStringAsFixed(5)},${entry.lon.toStringAsFixed(5)}');
 
           final repeaterKey = entry.repeaterId.toUpperCase();
 
@@ -1518,20 +1501,22 @@ class AppStateProvider extends ChangeNotifier with WidgetsBindingObserver {
           if (lastPinIndex != -1) {
             // Update the pin's SNR to the best from this batch
             final existingPin = _rxPings[lastPinIndex];
-            if (entry.snr > existingPin.snr) {
+            // Only update if new SNR is non-null and better (null never replaces non-null)
+            final shouldUpdateSnr = entry.snr != null && entry.snr! > existingPin.snr;
+            if (shouldUpdateSnr) {
               _rxPings[lastPinIndex] = RxPing(
                 latitude: existingPin.latitude,   // KEEP batch start location
                 longitude: existingPin.longitude, // KEEP batch start location
                 repeaterId: entry.repeaterId,
                 timestamp: entry.timestamp,
-                snr: entry.snr,                   // UPDATE to best SNR from batch
-                rssi: entry.rssi,
+                snr: entry.snr ?? existingPin.snr, // UPDATE to best SNR from batch
+                rssi: entry.rssi ?? existingPin.rssi,
               );
               debugLog('[APP] Updated RX pin SNR for repeater=${entry.repeaterId}: '
-                  '${existingPin.snr.toStringAsFixed(2)} -> ${entry.snr.toStringAsFixed(2)}');
+                  '${existingPin.snr.toStringAsFixed(2)} -> ${entry.snr?.toStringAsFixed(2) ?? 'null'}');
             } else {
               debugLog('[APP] RX pin SNR unchanged for repeater=${entry.repeaterId}: '
-                  'batch best ${entry.snr.toStringAsFixed(2)} <= pin ${existingPin.snr.toStringAsFixed(2)}');
+                  'batch best ${entry.snr?.toStringAsFixed(2) ?? 'null'} <= pin ${existingPin.snr.toStringAsFixed(2)}');
             }
           } else {
             // Edge case: pin not found (should have been created in onObservation)
@@ -1540,8 +1525,8 @@ class AppStateProvider extends ChangeNotifier with WidgetsBindingObserver {
               longitude: entry.lon,
               repeaterId: entry.repeaterId,
               timestamp: entry.timestamp,
-              snr: entry.snr,
-              rssi: entry.rssi,
+              snr: entry.snr ?? 0.0,
+              rssi: entry.rssi ?? 0,
             );
             _rxPings.add(newRxPing);
             if (_rxPings.length > _maxMapPins) _rxPings.removeAt(0);
@@ -1571,13 +1556,15 @@ class AppStateProvider extends ChangeNotifier with WidgetsBindingObserver {
           _rxLogEntries.add(rxLogEntry);
           if (_rxLogEntries.length > _maxLogEntries) _rxLogEntries.removeAt(0);
           debugLog('[APP] Added RX log entry: repeater=${entry.repeaterId}, '
-              'snr=${entry.snr}, pathLen=${entry.pathLength}');
+              'snr=${entry.snr ?? 'null'}, pathLen=${entry.pathLength}');
 
           // Note: RX count is incremented in onObservation when pin is created (immediate feedback)
 
           // Enqueue to API with formatted heard_repeats string
-          // Format: "repeaterId(snr)" e.g. "4e(12.25)"
-          final heardRepeats = '${entry.repeaterId}(${entry.snr.toStringAsFixed(2)})';
+          // Format: "repeaterId(snr)" e.g. "4e(12.25)" or "4e(null)" for CARpeater pass-through
+          final heardRepeats = entry.snr != null
+              ? '${entry.repeaterId}(${entry.snr!.toStringAsFixed(2)})'
+              : '${entry.repeaterId}(null)';
           await _apiQueueService.enqueueRx(
             latitude: entry.lat,
             longitude: entry.lon,
@@ -2729,10 +2716,26 @@ class AppStateProvider extends ChangeNotifier with WidgetsBindingObserver {
     // Propagate RSSI filter setting to live trackers/validators
     _syncRssiFilterSetting(preferences.disableRssiFilter);
 
+    // Propagate CARpeater prefix to live trackers
+    _syncCarpeaterPrefix();
+
     notifyListeners();
     _savePreferences();
   }
 
+  /// Propagate carpeaterPrefix to live TxTracker and RxLogger
+  void _syncCarpeaterPrefix() {
+    final prefix = _preferences.ignoreCarpeater ? _preferences.ignoreRepeaterId : null;
+    if (_txTracker != null) {
+      _txTracker!.carpeaterPrefix = prefix;
+      debugLog('[APP] Synced TxTracker.carpeaterPrefix = ${prefix ?? 'null'}');
+    }
+    if (_rxLogger != null) {
+      _rxLogger!.carpeaterPrefix = prefix;
+      debugLog('[APP] Synced RxLogger.carpeaterPrefix = ${prefix ?? 'null'}');
+    }
+  }
+
   /// Propagate disableRssiFilter to all active trackers and validators
   void _syncRssiFilterSetting(bool disableRssiFilter) {
     if (_txTracker != null) {

lib/screens/log_screen.dart

@@ -488,13 +488,17 @@ class _TxLogTab extends StatelessWidget {
         snrColor = Colors.orange;
       case SnrSeverity.good:
         snrColor = Colors.green;
+      case null:
+        snrColor = Colors.grey;
     }
 
     // RSSI color based on signal strength
     Color rssiColor;
-    if (event.rssi >= -70) {
+    if (event.rssi == null) {
+      rssiColor = Colors.grey;
+    } else if (event.rssi! >= -70) {
       rssiColor = Colors.green;
-    } else if (event.rssi >= -100) {
+    } else if (event.rssi! >= -100) {
       rssiColor = Colors.orange;
     } else {
       rssiColor = Colors.red;
@@ -511,13 +515,13 @@ class _TxLogTab extends StatelessWidget {
             // SNR
             Expanded(
               child: Center(
-                child: _buildTxChip(event.snr.toStringAsFixed(1), snrColor),
+                child: _buildTxChip(event.snr?.toStringAsFixed(1) ?? '-', snrColor),
               ),
             ),
             // RSSI
             Expanded(
               child: Center(
-                child: _buildTxChip('${event.rssi}', rssiColor),
+                child: _buildTxChip(event.rssi != null ? '${event.rssi}' : '-', rssiColor),
               ),
             ),
           ],
@@ -591,13 +595,17 @@ class _RxLogTab extends StatelessWidget {
         snrColor = Colors.orange;
       case SnrSeverity.good:
         snrColor = Colors.green;
+      case null:
+        snrColor = Colors.grey;
     }
 
     // RSSI color based on signal strength
     Color rssiColor;
-    if (entry.rssi >= -70) {
+    if (entry.rssi == null) {
+      rssiColor = Colors.grey;
+    } else if (entry.rssi! >= -70) {
       rssiColor = Colors.green; // Strong: -30 to -70 dBm
-    } else if (entry.rssi >= -100) {
+    } else if (entry.rssi! >= -100) {
       rssiColor = Colors.orange; // Medium: -70 to -100 dBm
     } else {
       rssiColor = Colors.red; // Weak: -100 to -120 dBm
@@ -721,13 +729,13 @@ class _RxLogTab extends StatelessWidget {
                           // SNR
                           Expanded(
                             child: Center(
-                              child: _buildRxChip(entry.snr.toStringAsFixed(1), snrColor),
+                              child: _buildRxChip(entry.snr?.toStringAsFixed(1) ?? '-', snrColor),
                             ),
                           ),
                           // RSSI
                           Expanded(
                             child: Center(
-                              child: _buildRxChip('${entry.rssi}', rssiColor),
+                              child: _buildRxChip(entry.rssi != null ? '${entry.rssi}' : '-', rssiColor),
                             ),
                           ),
                         ],