mirror of
https://github.com/dz0ny/meshcore-sar.git
synced 2026-08-11 08:20:36 +00:00
Janez T
@@ -23,13 +23,11 @@ import 'device_config_screen.dart';
|
||||
import 'packet_log_screen.dart';
|
||||
import 'live_traffic_screen.dart';
|
||||
import 'profiles_screen.dart';
|
||||
import 'spectrum_scan_screen.dart';
|
||||
import '../utils/toast_logger.dart';
|
||||
import '../l10n/app_localizations.dart';
|
||||
import '../widgets/permission_request_dialog.dart';
|
||||
import '../widgets/connection_dialog.dart';
|
||||
import '../utils/battery_display_helper.dart';
|
||||
import '../services/developer_mode_service.dart';
|
||||
import '../services/mesh_map_nodes_service.dart';
|
||||
import '../services/profile_device_key_resolver.dart';
|
||||
import '../services/profile_manager.dart';
|
||||
@@ -68,7 +66,6 @@ class _HomeScreenState extends State<HomeScreen>
|
||||
int _currentIndex = 0;
|
||||
bool _isMapFullscreen = false;
|
||||
bool _showRxTxIndicators = true;
|
||||
bool _isDeveloperModeEnabled = false;
|
||||
bool _isMapEnabled = true;
|
||||
bool _isContactsEnabled = true;
|
||||
bool _isSensorsEnabled = false;
|
||||
@@ -107,7 +104,6 @@ class _HomeScreenState extends State<HomeScreen>
|
||||
// Initialize synchronously so first build always has a valid controller.
|
||||
_initTabController();
|
||||
_loadRxTxPreference();
|
||||
_loadDeveloperModePreference();
|
||||
MeshMapNodesService.syncInBackgroundIfStale();
|
||||
|
||||
// Show permission dialog after the first frame if needed
|
||||
@@ -291,14 +287,6 @@ class _HomeScreenState extends State<HomeScreen>
|
||||
}
|
||||
}
|
||||
|
||||
Future<void> _loadDeveloperModePreference() async {
|
||||
final isEnabled = await DeveloperModeService.isEnabled();
|
||||
if (!mounted) return;
|
||||
setState(() {
|
||||
_isDeveloperModeEnabled = isEnabled;
|
||||
});
|
||||
}
|
||||
|
||||
void _showPermissionDialog() {
|
||||
if (!mounted) return;
|
||||
|
||||
@@ -811,32 +799,6 @@ class _HomeScreenState extends State<HomeScreen>
|
||||
.read<ProfileManager>()
|
||||
.profilesEnabled;
|
||||
|
||||
if (_isDeveloperModeEnabled) {
|
||||
items.add(
|
||||
PopupMenuItem(
|
||||
child: Row(
|
||||
children: [
|
||||
const Icon(Icons.radar),
|
||||
SizedBox(width: 8),
|
||||
Text(AppLocalizations.of(context)!.spectrumScan),
|
||||
],
|
||||
),
|
||||
onTap: () {
|
||||
final navigator = Navigator.of(context);
|
||||
Future.delayed(Duration.zero, () {
|
||||
if (!mounted) return;
|
||||
navigator.push(
|
||||
MaterialPageRoute(
|
||||
builder: (context) =>
|
||||
const SpectrumScanScreen(),
|
||||
),
|
||||
);
|
||||
});
|
||||
},
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
items.add(
|
||||
PopupMenuItem(
|
||||
child: Row(
|
||||
@@ -954,7 +916,6 @@ class _HomeScreenState extends State<HomeScreen>
|
||||
),
|
||||
);
|
||||
_loadRxTxPreference();
|
||||
_loadDeveloperModePreference();
|
||||
});
|
||||
},
|
||||
),
|
||||
|
||||
@@ -6,6 +6,7 @@ import 'dart:math' as math;
|
||||
import 'dart:typed_data';
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:flutter/services.dart';
|
||||
import 'package:meshcore_client/meshcore_client.dart' show MeshCoreConstants;
|
||||
import 'package:provider/provider.dart';
|
||||
import 'package:geolocator/geolocator.dart';
|
||||
import '../providers/messages_provider.dart';
|
||||
@@ -114,7 +115,9 @@ class _ComposerActionTile extends StatelessWidget {
|
||||
width: 38,
|
||||
height: 38,
|
||||
decoration: BoxDecoration(
|
||||
color: effectiveColor.withValues(alpha: enabled ? 0.14 : 0.10),
|
||||
color: effectiveColor.withValues(
|
||||
alpha: enabled ? 0.14 : 0.10,
|
||||
),
|
||||
borderRadius: BorderRadius.circular(14),
|
||||
),
|
||||
alignment: Alignment.center,
|
||||
@@ -964,6 +967,7 @@ class _MessagesTabState extends State<MessagesTab> {
|
||||
if (!shouldContinue) return;
|
||||
if (!mounted) return;
|
||||
final connectionProvider = context.read<ConnectionProvider>();
|
||||
final messagesProvider = context.read<MessagesProvider>();
|
||||
if (!connectionProvider.deviceInfo.isConnected) {
|
||||
ToastLogger.error(context, 'Not connected to device');
|
||||
return;
|
||||
@@ -975,6 +979,7 @@ class _MessagesTabState extends State<MessagesTab> {
|
||||
final rawBytes = await picked.readAsBytes();
|
||||
|
||||
setState(() => _isSendingImage = true);
|
||||
String? failedMessageId;
|
||||
try {
|
||||
// Compress AVIF using user-selected size, compression and color mode.
|
||||
final maxSize = await ImagePreferences.getMaxSize();
|
||||
@@ -1052,8 +1057,8 @@ class _MessagesTabState extends State<MessagesTab> {
|
||||
imageProvider.cacheOutgoingSession(sessionId, fragments, envelope);
|
||||
|
||||
// Add local placeholder message.
|
||||
final messagesProvider = context.read<MessagesProvider>();
|
||||
final msgId = 'img_${sessionId}_sent';
|
||||
failedMessageId = msgId;
|
||||
final isChannel =
|
||||
_destinationType ==
|
||||
MessageDestinationPreferences.destinationTypeChannel;
|
||||
@@ -1111,10 +1116,23 @@ class _MessagesTabState extends State<MessagesTab> {
|
||||
'chunk=${imageDataBytesPerFragment}B',
|
||||
);
|
||||
|
||||
if (isChannel) {
|
||||
for (final fragment in fragments) {
|
||||
await connectionProvider.sendChannelData(
|
||||
channelIdx: channelIdx ?? 0,
|
||||
dataType: MeshCoreConstants.dataTypeDev,
|
||||
payload: fragment.encodeBinary(),
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
// Image fragments are always served on demand after an explicit IR2
|
||||
// fetch request, including direct contacts.
|
||||
} catch (e, st) {
|
||||
debugPrint('❌ [Image] _pickAndSendImage: $e\n$st');
|
||||
if (failedMessageId != null) {
|
||||
messagesProvider.markMessageFailed(failedMessageId);
|
||||
}
|
||||
if (!mounted) return;
|
||||
ToastLogger.error(context, 'Image send failed');
|
||||
} finally {
|
||||
@@ -1423,6 +1441,15 @@ class _MessagesTabState extends State<MessagesTab> {
|
||||
}
|
||||
|
||||
debugPrint('🎙️ [Voice] envelope sent for session $sessionId');
|
||||
if (isChannel) {
|
||||
for (final packet in encodedPackets) {
|
||||
await connectionProvider.sendChannelData(
|
||||
channelIdx: channelIdx ?? 0,
|
||||
dataType: MeshCoreConstants.dataTypeDev,
|
||||
payload: packet.encodeBinary(),
|
||||
);
|
||||
}
|
||||
}
|
||||
// Mark the placeholder message as "sent" (ackTag=0, timeout=0 = no ACK tracking).
|
||||
// addSentMessage() forces deliveryStatus.sending; we upgrade it here so the
|
||||
// bubble shows "Sent" instead of "Sending" once all packets are on the wire.
|
||||
@@ -1673,98 +1700,99 @@ class _MessagesTabState extends State<MessagesTab> {
|
||||
LayoutBuilder(
|
||||
builder: (context, constraints) {
|
||||
final actions = <Widget>[
|
||||
_ComposerActionTile(
|
||||
icon: Icons.search_rounded,
|
||||
title: l10n.searchMessages,
|
||||
subtitle: 'Find text in the current conversation',
|
||||
color: const Color(0xFF2B6CB0),
|
||||
onTap: () => runAction(() async {
|
||||
_showFilteredMessageSearch();
|
||||
}),
|
||||
),
|
||||
_ComposerActionTile(
|
||||
icon: Icons.add_location_alt_rounded,
|
||||
title: l10n.sendSarMarker,
|
||||
subtitle: 'Share a marker with coordinates',
|
||||
color: const Color(0xFFB45309),
|
||||
onTap: () => runAction(() async {
|
||||
_showSarDialog();
|
||||
}),
|
||||
),
|
||||
if (_voiceSupported)
|
||||
_ComposerActionTile(
|
||||
icon: _isRecording
|
||||
? Icons.stop_rounded
|
||||
: Icons.mic_rounded,
|
||||
title: _isRecording
|
||||
? 'Stop recording'
|
||||
: 'Record voice',
|
||||
subtitle: _isSendingVoice
|
||||
? 'Voice message is sending'
|
||||
: _isRecording
|
||||
? 'Finish and send your clip'
|
||||
: 'Capture and send a voice note',
|
||||
color: const Color(0xFF7C3AED),
|
||||
enabled: !_isSendingVoice,
|
||||
onTap: !_isSendingVoice
|
||||
icon: Icons.search_rounded,
|
||||
title: l10n.searchMessages,
|
||||
subtitle: 'Find text in the current conversation',
|
||||
color: const Color(0xFF2B6CB0),
|
||||
onTap: () => runAction(() async {
|
||||
_showFilteredMessageSearch();
|
||||
}),
|
||||
),
|
||||
_ComposerActionTile(
|
||||
icon: Icons.add_location_alt_rounded,
|
||||
title: l10n.sendSarMarker,
|
||||
subtitle: 'Share a marker with coordinates',
|
||||
color: const Color(0xFFB45309),
|
||||
onTap: () => runAction(() async {
|
||||
_showSarDialog();
|
||||
}),
|
||||
),
|
||||
if (_voiceSupported)
|
||||
_ComposerActionTile(
|
||||
icon: _isRecording
|
||||
? Icons.stop_rounded
|
||||
: Icons.mic_rounded,
|
||||
title: _isRecording
|
||||
? 'Stop recording'
|
||||
: 'Record voice',
|
||||
subtitle: _isSendingVoice
|
||||
? 'Voice message is sending'
|
||||
: _isRecording
|
||||
? 'Finish and send your clip'
|
||||
: 'Capture and send a voice note',
|
||||
color: const Color(0xFF7C3AED),
|
||||
enabled: !_isSendingVoice,
|
||||
onTap: !_isSendingVoice
|
||||
? () => runAction(() async {
|
||||
if (_isRecording) {
|
||||
await _stopAndSendVoice();
|
||||
} else {
|
||||
await _startVoiceRecording();
|
||||
}
|
||||
})
|
||||
: null,
|
||||
),
|
||||
_ComposerActionTile(
|
||||
icon: Icons.photo_library_rounded,
|
||||
title: l10n.sendImageFromGallery,
|
||||
subtitle: 'Choose an image from your library',
|
||||
color: const Color(0xFF0F766E),
|
||||
enabled: !_isSendingImage,
|
||||
onTap: !_isSendingImage
|
||||
? () => runAction(() async {
|
||||
if (_isRecording) {
|
||||
await _stopAndSendVoice();
|
||||
} else {
|
||||
await _startVoiceRecording();
|
||||
}
|
||||
await _pickAndSendImage(
|
||||
source: ImageSource.gallery,
|
||||
);
|
||||
})
|
||||
: null,
|
||||
),
|
||||
_ComposerActionTile(
|
||||
icon: Icons.photo_library_rounded,
|
||||
title: l10n.sendImageFromGallery,
|
||||
subtitle: 'Choose an image from your library',
|
||||
color: const Color(0xFF0F766E),
|
||||
enabled: !_isSendingImage,
|
||||
onTap: !_isSendingImage
|
||||
? () => runAction(() async {
|
||||
await _pickAndSendImage(
|
||||
source: ImageSource.gallery,
|
||||
);
|
||||
})
|
||||
: null,
|
||||
),
|
||||
_ComposerActionTile(
|
||||
icon: Icons.camera_alt_rounded,
|
||||
title: l10n.takePhoto,
|
||||
subtitle: 'Capture something right now',
|
||||
color: const Color(0xFF2563EB),
|
||||
enabled: !_isSendingImage,
|
||||
onTap: !_isSendingImage
|
||||
? () => runAction(() async {
|
||||
await _pickAndSendImage(
|
||||
source: ImageSource.camera,
|
||||
);
|
||||
})
|
||||
: null,
|
||||
),
|
||||
_ComposerActionTile(
|
||||
icon: Icons.grid_3x3_rounded,
|
||||
title: l10n.startTictactoe,
|
||||
subtitle: l10n.dmOnly,
|
||||
color: const Color(0xFFBE185D),
|
||||
onTap: () => runAction(() async {
|
||||
await _startTicTacToeGame();
|
||||
}),
|
||||
),
|
||||
];
|
||||
_ComposerActionTile(
|
||||
icon: Icons.camera_alt_rounded,
|
||||
title: l10n.takePhoto,
|
||||
subtitle: 'Capture something right now',
|
||||
color: const Color(0xFF2563EB),
|
||||
enabled: !_isSendingImage,
|
||||
onTap: !_isSendingImage
|
||||
? () => runAction(() async {
|
||||
await _pickAndSendImage(
|
||||
source: ImageSource.camera,
|
||||
);
|
||||
})
|
||||
: null,
|
||||
),
|
||||
_ComposerActionTile(
|
||||
icon: Icons.grid_3x3_rounded,
|
||||
title: l10n.startTictactoe,
|
||||
subtitle: l10n.dmOnly,
|
||||
color: const Color(0xFFBE185D),
|
||||
onTap: () => runAction(() async {
|
||||
await _startTicTacToeGame();
|
||||
}),
|
||||
),
|
||||
];
|
||||
|
||||
return GridView.builder(
|
||||
shrinkWrap: true,
|
||||
physics: const NeverScrollableScrollPhysics(),
|
||||
itemCount: actions.length,
|
||||
gridDelegate: const SliverGridDelegateWithFixedCrossAxisCount(
|
||||
crossAxisCount: 2,
|
||||
mainAxisSpacing: 12,
|
||||
crossAxisSpacing: 12,
|
||||
mainAxisExtent: 126,
|
||||
),
|
||||
gridDelegate:
|
||||
const SliverGridDelegateWithFixedCrossAxisCount(
|
||||
crossAxisCount: 2,
|
||||
mainAxisSpacing: 12,
|
||||
crossAxisSpacing: 12,
|
||||
mainAxisExtent: 126,
|
||||
),
|
||||
itemBuilder: (context, index) => actions[index],
|
||||
);
|
||||
},
|
||||
|
||||
@@ -16,6 +16,7 @@ import '../providers/app_provider.dart';
|
||||
import '../providers/connection_provider.dart';
|
||||
import '../providers/drawing_provider.dart';
|
||||
import '../providers/map_provider.dart';
|
||||
import '../models/contact.dart';
|
||||
import '../models/config_profile.dart';
|
||||
import '../services/location_tracking_service.dart';
|
||||
import '../services/locale_preferences.dart';
|
||||
@@ -79,6 +80,7 @@ class _SettingsScreenState extends State<SettingsScreen> {
|
||||
bool _fastLocationUpdatesEnabled = false;
|
||||
double _fastLocationMovementThresholdMeters = 10.0;
|
||||
int _fastLocationActiveCadenceSeconds = 10;
|
||||
int? _fastLocationChannelIdx;
|
||||
bool _rotateMapWithHeading = false;
|
||||
bool _showMapDebugInfo = false;
|
||||
bool _openMapInFullscreen = false;
|
||||
@@ -314,6 +316,7 @@ class _SettingsScreenState extends State<SettingsScreen> {
|
||||
_locationService.fastLocationMovementThresholdMeters;
|
||||
_fastLocationActiveCadenceSeconds =
|
||||
_locationService.fastLocationActiveCadenceSeconds;
|
||||
_fastLocationChannelIdx = _locationService.fastLocationChannelIdx;
|
||||
});
|
||||
}
|
||||
|
||||
@@ -407,6 +410,79 @@ class _SettingsScreenState extends State<SettingsScreen> {
|
||||
});
|
||||
}
|
||||
|
||||
String _describeFastLocationChannel(List<Contact> channels) {
|
||||
final channelIdx = _fastLocationChannelIdx;
|
||||
if (channelIdx == null) {
|
||||
return 'Not set';
|
||||
}
|
||||
|
||||
for (final channel in channels) {
|
||||
final idx = channel.publicKey.length > 1 ? channel.publicKey[1] : 0;
|
||||
if (idx == channelIdx) {
|
||||
return '${channel.getLocalizedDisplayName(context)} (slot $channelIdx)';
|
||||
}
|
||||
}
|
||||
|
||||
return 'Channel $channelIdx unavailable';
|
||||
}
|
||||
|
||||
Future<void> _editFastLocationChannel() async {
|
||||
final channels =
|
||||
List<Contact>.from(context.read<ContactsProvider>().channels)
|
||||
..sort((a, b) {
|
||||
final aIdx = a.publicKey.length > 1 ? a.publicKey[1] : 0;
|
||||
final bIdx = b.publicKey.length > 1 ? b.publicKey[1] : 0;
|
||||
return aIdx.compareTo(bIdx);
|
||||
});
|
||||
|
||||
final selected = await showModalBottomSheet<int?>(
|
||||
context: context,
|
||||
builder: (sheetContext) => SafeArea(
|
||||
child: Column(
|
||||
mainAxisSize: MainAxisSize.min,
|
||||
children: [
|
||||
ListTile(
|
||||
leading: const Icon(Icons.block),
|
||||
title: const Text('Disable fast GPS publishing'),
|
||||
trailing: _fastLocationChannelIdx == null
|
||||
? const Icon(Icons.check)
|
||||
: null,
|
||||
onTap: () => Navigator.pop(sheetContext, -1),
|
||||
),
|
||||
for (final channel in channels)
|
||||
ListTile(
|
||||
leading: const Icon(Icons.tag),
|
||||
title: Text(channel.getLocalizedDisplayName(sheetContext)),
|
||||
subtitle: Text(
|
||||
'Channel ${channel.publicKey.length > 1 ? channel.publicKey[1] : 0}',
|
||||
),
|
||||
trailing:
|
||||
_fastLocationChannelIdx ==
|
||||
(channel.publicKey.length > 1
|
||||
? channel.publicKey[1]
|
||||
: 0)
|
||||
? const Icon(Icons.check)
|
||||
: null,
|
||||
onTap: () => Navigator.pop(
|
||||
sheetContext,
|
||||
channel.publicKey.length > 1 ? channel.publicKey[1] : 0,
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
);
|
||||
|
||||
if (selected == null) return;
|
||||
await _locationService.updateFastLocationChannelIdx(
|
||||
selected < 0 ? null : selected,
|
||||
);
|
||||
if (!mounted) return;
|
||||
setState(() {
|
||||
_fastLocationChannelIdx = _locationService.fastLocationChannelIdx;
|
||||
});
|
||||
}
|
||||
|
||||
Future<void> _saveImageMaxSize(int size) async {
|
||||
await ImagePreferences.setMaxSize(size);
|
||||
if (!mounted) return;
|
||||
@@ -1766,6 +1842,17 @@ class _SettingsScreenState extends State<SettingsScreen> {
|
||||
trailing: const Icon(Icons.chevron_right),
|
||||
onTap: _editFastLocationActiveCadence,
|
||||
),
|
||||
ListTile(
|
||||
leading: const Icon(Icons.forum),
|
||||
title: const Text('Fast GPS target channel'),
|
||||
subtitle: Text(
|
||||
_describeFastLocationChannel(
|
||||
context.watch<ContactsProvider>().channels,
|
||||
),
|
||||
),
|
||||
trailing: const Icon(Icons.chevron_right),
|
||||
onTap: _editFastLocationChannel,
|
||||
),
|
||||
ListTile(
|
||||
leading: Icon(Icons.location_on),
|
||||
title: Text(AppLocalizations.of(context)!.locationPermission),
|
||||
|
||||
@@ -1,602 +0,0 @@
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:meshcore_client/meshcore_client.dart';
|
||||
import 'package:provider/provider.dart';
|
||||
import '../models/device_info.dart';
|
||||
import '../providers/connection_provider.dart';
|
||||
import '../widgets/device/spectrum_scan_panel.dart';
|
||||
import '../l10n/app_localizations.dart';
|
||||
|
||||
class SpectrumScanScreen extends StatefulWidget {
|
||||
const SpectrumScanScreen({super.key});
|
||||
|
||||
@override
|
||||
State<SpectrumScanScreen> createState() => _SpectrumScanScreenState();
|
||||
}
|
||||
|
||||
class _SpectrumScanScreenState extends State<SpectrumScanScreen> {
|
||||
static const List<String> _bandwidthOptions = [
|
||||
'7.8 kHz',
|
||||
'10.4 kHz',
|
||||
'15.6 kHz',
|
||||
'20.8 kHz',
|
||||
'31.25 kHz',
|
||||
'41.7 kHz',
|
||||
'62.5 kHz',
|
||||
'125 kHz',
|
||||
'250 kHz',
|
||||
'500 kHz',
|
||||
];
|
||||
|
||||
String _selectedBandwidth = '62.5 kHz';
|
||||
bool _isSpectrumScanRunning = false;
|
||||
bool _rangeInitialized = false;
|
||||
String? _lastRangeSourceKey;
|
||||
late double _scanRangeMinMhz;
|
||||
late double _scanRangeMaxMhz;
|
||||
late RangeValues _scanRangeValues;
|
||||
List<SpectrumScanCandidate> _scanCandidates = const [];
|
||||
int? _selectedScanFrequencyKhz;
|
||||
int _completedScanSectors = 0;
|
||||
int _totalScanSectors = 0;
|
||||
|
||||
List<SpectrumScanCandidate> get _recommendedScanCandidates =>
|
||||
_scanCandidates.take(8).toList();
|
||||
|
||||
@override
|
||||
void initState() {
|
||||
super.initState();
|
||||
final deviceInfo = _deviceInfo;
|
||||
if (deviceInfo.radioBw != null &&
|
||||
deviceInfo.radioBw! >= 0 &&
|
||||
deviceInfo.radioBw! < _bandwidthOptions.length) {
|
||||
_selectedBandwidth = _bandwidthOptions[deviceInfo.radioBw!];
|
||||
}
|
||||
_syncRangeFromDevice(deviceInfo);
|
||||
_selectedScanFrequencyKhz = deviceInfo.radioFreq;
|
||||
}
|
||||
|
||||
DeviceInfo get _deviceInfo => context.read<ConnectionProvider>().deviceInfo;
|
||||
|
||||
@override
|
||||
void didChangeDependencies() {
|
||||
super.didChangeDependencies();
|
||||
_syncRangeFromDevice(context.watch<ConnectionProvider>().deviceInfo);
|
||||
}
|
||||
|
||||
void _syncRangeFromDevice(DeviceInfo deviceInfo) {
|
||||
final minKhz = deviceInfo.spectrumScanMinKhz;
|
||||
final maxKhz = deviceInfo.spectrumScanMaxKhz;
|
||||
late double normalizedMinMhz;
|
||||
late double normalizedMaxMhz;
|
||||
late String sourceKey;
|
||||
|
||||
if (minKhz != null && maxKhz != null && maxKhz > minKhz) {
|
||||
final normalized = _normalizeScanRange(
|
||||
minKhz / 1000.0,
|
||||
maxKhz / 1000.0,
|
||||
deviceInfo.radioFreq != null ? deviceInfo.radioFreq! / 1000.0 : null,
|
||||
);
|
||||
normalizedMinMhz = normalized.$1;
|
||||
normalizedMaxMhz = normalized.$2;
|
||||
sourceKey = 'fw:$minKhz:$maxKhz';
|
||||
} else {
|
||||
final normalized = _normalizeScanRange(
|
||||
null,
|
||||
null,
|
||||
deviceInfo.radioFreq != null ? deviceInfo.radioFreq! / 1000.0 : null,
|
||||
);
|
||||
normalizedMinMhz = normalized.$1;
|
||||
normalizedMaxMhz = normalized.$2;
|
||||
sourceKey =
|
||||
'fallback:${deviceInfo.radioFreq != null ? deviceInfo.radioFreq! ~/ 1000 : 869525}';
|
||||
}
|
||||
|
||||
if (_rangeInitialized && _lastRangeSourceKey == sourceKey) {
|
||||
return;
|
||||
}
|
||||
|
||||
_scanRangeMinMhz = normalizedMinMhz;
|
||||
_scanRangeMaxMhz = normalizedMaxMhz;
|
||||
|
||||
if (_scanRangeMaxMhz <= _scanRangeMinMhz) {
|
||||
_scanRangeMaxMhz = _scanRangeMinMhz + 0.5;
|
||||
}
|
||||
|
||||
_scanRangeValues = RangeValues(_scanRangeMinMhz, _scanRangeMaxMhz);
|
||||
_rangeInitialized = true;
|
||||
_lastRangeSourceKey = sourceKey;
|
||||
}
|
||||
|
||||
(double, double) _normalizeScanRange(
|
||||
double? minMhz,
|
||||
double? maxMhz,
|
||||
double? centerMhz,
|
||||
) {
|
||||
const hardMinMhz = 800.0;
|
||||
const hardMaxMhz = 950.0;
|
||||
final center = centerMhz ?? 869.525;
|
||||
|
||||
if (minMhz != null && maxMhz != null) {
|
||||
final clampedMin = minMhz.clamp(hardMinMhz, hardMaxMhz);
|
||||
final clampedMax = maxMhz.clamp(hardMinMhz, hardMaxMhz);
|
||||
if (clampedMax > clampedMin) {
|
||||
return (clampedMin, clampedMax);
|
||||
}
|
||||
}
|
||||
|
||||
if (center >= 900.0 && center <= 930.0) {
|
||||
return (902.0, 928.0);
|
||||
}
|
||||
|
||||
return (863.0, 870.0);
|
||||
}
|
||||
|
||||
double _bandwidthToKhz(String bw) {
|
||||
switch (bw) {
|
||||
case '7.8 kHz':
|
||||
return 7.8;
|
||||
case '10.4 kHz':
|
||||
return 10.4;
|
||||
case '15.6 kHz':
|
||||
return 15.6;
|
||||
case '20.8 kHz':
|
||||
return 20.8;
|
||||
case '31.25 kHz':
|
||||
return 31.25;
|
||||
case '41.7 kHz':
|
||||
return 41.7;
|
||||
case '62.5 kHz':
|
||||
return 62.5;
|
||||
case '125 kHz':
|
||||
return 125.0;
|
||||
case '250 kHz':
|
||||
return 250.0;
|
||||
case '500 kHz':
|
||||
return 500.0;
|
||||
default:
|
||||
return 62.5;
|
||||
}
|
||||
}
|
||||
|
||||
String _currentParamProfile(DeviceInfo deviceInfo) {
|
||||
final sf = deviceInfo.radioSf ?? 8;
|
||||
final cr = deviceInfo.radioCr ?? 8;
|
||||
return 'BW $_selectedBandwidth | SF$sf | CR 4/$cr';
|
||||
}
|
||||
|
||||
String _recommendationTitle(int index) {
|
||||
switch (index) {
|
||||
case 0:
|
||||
return 'Best candidate';
|
||||
case 1:
|
||||
return 'Alternate';
|
||||
case 2:
|
||||
return 'Fallback';
|
||||
default:
|
||||
return 'Candidate ${index + 1}';
|
||||
}
|
||||
}
|
||||
|
||||
List<int> _possibleBracketFrequenciesKhz() {
|
||||
final bandwidthKhz = _bandwidthToKhz(_selectedBandwidth);
|
||||
final halfBandwidthKhz = bandwidthKhz / 2.0;
|
||||
final startKhz = (_scanRangeValues.start * 1000).round();
|
||||
final stopKhz = (_scanRangeValues.end * 1000).round();
|
||||
final firstCenterKhz = (startKhz + halfBandwidthKhz).round();
|
||||
final lastCenterKhz = (stopKhz - halfBandwidthKhz).round();
|
||||
|
||||
if (lastCenterKhz < firstCenterKhz) {
|
||||
return const [];
|
||||
}
|
||||
|
||||
final stepKhz = bandwidthKhz >= 125.0 ? bandwidthKhz.round() : 25;
|
||||
final centers = <int>[];
|
||||
for (
|
||||
var centerKhz = firstCenterKhz;
|
||||
centerKhz <= lastCenterKhz && centers.length < 8;
|
||||
centerKhz += stepKhz
|
||||
) {
|
||||
centers.add(centerKhz);
|
||||
}
|
||||
|
||||
if (centers.isEmpty || centers.last != lastCenterKhz) {
|
||||
centers.add(lastCenterKhz);
|
||||
}
|
||||
|
||||
return centers.toSet().toList()..sort();
|
||||
}
|
||||
|
||||
void _resetDerivedScanResults() {
|
||||
_scanCandidates = const [];
|
||||
_selectedScanFrequencyKhz = null;
|
||||
}
|
||||
|
||||
List<(int startKhz, int stopKhz)> _buildScanSectors(double bandwidthKhz) {
|
||||
final startKhz = (_scanRangeValues.start * 1000).round();
|
||||
final stopKhz = (_scanRangeValues.end * 1000).round();
|
||||
final sectorWidthKhz = (bandwidthKhz * 24).round().clamp(250, 1200);
|
||||
final overlapKhz = bandwidthKhz.round().clamp(8, 500);
|
||||
final sectors = <(int startKhz, int stopKhz)>[];
|
||||
|
||||
var sectorStartKhz = startKhz;
|
||||
while (sectorStartKhz < stopKhz) {
|
||||
final sectorStopKhz = (sectorStartKhz + sectorWidthKhz).clamp(
|
||||
sectorStartKhz + overlapKhz,
|
||||
stopKhz,
|
||||
);
|
||||
sectors.add((sectorStartKhz, sectorStopKhz));
|
||||
if (sectorStopKhz >= stopKhz) {
|
||||
break;
|
||||
}
|
||||
sectorStartKhz = sectorStopKhz - overlapKhz;
|
||||
}
|
||||
|
||||
return sectors;
|
||||
}
|
||||
|
||||
List<SpectrumScanCandidate> _mergeSectorCandidates(
|
||||
Iterable<SpectrumScanCandidate> candidates,
|
||||
) {
|
||||
final byFrequency = <int, SpectrumScanCandidate>{};
|
||||
for (final candidate in candidates) {
|
||||
final existing = byFrequency[candidate.centerFrequencyKhz];
|
||||
if (existing == null ||
|
||||
candidate.occupancyPercent < existing.occupancyPercent ||
|
||||
(candidate.occupancyPercent == existing.occupancyPercent &&
|
||||
candidate.peakRssiDbm < existing.peakRssiDbm) ||
|
||||
(candidate.occupancyPercent == existing.occupancyPercent &&
|
||||
candidate.peakRssiDbm == existing.peakRssiDbm &&
|
||||
candidate.avgRssiDbm < existing.avgRssiDbm)) {
|
||||
byFrequency[candidate.centerFrequencyKhz] = candidate;
|
||||
}
|
||||
}
|
||||
|
||||
final merged = byFrequency.values.toList()
|
||||
..sort((a, b) {
|
||||
final occupancyCompare = a.occupancyPercent.compareTo(
|
||||
b.occupancyPercent,
|
||||
);
|
||||
if (occupancyCompare != 0) return occupancyCompare;
|
||||
final peakCompare = a.peakRssiDbm.compareTo(b.peakRssiDbm);
|
||||
if (peakCompare != 0) return peakCompare;
|
||||
return a.avgRssiDbm.compareTo(b.avgRssiDbm);
|
||||
});
|
||||
return merged;
|
||||
}
|
||||
|
||||
Future<void> _runSpectrumScan() async {
|
||||
final connectionProvider = context.read<ConnectionProvider>();
|
||||
final bandwidthKhz = _bandwidthToKhz(_selectedBandwidth);
|
||||
final sectors = _buildScanSectors(bandwidthKhz);
|
||||
final sectorCandidates = <SpectrumScanCandidate>[];
|
||||
|
||||
setState(() {
|
||||
_isSpectrumScanRunning = true;
|
||||
_resetDerivedScanResults();
|
||||
_completedScanSectors = 0;
|
||||
_totalScanSectors = sectors.length;
|
||||
});
|
||||
|
||||
try {
|
||||
for (var i = 0; i < sectors.length; i++) {
|
||||
final sector = sectors[i];
|
||||
final result = await connectionProvider.scanSpectrum(
|
||||
startFrequencyKhz: sector.$1,
|
||||
stopFrequencyKhz: sector.$2,
|
||||
bandwidthKhz: bandwidthKhz.round(),
|
||||
stepKhz: (bandwidthKhz / 2).round().clamp(1, 1000),
|
||||
dwellMs: 160,
|
||||
thresholdDb: 8,
|
||||
);
|
||||
if (result != null) {
|
||||
sectorCandidates.addAll(result.candidates);
|
||||
final mergedCandidates = _mergeSectorCandidates(sectorCandidates);
|
||||
if (mounted) {
|
||||
setState(() {
|
||||
_scanCandidates = mergedCandidates;
|
||||
if (_selectedScanFrequencyKhz == null &&
|
||||
mergedCandidates.isNotEmpty) {
|
||||
_selectedScanFrequencyKhz =
|
||||
mergedCandidates.first.centerFrequencyKhz;
|
||||
}
|
||||
_completedScanSectors = i + 1;
|
||||
});
|
||||
}
|
||||
} else if (mounted) {
|
||||
setState(() {
|
||||
_completedScanSectors = i + 1;
|
||||
});
|
||||
}
|
||||
}
|
||||
} finally {
|
||||
if (mounted) {
|
||||
setState(() {
|
||||
_isSpectrumScanRunning = false;
|
||||
if (_completedScanSectors == 0) {
|
||||
_totalScanSectors = sectors.length;
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
if (!mounted) return;
|
||||
|
||||
final mergedCandidates = _mergeSectorCandidates(sectorCandidates);
|
||||
if (mergedCandidates.isEmpty) {
|
||||
ScaffoldMessenger.of(context).showSnackBar(
|
||||
SnackBar(
|
||||
content: Text(AppLocalizations.of(context)!.spectrumScanReturnedNoCandidateFrequencies),
|
||||
backgroundColor: Colors.red,
|
||||
),
|
||||
);
|
||||
return;
|
||||
}
|
||||
|
||||
setState(() {
|
||||
_scanCandidates = mergedCandidates;
|
||||
_selectedScanFrequencyKhz = mergedCandidates.first.centerFrequencyKhz;
|
||||
});
|
||||
}
|
||||
|
||||
Future<void> _applySelectedScanFrequency() async {
|
||||
if (_selectedScanFrequencyKhz == null) return;
|
||||
|
||||
final connectionProvider = context.read<ConnectionProvider>();
|
||||
final deviceInfo = connectionProvider.deviceInfo;
|
||||
|
||||
await connectionProvider.setRadioParams(
|
||||
frequency: _selectedScanFrequencyKhz!,
|
||||
bandwidth: _bandwidthOptions.indexOf(_selectedBandwidth),
|
||||
spreadingFactor: deviceInfo.radioSf ?? 8,
|
||||
codingRate: deviceInfo.radioCr ?? 8,
|
||||
repeat: deviceInfo.clientRepeat,
|
||||
);
|
||||
await connectionProvider.refreshDeviceInfo();
|
||||
|
||||
if (!mounted) return;
|
||||
ScaffoldMessenger.of(context).showSnackBar(
|
||||
SnackBar(
|
||||
content: Text(
|
||||
'Applied ${(_selectedScanFrequencyKhz! / 1000.0).toStringAsFixed(3)} MHz',
|
||||
),
|
||||
backgroundColor: Colors.green,
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
int? _currentPreviewFrequencyKhz(DeviceInfo deviceInfo) {
|
||||
if (_selectedScanFrequencyKhz != null) {
|
||||
return _selectedScanFrequencyKhz;
|
||||
}
|
||||
return deviceInfo.radioFreq;
|
||||
}
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
final deviceInfo = context.watch<ConnectionProvider>().deviceInfo;
|
||||
final theme = Theme.of(context);
|
||||
final possibleBracketFrequencies = _possibleBracketFrequenciesKhz();
|
||||
final recommendedScanCandidates = _recommendedScanCandidates;
|
||||
final recommendationFrequencies = recommendedScanCandidates.isNotEmpty
|
||||
? recommendedScanCandidates
|
||||
.map((candidate) => candidate.centerFrequencyKhz)
|
||||
.toList()
|
||||
: possibleBracketFrequencies;
|
||||
|
||||
return Scaffold(
|
||||
appBar: AppBar(title: Text(AppLocalizations.of(context)!.spectrumScan)),
|
||||
body: ListView(
|
||||
padding: const EdgeInsets.all(16),
|
||||
children: [
|
||||
Card(
|
||||
child: Padding(
|
||||
padding: const EdgeInsets.all(16),
|
||||
child: Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: [
|
||||
DropdownButtonFormField<String>(
|
||||
initialValue: _selectedBandwidth,
|
||||
decoration: const InputDecoration(
|
||||
labelText: 'Bandwidth',
|
||||
border: OutlineInputBorder(),
|
||||
helperText:
|
||||
'Scan and apply frequencies for this bandwidth',
|
||||
),
|
||||
items: _bandwidthOptions.map((value) {
|
||||
return DropdownMenuItem<String>(
|
||||
value: value,
|
||||
child: Text(value),
|
||||
);
|
||||
}).toList(),
|
||||
onChanged: (value) {
|
||||
if (value == null) return;
|
||||
setState(() {
|
||||
_selectedBandwidth = value;
|
||||
_resetDerivedScanResults();
|
||||
});
|
||||
},
|
||||
),
|
||||
const SizedBox(height: 16),
|
||||
Text(
|
||||
deviceInfo.spectrumScanMinKhz != null &&
|
||||
deviceInfo.spectrumScanMaxKhz != null
|
||||
? 'Firmware scan range: ${_scanRangeMinMhz.toStringAsFixed(3)}-${_scanRangeMaxMhz.toStringAsFixed(3)} MHz'
|
||||
: 'Fallback scan range selected from current band. MeshCore commonly uses EU868 or US915.',
|
||||
style: theme.textTheme.bodySmall?.copyWith(
|
||||
color: theme.colorScheme.onSurfaceVariant,
|
||||
),
|
||||
),
|
||||
if (_isSpectrumScanRunning) ...[
|
||||
const SizedBox(height: 8),
|
||||
Text(
|
||||
'Scanning sector ${_completedScanSectors + 1} of $_totalScanSectors. Results update as each sector completes.',
|
||||
style: theme.textTheme.bodySmall?.copyWith(
|
||||
color: theme.colorScheme.primary,
|
||||
fontWeight: FontWeight.w600,
|
||||
),
|
||||
),
|
||||
],
|
||||
const SizedBox(height: 12),
|
||||
SpectrumScanPanel(
|
||||
theme: theme,
|
||||
scanSupported: deviceInfo.supportsSpectrumScan == true,
|
||||
isRunning: _isSpectrumScanRunning,
|
||||
rangeMinMhz: _scanRangeMinMhz,
|
||||
rangeMaxMhz: _scanRangeMaxMhz,
|
||||
rangeValues: _scanRangeValues,
|
||||
bandwidthKhz: _bandwidthToKhz(_selectedBandwidth),
|
||||
selectedFrequencyKhz: _currentPreviewFrequencyKhz(
|
||||
deviceInfo,
|
||||
),
|
||||
graphCandidates: _scanCandidates,
|
||||
selectableCandidates: recommendedScanCandidates,
|
||||
onRangeChanged: (values) {
|
||||
setState(() {
|
||||
_scanRangeValues = values;
|
||||
_resetDerivedScanResults();
|
||||
});
|
||||
},
|
||||
onCandidateChanged: (value) {
|
||||
setState(() {
|
||||
_selectedScanFrequencyKhz = value;
|
||||
});
|
||||
},
|
||||
onRunScan: _runSpectrumScan,
|
||||
onApplySelected: _applySelectedScanFrequency,
|
||||
),
|
||||
if (recommendationFrequencies.isNotEmpty) ...[
|
||||
const SizedBox(height: 18),
|
||||
Text(
|
||||
_scanCandidates.isNotEmpty
|
||||
? 'Recommended profiles'
|
||||
: 'Possible brackets',
|
||||
style: theme.textTheme.titleMedium?.copyWith(
|
||||
fontWeight: FontWeight.w700,
|
||||
),
|
||||
),
|
||||
const SizedBox(height: 8),
|
||||
Text(
|
||||
_scanCandidates.isNotEmpty
|
||||
? 'Suggested frequencies from the latest scan with the radio parameters to keep alongside them.'
|
||||
: 'Usable frequency brackets derived from the selected span and bandwidth, even without live scan data.',
|
||||
style: theme.textTheme.bodySmall?.copyWith(
|
||||
color: theme.colorScheme.onSurfaceVariant,
|
||||
),
|
||||
),
|
||||
const SizedBox(height: 12),
|
||||
for (
|
||||
var i = 0;
|
||||
i < recommendationFrequencies.length;
|
||||
i++
|
||||
) ...[
|
||||
_RecommendationTile(
|
||||
title: _recommendationTitle(i),
|
||||
frequencyKhz: recommendationFrequencies[i],
|
||||
candidate: recommendedScanCandidates.isNotEmpty
|
||||
? recommendedScanCandidates[i]
|
||||
: null,
|
||||
bandwidthKhz: _bandwidthToKhz(_selectedBandwidth),
|
||||
paramsLabel: _currentParamProfile(deviceInfo),
|
||||
isSelected:
|
||||
_selectedScanFrequencyKhz ==
|
||||
recommendationFrequencies[i],
|
||||
onSelect: () {
|
||||
setState(() {
|
||||
_selectedScanFrequencyKhz =
|
||||
recommendationFrequencies[i];
|
||||
});
|
||||
},
|
||||
),
|
||||
if (i != recommendationFrequencies.length - 1)
|
||||
const SizedBox(height: 10),
|
||||
],
|
||||
],
|
||||
],
|
||||
),
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
class _RecommendationTile extends StatelessWidget {
|
||||
final String title;
|
||||
final int frequencyKhz;
|
||||
final SpectrumScanCandidate? candidate;
|
||||
final double bandwidthKhz;
|
||||
final String paramsLabel;
|
||||
final bool isSelected;
|
||||
final VoidCallback onSelect;
|
||||
|
||||
const _RecommendationTile({
|
||||
required this.title,
|
||||
required this.frequencyKhz,
|
||||
required this.candidate,
|
||||
required this.bandwidthKhz,
|
||||
required this.paramsLabel,
|
||||
required this.isSelected,
|
||||
required this.onSelect,
|
||||
});
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
final theme = Theme.of(context);
|
||||
final scheme = theme.colorScheme;
|
||||
|
||||
return InkWell(
|
||||
onTap: onSelect,
|
||||
borderRadius: BorderRadius.circular(14),
|
||||
child: Container(
|
||||
padding: const EdgeInsets.all(14),
|
||||
decoration: BoxDecoration(
|
||||
color: isSelected
|
||||
? scheme.primaryContainer.withValues(alpha: 0.55)
|
||||
: scheme.surfaceContainerHighest.withValues(alpha: 0.35),
|
||||
borderRadius: BorderRadius.circular(14),
|
||||
border: Border.all(
|
||||
color: isSelected ? scheme.primary : scheme.outlineVariant,
|
||||
),
|
||||
),
|
||||
child: Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: [
|
||||
Row(
|
||||
children: [
|
||||
Expanded(
|
||||
child: Text(
|
||||
title,
|
||||
style: theme.textTheme.titleSmall?.copyWith(
|
||||
fontWeight: FontWeight.w700,
|
||||
),
|
||||
),
|
||||
),
|
||||
if (isSelected)
|
||||
Icon(Icons.check_circle, color: scheme.primary, size: 18),
|
||||
],
|
||||
),
|
||||
const SizedBox(height: 8),
|
||||
Text(
|
||||
'${(frequencyKhz / 1000.0).toStringAsFixed(3)} MHz',
|
||||
style: theme.textTheme.headlineSmall?.copyWith(
|
||||
fontWeight: FontWeight.w800,
|
||||
),
|
||||
),
|
||||
const SizedBox(height: 6),
|
||||
Text(paramsLabel, style: theme.textTheme.bodyMedium),
|
||||
const SizedBox(height: 6),
|
||||
Text(
|
||||
candidate != null
|
||||
? 'Occupancy ${candidate!.occupancyPercent}% | Avg ${candidate!.avgRssiDbm} dBm | Peak ${candidate!.peakRssiDbm} dBm'
|
||||
: 'Bracket ${(frequencyKhz / 1000.0 - bandwidthKhz / 2000.0).toStringAsFixed(3)}-${(frequencyKhz / 1000.0 + bandwidthKhz / 2000.0).toStringAsFixed(3)} MHz',
|
||||
style: theme.textTheme.bodySmall?.copyWith(
|
||||
color: scheme.onSurfaceVariant,
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
);
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user