KB8PMY
/
meshcore-client
mirror of https://github.com/OffbandMesh/meshcore-client.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Enhance USB functionality by adding request port label management and platform support checks

Browse Source
chore/offband-rebrand
just_stuff_tm 5 months ago committed by just-stuff-tm
parent ca5784f3f8
commit 781090243c
7 changed files with 93 additions and 34 deletions
Show Stats Download Patch File Download Diff File

4
lib/connector/meshcore_connector.dart
Unescape View File

@ -767,6 +767,10 @@ class MeshCoreConnector extends ChangeNotifier {
Future<List<String>> listUsbPorts() => _usbSerialService.listPorts();
void setUsbRequestPortLabel(String label) {
_usbSerialService.setRequestPortLabel(label);
}
Future<void> connect(BluetoothDevice device, {String? displayName}) async {
if (_state == MeshCoreConnectionState.connecting ||
_state == MeshCoreConnectionState.connected) {

24
lib/screens/connection_choice_screen.dart
Unescape View File

@ -3,6 +3,7 @@ import 'dart:math' as math;
import 'package:flutter/material.dart';
import '../l10n/l10n.dart';
import '../utils/platform_info.dart';
import 'scanner_screen.dart';
import 'usb_screen.dart';
@ -14,6 +15,7 @@ class ConnectionChoiceScreen extends StatelessWidget {
Widget build(BuildContext context) {
final l10n = context.l10n;
final theme = Theme.of(context);
final usbSupported = PlatformInfo.supportsUsbSerial;
return Scaffold(
appBar: AppBar(
title: FittedBox(
@ -82,14 +84,18 @@ class ConnectionChoiceScreen extends StatelessWidget {
label: l10n.connectionChoiceUsbLabel,
color: theme.colorScheme.primaryContainer,
iconColor: theme.colorScheme.onPrimaryContainer,
onPressed: () {
debugPrint(
'ConnectionChoiceScreen: USB selected, opening UsbScreen',
);
Navigator.of(context).push(
MaterialPageRoute(builder: (_) => const UsbScreen()),
);
},
onPressed: usbSupported
? () {
debugPrint(
'ConnectionChoiceScreen: USB selected, opening UsbScreen',
);
Navigator.of(context).push(
MaterialPageRoute(
builder: (_) => const UsbScreen(),
),
);
}
: null,
),
),
SizedBox(height: gap),
@ -133,7 +139,7 @@ class _ConnectionMethodButton extends StatelessWidget {
final IconData icon;
final String label;
final VoidCallback onPressed;
final VoidCallback? onPressed;
final Color color;
final Color iconColor;

8
lib/screens/usb_screen.dart
Unescape View File

@ -61,6 +61,12 @@ class _UsbScreenState extends State<UsbScreen> {
unawaited(_loadPorts());
}
@override
void didChangeDependencies() {
super.didChangeDependencies();
_connector.setUsbRequestPortLabel(context.l10n.usbScreenStatus);
}
@override
void dispose() {
_connector.removeListener(_connectionListener);
@ -389,6 +395,7 @@ class _UsbScreenState extends State<UsbScreen> {
Future<void> _loadPorts() async {
if (!mounted) return;
_connector.setUsbRequestPortLabel(context.l10n.usbScreenStatus);
setState(() {
_isLoadingPorts = true;
@ -425,6 +432,7 @@ class _UsbScreenState extends State<UsbScreen> {
if (selectedPort == null || selectedPort.isEmpty) {
return;
}
_connector.setUsbRequestPortLabel(context.l10n.usbScreenStatus);
if (_connector.state != MeshCoreConnectionState.disconnected) {
setState(() {
_isConnecting = false;

58
lib/services/usb_serial_service_native.dart
Unescape View File

@ -5,6 +5,7 @@ import 'package:flserial/flserial_exception.dart';
import 'package:flutter/foundation.dart';
import 'package:flutter/services.dart';
import '../utils/platform_info.dart';
import '../utils/usb_port_labels.dart';
import 'usb_serial_frame_codec.dart';
@ -21,28 +22,38 @@ class UsbSerialService {
);
final StreamController<Uint8List> _frameController =
StreamController<Uint8List>.broadcast();
final FlSerial _serial = FlSerial();
final UsbSerialFrameDecoder _frameDecoder = UsbSerialFrameDecoder();
StreamSubscription<dynamic>? _androidDataSubscription;
StreamSubscription<FlSerialEventArgs>? _dataSubscription;
UsbSerialStatus _status = UsbSerialStatus.disconnected;
String? _connectedPortName;
FlSerial? _serial;
UsbSerialStatus get status => _status;
String? get activePortName => _connectedPortName;
Stream<Uint8List> get frameStream => _frameController.stream;
bool get _useAndroidUsbHost =>
!kIsWeb && defaultTargetPlatform == TargetPlatform.android;
bool get _useDesktopFlSerial =>
PlatformInfo.isWindows || PlatformInfo.isLinux;
bool get _isSupportedPlatform => _useAndroidUsbHost || _useDesktopFlSerial;
FlSerial get _nativeSerial => _serial ??= FlSerial();
bool get isConnected {
if (!_isSupportedPlatform) {
return false;
}
if (_useAndroidUsbHost) {
return _status == UsbSerialStatus.connected;
}
return _status == UsbSerialStatus.connected &&
_serial.isOpen() == FlOpenStatus.open;
_serial?.isOpen() == FlOpenStatus.open;
}
Future<List<String>> listPorts() async {
if (!_isSupportedPlatform) {
return const <String>[];
}
if (_useAndroidUsbHost) {
final ports = await _androidMethodChannel.invokeListMethod<String>(
'listPorts',
@ -60,6 +71,9 @@ class UsbSerialService {
_status == UsbSerialStatus.connecting) {
throw StateError('USB serial transport is already active');
}
if (!_isSupportedPlatform) {
throw UnsupportedError('USB serial is not supported on this platform.');
}
_status = UsbSerialStatus.connecting;
final normalizedPortName = normalizeUsbPortName(portName);
@ -78,32 +92,35 @@ class UsbSerialService {
throw StateError(error.message ?? error.code);
}
} else {
_serial.init();
final serial = _nativeSerial;
serial.init();
try {
final status = _serial.openPort(normalizedPortName, baudRate);
final status = serial.openPort(normalizedPortName, baudRate);
if (status != FlOpenStatus.open) {
throw StateError(
'Failed to open USB port $normalizedPortName ($status)',
);
}
_serial.setByteSize8();
_serial.setBitParityNone();
_serial.setStopBits1();
_serial.setFlowControlNone();
_serial.setRTS(false);
_serial.setDTR(true);
serial.setByteSize8();
serial.setBitParityNone();
serial.setStopBits1();
serial.setFlowControlNone();
serial.setRTS(false);
serial.setDTR(true);
debugPrint(
'USB serial opened port=$normalizedPortName cts=${_serial.getCTS()} dsr=${_serial.getDSR()} dtr=true rts=false',
'USB serial opened port=$normalizedPortName cts=${serial.getCTS()} dsr=${serial.getDSR()} dtr=true rts=false',
);
} on FlSerialException catch (error) {
_serial.free();
_serial?.free();
_serial = null;
_status = UsbSerialStatus.disconnected;
throw StateError(
'Failed to open USB port $normalizedPortName: ${error.msg} (${error.error})',
);
} catch (error) {
_serial.free();
_serial?.free();
_serial = null;
_status = UsbSerialStatus.disconnected;
rethrow;
}
@ -119,7 +136,7 @@ class UsbSerialService {
onDone: _handleSerialDone,
);
} else {
_dataSubscription = _serial.onSerialData.stream.listen(
_dataSubscription = _nativeSerial.onSerialData.stream.listen(
_handleSerialData,
onError: _handleSerialError,
onDone: _handleSerialDone,
@ -143,7 +160,7 @@ class UsbSerialService {
throw StateError(error.message ?? error.code);
}
} else {
_serial.write(packet);
_nativeSerial.write(packet);
}
}
@ -165,18 +182,23 @@ class UsbSerialService {
}
} else {
try {
if (_serial.isOpen() == FlOpenStatus.open) {
_serial.closePort();
if (_serial?.isOpen() == FlOpenStatus.open) {
_serial?.closePort();
}
} catch (_) {
// Ignore errors while closing.
}
_serial.free();
_serial?.free();
_serial = null;
}
_status = UsbSerialStatus.disconnected;
}
void setRequestPortLabel(String label) {
// Native implementations do not use a synthetic chooser row.
}
void updateConnectedLabel(String label) {
final trimmed = label.trim();
if (trimmed.isEmpty) {

18
lib/services/usb_serial_service_web.dart
Unescape View File

@ -26,6 +26,7 @@ class UsbSerialService {
JSObject? _writer;
String? _connectedPortName;
String? _connectedPortKey;
String _requestPortLabel = 'Choose USB Device';
UsbSerialStatus get status => _status;
String? get activePortName => _connectedPortName;
@ -49,7 +50,7 @@ class UsbSerialService {
final ports = await _getAuthorizedPorts();
if (ports.isEmpty) {
return const <String>[usbRequestPortLabel];
return <String>[_requestPortLabel];
}
return ports.map(_displayLabelForPort).toList(growable: false);
}
@ -159,6 +160,14 @@ class UsbSerialService {
_connectedPortName = _buildDisplayLabel(portKey);
}
void setRequestPortLabel(String label) {
final trimmed = label.trim();
if (trimmed.isEmpty) {
return;
}
_requestPortLabel = trimmed;
}
void dispose() {
unawaited(disconnect().whenComplete(_closeFrameController));
}
@ -189,7 +198,7 @@ class UsbSerialService {
if (ports.isEmpty) {
return null;
}
if (requestedPortName.isEmpty || requestedPortName == usbRequestPortLabel) {
if (requestedPortName.isEmpty || requestedPortName == _requestPortLabel) {
return ports.first;
}
for (final port in ports) {
@ -350,7 +359,7 @@ class UsbSerialService {
try {
final info = port.callMethod<JSAny?>('getInfo'.toJS);
if (info == null) {
return usbRequestPortLabel;
return _requestPortLabel;
}
final infoObject = info as JSObject;
@ -366,10 +375,11 @@ class UsbSerialService {
return describeWebUsbPort(
vendorId: hasVendor ? vendorId.toInt() : null,
productId: hasProduct ? productId.toInt() : null,
requestPortLabel: _requestPortLabel,
knownUsbNames: _knownUsbNames,
);
} catch (_) {
return usbRequestPortLabel;
return _requestPortLabel;
}
}

10
lib/utils/platform_info.dart
Unescape View File

@ -33,4 +33,14 @@ class PlatformInfo {
/// Whether the app is running on a desktop platform (macOS, Windows, or Linux).
static bool get isDesktop => isMacOS || isWindows || isLinux;
/// Whether the current platform supports a native USB serial backend.
static bool get supportsNativeUsbSerial => isAndroid || isWindows || isLinux;
/// Whether the current browser supports the Web Serial backend.
static bool get supportsWebSerial => isWeb && isChrome;
/// Whether USB serial is expected to be available on the current platform.
static bool get supportsUsbSerial =>
supportsNativeUsbSerial || supportsWebSerial;
}

5
lib/utils/usb_port_labels.dart
Unescape View File

@ -1,5 +1,3 @@
const String usbRequestPortLabel = 'Choose USB Device';
String normalizeUsbPortName(String portLabel) {
final separatorIndex = portLabel.indexOf(' - ');
final normalized = separatorIndex >= 0
@ -23,10 +21,11 @@ String friendlyUsbPortName(String portLabel) {
String describeWebUsbPort({
required int? vendorId,
required int? productId,
String requestPortLabel = 'Choose USB Device',
Map<String, String> knownUsbNames = const <String, String>{},
}) {
if (vendorId == null && productId == null) {
return usbRequestPortLabel;
return requestPortLabel;
}
final vendorHex = vendorId?.toRadixString(16).padLeft(4, '0').toUpperCase();

Write Preview
Loading…
Cancel
Save

Powered by TurnKey Linux.