mirror of
https://github.com/zjs81/meshcore-open.git
synced 2026-04-20 22:13:48 +00:00
- Rewrite UsbScreen to mirror ScannerScreen patterns (status bar, tap-to-connect port list, bottom FABs, SnackBar errors) - Extract MeshCoreUsbManager from MeshCoreConnector for cleaner USB transport ownership - Add debug logging throughout USB connection flow (connector, manager, web/native services) - Print debug logs to console in debug mode even when app debug log setting is disabled - Localize remaining hardcoded strings (Web Serial Device fallback label, USB status bar keys, companion firmware timeout hint) - Fix Swedish misspelling in translations (stöderliga → stödda) - Guard Linux notification init against missing D-Bus session bus - Fix SNRIndicator hit-test error by adding minimum size constraints - Update USB flow tests for new UI patterns
66 lines
2.1 KiB
Dart
66 lines
2.1 KiB
Dart
String normalizeUsbPortName(String portLabel) {
|
|
final separatorIndex = portLabel.indexOf(' - ');
|
|
final normalized = separatorIndex >= 0
|
|
? portLabel.substring(0, separatorIndex)
|
|
: portLabel;
|
|
return normalized.trim();
|
|
}
|
|
|
|
/// Returns a human-readable name for a serial port label.
|
|
///
|
|
/// The native flserial library encodes port info as a ` - `-separated string:
|
|
/// `"<port> - <description> - <hardware_id>"`
|
|
///
|
|
/// This function extracts the *description* field (index 1) and discards the
|
|
/// raw hardware_id, which is not user-friendly. If the description is missing
|
|
/// or unhelpful (e.g. "n/a"), it falls back to the raw port name.
|
|
String friendlyUsbPortName(String portLabel) {
|
|
final parts = portLabel.split(' - ');
|
|
if (parts.length < 2) {
|
|
return portLabel.trim();
|
|
}
|
|
// parts[0] = port name, parts[1] = description, parts[2+] = hardware id
|
|
final description = parts[1].trim();
|
|
if (description.isEmpty || description.toLowerCase() == 'n/a') {
|
|
return parts[0].trim();
|
|
}
|
|
return description;
|
|
}
|
|
|
|
String describeWebUsbPort({
|
|
required int? vendorId,
|
|
required int? productId,
|
|
String requestPortLabel = 'Choose USB Device',
|
|
String fallbackDeviceName = 'Web Serial Device',
|
|
Map<String, String> knownUsbNames = const <String, String>{},
|
|
}) {
|
|
if (vendorId == null && productId == null) {
|
|
return requestPortLabel;
|
|
}
|
|
|
|
final vendorHex = vendorId?.toRadixString(16).padLeft(4, '0').toUpperCase();
|
|
final productHex = productId?.toRadixString(16).padLeft(4, '0').toUpperCase();
|
|
final knownName = (vendorHex != null && productHex != null)
|
|
? knownUsbNames['${vendorHex.toLowerCase()}:${productHex.toLowerCase()}']
|
|
: null;
|
|
|
|
final parts = <String>[knownName ?? fallbackDeviceName];
|
|
if (vendorHex != null) {
|
|
parts.add('VID:$vendorHex');
|
|
}
|
|
if (productHex != null) {
|
|
parts.add('PID:$productHex');
|
|
}
|
|
return '${parts.first} (${parts.skip(1).join(' ')})';
|
|
}
|
|
|
|
String buildUsbDisplayLabel({
|
|
required String basePortLabel,
|
|
String? deviceName,
|
|
}) {
|
|
final trimmedName = deviceName?.trim() ?? '';
|
|
if (trimmedName.isEmpty) {
|
|
return basePortLabel;
|
|
}
|
|
return '$basePortLabel - $trimmedName';
|
|
}
|