****Hybrid Mode Implemented******

Author: MrAlders0n

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=1770265889
+flutter.versionCode=1770351949

ios/Flutter/Generated.xcconfig

@@ -2,14 +2,14 @@
 FLUTTER_ROOT=/opt/homebrew/share/flutter
 FLUTTER_APPLICATION_PATH=/Users/schnobbc/Documents/Github/MeshMapper_Flutter_App
 COCOAPODS_PARALLEL_CODE_SIGN=true
-FLUTTER_TARGET=/Users/schnobbc/Documents/Github/MeshMapper_Flutter_App/lib/main.dart
+FLUTTER_TARGET=lib/main.dart
 FLUTTER_BUILD_DIR=build
 FLUTTER_BUILD_NAME=1.0.0
-FLUTTER_BUILD_NUMBER=1
+FLUTTER_BUILD_NUMBER=1770351949
 EXCLUDED_ARCHS[sdk=iphonesimulator*]=i386
 EXCLUDED_ARCHS[sdk=iphoneos*]=armv7
-DART_DEFINES=RkxVVFRFUl9WRVJTSU9OPTMuMzguOQ==,RkxVVFRFUl9DSEFOTkVMPXN0YWJsZQ==,RkxVVFRFUl9HSVRfVVJMPWh0dHBzOi8vZ2l0aHViLmNvbS9mbHV0dGVyL2ZsdXR0ZXIuZ2l0,RkxVVFRFUl9GUkFNRVdPUktfUkVWSVNJT049NjczMjNkZTI4NQ==,RkxVVFRFUl9FTkdJTkVfUkVWSVNJT049NTg3YzE4Zjg3Mw==,RkxVVFRFUl9EQVJUX1ZFUlNJT049My4xMC44
+DART_DEFINES=QVBQX1ZFUlNJT049QVBQLTE3NzAzNTE5NDk=,RkxVVFRFUl9WRVJTSU9OPTMuMzguOQ==,RkxVVFRFUl9DSEFOTkVMPXN0YWJsZQ==,RkxVVFRFUl9HSVRfVVJMPWh0dHBzOi8vZ2l0aHViLmNvbS9mbHV0dGVyL2ZsdXR0ZXIuZ2l0,RkxVVFRFUl9GUkFNRVdPUktfUkVWSVNJT049NjczMjNkZTI4NQ==,RkxVVFRFUl9FTkdJTkVfUkVWSVNJT049NTg3YzE4Zjg3Mw==,RkxVVFRFUl9EQVJUX1ZFUlNJT049My4xMC44
 DART_OBFUSCATION=false
-TRACK_WIDGET_CREATION=true
-TREE_SHAKE_ICONS=false
+TRACK_WIDGET_CREATION=false
+TREE_SHAKE_ICONS=true
 PACKAGE_CONFIG=/Users/schnobbc/Documents/Github/MeshMapper_Flutter_App/.dart_tool/package_config.json

ios/Flutter/flutter_export_environment.sh

@@ -3,12 +3,12 @@
 export "FLUTTER_ROOT=/opt/homebrew/share/flutter"
 export "FLUTTER_APPLICATION_PATH=/Users/schnobbc/Documents/Github/MeshMapper_Flutter_App"
 export "COCOAPODS_PARALLEL_CODE_SIGN=true"
-export "FLUTTER_TARGET=/Users/schnobbc/Documents/Github/MeshMapper_Flutter_App/lib/main.dart"
+export "FLUTTER_TARGET=lib/main.dart"
 export "FLUTTER_BUILD_DIR=build"
 export "FLUTTER_BUILD_NAME=1.0.0"
-export "FLUTTER_BUILD_NUMBER=1"
-export "DART_DEFINES=RkxVVFRFUl9WRVJTSU9OPTMuMzguOQ==,RkxVVFRFUl9DSEFOTkVMPXN0YWJsZQ==,RkxVVFRFUl9HSVRfVVJMPWh0dHBzOi8vZ2l0aHViLmNvbS9mbHV0dGVyL2ZsdXR0ZXIuZ2l0,RkxVVFRFUl9GUkFNRVdPUktfUkVWSVNJT049NjczMjNkZTI4NQ==,RkxVVFRFUl9FTkdJTkVfUkVWSVNJT049NTg3YzE4Zjg3Mw==,RkxVVFRFUl9EQVJUX1ZFUlNJT049My4xMC44"
+export "FLUTTER_BUILD_NUMBER=1770351949"
+export "DART_DEFINES=QVBQX1ZFUlNJT049QVBQLTE3NzAzNTE5NDk=,RkxVVFRFUl9WRVJTSU9OPTMuMzguOQ==,RkxVVFRFUl9DSEFOTkVMPXN0YWJsZQ==,RkxVVFRFUl9HSVRfVVJMPWh0dHBzOi8vZ2l0aHViLmNvbS9mbHV0dGVyL2ZsdXR0ZXIuZ2l0,RkxVVFRFUl9GUkFNRVdPUktfUkVWSVNJT049NjczMjNkZTI4NQ==,RkxVVFRFUl9FTkdJTkVfUkVWSVNJT049NTg3YzE4Zjg3Mw==,RkxVVFRFUl9EQVJUX1ZFUlNJT049My4xMC44"
 export "DART_OBFUSCATION=false"
-export "TRACK_WIDGET_CREATION=true"
-export "TREE_SHAKE_ICONS=false"
+export "TRACK_WIDGET_CREATION=false"
+export "TREE_SHAKE_ICONS=true"
 export "PACKAGE_CONFIG=/Users/schnobbc/Documents/Github/MeshMapper_Flutter_App/.dart_tool/package_config.json"

lib/models/user_preferences.dart

@@ -52,6 +52,9 @@ class UserPreferences {
   /// Unit system for distances (metric, imperial)
   final String unitSystem;
 
+  /// Hybrid mode enabled (alternates Active + Discovery pings)
+  final bool hybridModeEnabled;
+
   const UserPreferences({
     this.powerLevel = 0.3,
     this.txPower = 22,
@@ -70,6 +73,7 @@ class UserPreferences {
     this.closeAppAfterDisconnect = false,
     this.themeMode = 'dark',
     this.unitSystem = 'metric',
+    this.hybridModeEnabled = false,
   });
 
   /// Create from JSON (for persistence)
@@ -92,6 +96,7 @@ class UserPreferences {
       closeAppAfterDisconnect: (json['closeAppAfterDisconnect'] as bool?) ?? false,
       themeMode: (json['themeMode'] as String?) ?? 'dark',
       unitSystem: (json['unitSystem'] as String?) ?? 'metric',
+      hybridModeEnabled: (json['hybridModeEnabled'] as bool?) ?? false,
     );
   }
 
@@ -115,6 +120,7 @@ class UserPreferences {
       'closeAppAfterDisconnect': closeAppAfterDisconnect,
       'themeMode': themeMode,
       'unitSystem': unitSystem,
+      'hybridModeEnabled': hybridModeEnabled,
     };
   }
 
@@ -137,6 +143,7 @@ class UserPreferences {
     bool? closeAppAfterDisconnect,
     String? themeMode,
     String? unitSystem,
+    bool? hybridModeEnabled,
   }) {
     return UserPreferences(
       powerLevel: powerLevel ?? this.powerLevel,
@@ -156,6 +163,7 @@ class UserPreferences {
       closeAppAfterDisconnect: closeAppAfterDisconnect ?? this.closeAppAfterDisconnect,
       themeMode: themeMode ?? this.themeMode,
       unitSystem: unitSystem ?? this.unitSystem,
+      hybridModeEnabled: hybridModeEnabled ?? this.hybridModeEnabled,
     );
   }
 
@@ -200,7 +208,8 @@ class UserPreferences {
         other.mapStyle == mapStyle &&
         other.closeAppAfterDisconnect == closeAppAfterDisconnect &&
         other.themeMode == themeMode &&
-        other.unitSystem == unitSystem;
+        other.unitSystem == unitSystem &&
+        other.hybridModeEnabled == hybridModeEnabled;
   }
 
   @override
@@ -222,6 +231,7 @@ class UserPreferences {
       closeAppAfterDisconnect,
       themeMode,
       unitSystem,
+      hybridModeEnabled,
     );
   }
 

lib/providers/app_state_provider.dart

@@ -46,6 +46,8 @@ enum AutoMode {
   active,
   /// Passive Mode: Listening only (no transmit)
   passive,
+  /// Hybrid Mode: Alternates Discovery + Active pings each interval
+  hybrid,
 }
 
 /// Result of uploading an offline session
@@ -263,6 +265,8 @@ class AppStateProvider extends ChangeNotifier with WidgetsBindingObserver {
   bool get isDiscoveryListening => _pingService?.isDiscoveryListening ?? false;  // True during discovery listening window (for Passive Mode)
   /// Check if auto-ping disable is pending (waiting for RX window)
   bool get isPendingDisable => _pingService?.pendingDisable ?? false;
+  /// True when running any mode that does TX (Active or Hybrid)
+  bool get isTxModeRunning => _autoPingEnabled && (_autoMode == AutoMode.active || _autoMode == AutoMode.hybrid);
   int get queueSize => _queueSize;
   int? get currentNoiseFloor => _currentNoiseFloor;
   int? get currentBatteryPercent => _currentBatteryPercent;
@@ -1937,12 +1941,14 @@ class AppStateProvider extends ChangeNotifier with WidgetsBindingObserver {
     return true;
   }
 
-  /// Toggle auto-ping mode (Active or Passive)
-  /// Returns false if blocked by cooldown (Active Mode only - Passive Mode ignores cooldown)
+  /// Toggle auto-ping mode (Active, Passive, or Hybrid)
+  /// Returns false if blocked by cooldown (Active/Hybrid Mode only - Passive Mode ignores cooldown)
   Future<bool> toggleAutoPing(AutoMode mode) async {
     if (_pingService == null) return false;
 
     final isPassive = mode == AutoMode.passive;
+    final isHybrid = mode == AutoMode.hybrid;
+    final isTxMode = !isPassive; // Active and Hybrid both do TX
 
     // If currently running the same mode, stop it (always allow stopping)
     if (_autoPingEnabled && _autoMode == mode) {
@@ -1988,11 +1994,11 @@ class AppStateProvider extends ChangeNotifier with WidgetsBindingObserver {
 
       _autoPingEnabled = false;
 
-      // Start 7-second shared cooldown ONLY for Active Mode (not Passive Mode)
+      // Start 7-second shared cooldown for TX modes (Active/Hybrid), not Passive Mode
       // Passive Mode is listening only, no cooldown needed
-      if (!isPassive) {
+      if (isTxMode) {
         _cooldownTimer.start(7000);
-        debugLog('[ACTIVE MODE] Shared cooldown started (7s) - blocks TX Ping and Active Mode');
+        debugLog('[${mode.name.toUpperCase()} MODE] Shared cooldown started (7s) - blocks TX Ping and TX modes');
       } else {
         debugLog('[PASSIVE MODE] Stopped - no cooldown (listen-only mode)');
       }
@@ -2003,10 +2009,10 @@ class AppStateProvider extends ChangeNotifier with WidgetsBindingObserver {
         if (!sessionCheck) return false;
       }
 
-      // Block starting if shared cooldown is active (Active Mode only)
+      // Block starting if shared cooldown is active (TX modes only)
       // Passive Mode is listening only and can start during cooldown
-      if (!isPassive && _cooldownTimer.isRunning) {
-        debugLog('[ACTIVE MODE] Start blocked by shared cooldown');
+      if (isTxMode && _cooldownTimer.isRunning) {
+        debugLog('[${mode.name.toUpperCase()} MODE] Start blocked by shared cooldown');
         return false;
       }
 
@@ -2037,7 +2043,7 @@ class AppStateProvider extends ChangeNotifier with WidgetsBindingObserver {
       _pingService!.setAutoPingInterval(intervalMs);
       debugLog('[PING] Using interval from preferences: ${_preferences.autoPingInterval}s (${intervalMs}ms)');
 
-      final started = await _pingService!.enableAutoPing(passiveMode: isPassive);
+      final started = await _pingService!.enableAutoPing(passiveMode: isPassive, hybridMode: isHybrid);
       if (!started) {
         // Blocked by cooldown or already enabled
         if (_pingService!.isInCooldown()) {
@@ -2047,16 +2053,17 @@ class AppStateProvider extends ChangeNotifier with WidgetsBindingObserver {
         }
         return false;
       }
-      // Start RX wardriving for both Active Mode and Passive Mode
+      // Start RX wardriving for all modes
       // Reference: state.rxTracking.isWardriving = true in wardrive.js
       _rxLogger?.startWardriving();
       _autoPingEnabled = true;
 
       // Start noise floor session for graph tracking
-      _startNoiseFloorSession(isPassive ? 'passive' : 'active');
+      final sessionLabel = isPassive ? 'passive' : isHybrid ? 'hybrid' : 'active';
+      _startNoiseFloorSession(sessionLabel);
 
       // Enable heartbeat ONLY for Passive Mode (not offline mode)
-      // Active Mode renews session via auto-pings every 15/30/60s
+      // Active/Hybrid Mode renews session via auto-pings every 15/30/60s
       // Manual Mode has natural 5-minute timeout
       if (isPassive && !_preferences.offlineMode) {
         _apiService.enableHeartbeat(
@@ -2068,12 +2075,12 @@ class AppStateProvider extends ChangeNotifier with WidgetsBindingObserver {
           },
         );
         debugLog('[HEARTBEAT] Enabled for Passive Mode');
-      } else if (!isPassive) {
-        debugLog('[HEARTBEAT] Not enabled - Active Mode renews via auto-pings');
+      } else if (isTxMode) {
+        debugLog('[HEARTBEAT] Not enabled - ${mode.name} Mode renews via auto-pings');
       }
 
       // Start background service for continuous operation
-      final modeName = isPassive ? 'Passive Mode' : 'Active Mode';
+      final modeName = isPassive ? 'Passive Mode' : isHybrid ? 'Hybrid Mode' : 'Active Mode';
       await BackgroundServiceManager.startService(
         mode: modeName,
         txCount: _pingStats.txCount,

lib/screens/home_screen.dart

@@ -829,6 +829,7 @@ class _HomeScreenState extends State<HomeScreen> {
 
   /// Show help bottom sheet explaining each control
   void _showControlsHelp(BuildContext context) {
+    final prefs = Provider.of<AppStateProvider>(context, listen: false).preferences;
     showModalBottomSheet(
       context: context,
       useSafeArea: true,
@@ -893,12 +894,14 @@ class _HomeScreenState extends State<HomeScreen> {
                 description: 'Send a single ping to #wardriving and track which repeaters heard it.',
               ),
 
-              // Active Mode button
+              // Active Mode / Hybrid Mode button
               _buildHelpItem(
-                icon: Icons.sensors,
+                icon: prefs.hybridModeEnabled ? Icons.compare_arrows : Icons.sensors,
                 color: const Color(0xFF6366F1),
-                title: 'Active Mode',
-                description: 'Auto-pings #wardriving at your set interval, tracks repeaters from pings and received mesh traffic.',
+                title: prefs.hybridModeEnabled ? 'Hybrid Mode' : 'Active Mode',
+                description: prefs.hybridModeEnabled
+                    ? 'Alternates between auto-pinging #wardriving and sending zero-hop discovery pings each interval, tracks repeaters from pings, nearby repeaters, and received mesh traffic.'
+                    : 'Auto-pings #wardriving at your set interval, tracks repeaters from pings and received mesh traffic.',
               ),
 
               // Passive Mode button

lib/screens/settings_screen.dart

@@ -223,6 +223,30 @@ class _SettingsScreenState extends State<SettingsScreen> {
             onTap: isAutoMode ? null : () => _showIntervalSelector(context, appState),
           ),
 
+          // Hybrid Mode Toggle
+          SwitchListTile(
+            secondary: const Icon(Icons.compare_arrows),
+            title: Row(
+              children: [
+                const Text('Hybrid Mode'),
+                const SizedBox(width: 4),
+                GestureDetector(
+                  onTap: () => _showHybridModeInfo(context),
+                  child: Icon(
+                    Icons.info_outline,
+                    size: 18,
+                    color: Theme.of(context).colorScheme.onSurfaceVariant,
+                  ),
+                ),
+              ],
+            ),
+            subtitle: const Text('Combines Active and Passive modes'),
+            value: prefs.hybridModeEnabled,
+            onChanged: isAutoMode ? null : (value) {
+              appState.updatePreferences(prefs.copyWith(hybridModeEnabled: value));
+            },
+          ),
+
           // Carpeater Ignore Setting
           SwitchListTile(
             secondary: const Icon(Icons.filter_alt),
@@ -858,6 +882,61 @@ class _SettingsScreenState extends State<SettingsScreen> {
     );
   }
 
+  void _showHybridModeInfo(BuildContext context) {
+    showDialog(
+      context: context,
+      builder: (context) => AlertDialog(
+        title: const Row(
+          children: [
+            Icon(Icons.compare_arrows, size: 24),
+            SizedBox(width: 8),
+            Text('Hybrid Mode'),
+          ],
+        ),
+        content: const Column(
+          mainAxisSize: MainAxisSize.min,
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
+            Text(
+              'Replaces Active Mode. Alternates between auto-pinging #wardriving and sending zero-hop discovery pings each interval, tracking repeaters from pings, nearby repeaters, and received mesh traffic.',
+              style: TextStyle(fontSize: 14),
+            ),
+            SizedBox(height: 12),
+            Text('How it works:', style: TextStyle(fontWeight: FontWeight.bold, fontSize: 13)),
+            SizedBox(height: 4),
+            Text(
+              'Discovery \u2192 wait \u2192 TX Ping \u2192 wait \u2192 Discovery \u2192 ...',
+              style: TextStyle(fontSize: 13, fontFamily: 'monospace'),
+            ),
+            SizedBox(height: 12),
+            Text('Interval timing:', style: TextStyle(fontWeight: FontWeight.bold, fontSize: 13)),
+            SizedBox(height: 4),
+            Text(
+              'At 15s interval, each ping type fires every 30s. Discovery\'s 30s firmware rate limit is naturally respected.',
+              style: TextStyle(fontSize: 13),
+            ),
+            SizedBox(height: 12),
+            Text('When enabled:', style: TextStyle(fontWeight: FontWeight.bold, fontSize: 13)),
+            SizedBox(height: 4),
+            Text(
+              '\u2022 Replaces the Active button with Hybrid\n'
+              '\u2022 50% less TX airtime vs Active Mode\n'
+              '\u2022 Discovery finds nearby repeaters\n'
+              '\u2022 TX pings test coverage through them',
+              style: TextStyle(fontSize: 13),
+            ),
+          ],
+        ),
+        actions: [
+          TextButton(
+            onPressed: () => Navigator.of(context).pop(),
+            child: const Text('Got it'),
+          ),
+        ],
+      ),
+    );
+  }
+
   void _showIntervalSelector(BuildContext context, AppStateProvider appState) {
     final currentInterval = appState.preferences.autoPingInterval;