fix: fix dfu id mismatch because stale notification
This commit is contained in:
@ -527,10 +527,33 @@ class FirmwareUpdateService {
|
||||
Future<DfuBootloaderStatus> _sendStartAndWaitForStatus(
|
||||
BootloaderDfuStartPayload payload, {
|
||||
required Duration timeout,
|
||||
}) {
|
||||
return _writeControlAndWaitForStatus(
|
||||
BootloaderDfuProtocol.encodeStartPayload(payload),
|
||||
}) async {
|
||||
final eventCount = _statusEventCount;
|
||||
final encodedPayload = BootloaderDfuProtocol.encodeStartPayload(payload);
|
||||
_log.fine(
|
||||
'Writing DFU START command for session ${payload.sessionId} '
|
||||
'(len=${encodedPayload.length})',
|
||||
);
|
||||
final result = await _transport.writeControl(encodedPayload);
|
||||
if (result.isErr()) {
|
||||
_log.warning('DFU START write failed: ${result.unwrapErr()}');
|
||||
throw _DfuFailure(
|
||||
'Failed to write bootloader control command: ${result.unwrapErr()}',
|
||||
);
|
||||
}
|
||||
return _waitForStatus(
|
||||
afterEventCount: eventCount,
|
||||
timeout: timeout,
|
||||
acceptStatus: (status) {
|
||||
if (status.sessionId == payload.sessionId) {
|
||||
return true;
|
||||
}
|
||||
_log.fine(
|
||||
'Ignoring stale START status for session ${status.sessionId}; '
|
||||
'waiting for session ${payload.sessionId}',
|
||||
);
|
||||
return false;
|
||||
},
|
||||
);
|
||||
}
|
||||
|
||||
@ -708,6 +731,7 @@ class FirmwareUpdateService {
|
||||
required int afterEventCount,
|
||||
required Duration timeout,
|
||||
bool recoverable = false,
|
||||
bool Function(DfuBootloaderStatus status)? acceptStatus,
|
||||
}) async {
|
||||
final deadline = DateTime.now().add(timeout);
|
||||
var observedEvents = afterEventCount;
|
||||
@ -722,7 +746,12 @@ class FirmwareUpdateService {
|
||||
'session=${_latestStatus!.sessionId}, offset=${_latestStatus!.expectedOffset}, '
|
||||
'code=${_statusLabel(_latestStatus!)}',
|
||||
);
|
||||
return _latestStatus!;
|
||||
final status = _latestStatus!;
|
||||
if (acceptStatus == null || acceptStatus(status)) {
|
||||
return status;
|
||||
}
|
||||
observedEvents = _statusEventCount;
|
||||
continue;
|
||||
}
|
||||
|
||||
final remaining = deadline.difference(DateTime.now());
|
||||
|
||||
Reference in New Issue
Block a user