diff --git a/lib/screens/serial_capture_screen.dart b/lib/screens/serial_capture_screen.dart index 4ecc71c5..c6fd0b1a 100644 --- a/lib/screens/serial_capture_screen.dart +++ b/lib/screens/serial_capture_screen.dart @@ -136,6 +136,7 @@ class _SerialCaptureScreenState extends State { _error = null; }); try { + await _connector?.eraseDeviceCaplog(); // clean session: start from 0 await _setEnabled(true); if (!mounted) return; _startedAt = DateTime.now(); @@ -207,6 +208,7 @@ class _SerialCaptureScreenState extends State { _error = null; }); try { + await c.eraseDeviceCaplog(); // fresh boot log from power-on await _setEnabled(true); // no timer: runs until Stop _startedAt = DateTime.now(); _timedWindowMinutes = null; diff --git a/lib/services/usb_serial_frame_codec.dart b/lib/services/usb_serial_frame_codec.dart index 59e4d4b1..e62e0829 100644 --- a/lib/services/usb_serial_frame_codec.dart +++ b/lib/services/usb_serial_frame_codec.dart @@ -3,7 +3,11 @@ import 'dart:typed_data'; const int usbSerialTxFrameStart = 0x3c; const int usbSerialRxFrameStart = 0x3e; const int usbSerialHeaderLength = 3; -const int usbSerialMaxPayloadLength = 172; +// Max companion frame the decoder will accept, matching the firmware's +// MAX_FRAME_SIZE (BaseSerialInterface.h = 176, "+4 for transport codes"). This +// was 172, which silently rejected full-size frames — exposed by caplog chunks +// (176 B), the first feature to use the full frame. Normal traffic stays <=172. +const int usbSerialMaxPayloadLength = 176; Uint8List wrapUsbSerialTxFrame(Uint8List payload) { if (payload.length > usbSerialMaxPayloadLength) { diff --git a/test/services/usb_serial_frame_size_test.dart b/test/services/usb_serial_frame_size_test.dart new file mode 100644 index 00000000..24225f31 --- /dev/null +++ b/test/services/usb_serial_frame_size_test.dart @@ -0,0 +1,39 @@ +import 'dart:typed_data'; + +import 'package:flutter_test/flutter_test.dart'; +import 'package:meshcore_open/services/usb_serial_frame_codec.dart'; + +/// Wrap [payload] as an inbound (RX) transport frame: [0x3e, len_lo, len_hi, …]. +Uint8List _rxFrame(Uint8List payload) => Uint8List.fromList([ + usbSerialRxFrameStart, + payload.length & 0xff, + (payload.length >> 8) & 0xff, + ...payload, +]); + +void main() { + group('UsbSerialFrameDecoder frame-size boundary (#430)', () { + test('accepts a full 176-byte companion frame (caplog chunk)', () { + // Regression: 172 used to reject this, dropping every full caplog chunk. + final payload = Uint8List(176)..fillRange(0, 176, 0xAB); + final packets = UsbSerialFrameDecoder().ingest(_rxFrame(payload)); + expect(packets, hasLength(1)); + expect(packets.single.payload.length, 176); + }); + + test('decodes 30 full chunks batched into one read (caplog stream)', () { + final buf = []; + for (var i = 0; i < 30; i++) { + buf.addAll(_rxFrame(Uint8List(176)..fillRange(0, 176, i))); + } + final packets = UsbSerialFrameDecoder().ingest(Uint8List.fromList(buf)); + expect(packets, hasLength(30)); + expect(packets.every((p) => p.payload.length == 176), isTrue); + }); + + test('still rejects an over-max (177-byte) frame', () { + final packets = UsbSerialFrameDecoder().ingest(_rxFrame(Uint8List(177))); + expect(packets, isEmpty); + }); + }); +}