From 745d8de475e6757d33907db77007126cee920e8a Mon Sep 17 00:00:00 2001 From: Ernesto Castellotti Date: Fri, 9 Jun 2023 00:36:09 +0200 Subject: Convert sendImageMtd and XYMini to SerialReadWrite (#230) --- assets/js/rootLantiq.js | 27 +++++---------------------- 1 file changed, 5 insertions(+), 22 deletions(-) (limited to 'assets/js/rootLantiq.js') diff --git a/assets/js/rootLantiq.js b/assets/js/rootLantiq.js index 433b060..a3e60b1 100644 --- a/assets/js/rootLantiq.js +++ b/assets/js/rootLantiq.js @@ -161,35 +161,18 @@ async function changeBaudrate(port, newBaudrate, currBaudrate, outputErrorCallba } async function sendImageMtd(port, data, baudRate, outputErrorCallback, progressCallback) { - let reader,writer, readableStreamClosed, writerStreamClosed; + const serial = new SerialReadWrite(port, baudRate); try { - ({ reader, writer, readableStreamClosed, writerStreamClosed } = await openPortLineBreak(port, baudRate)); - await writer.write(`loady 0x${LOAD_ADDR}\n`); + await serial.writeString(`loady 0x${LOAD_ADDR}\n`); await delay(1000); - await closePortLineBreak(port, reader, writer, readableStreamClosed, writerStreamClosed); /* XYMini needs reopen the port */ - } catch (err) { - outputErrorCallback(`Error: ${err.message}`); - await closePortLineBreak(port, reader, writer, readableStreamClosed, writerStreamClosed); - return false; - } - - try { - await port.open({ baudRate: baudRate }); - reader = port.readable.getReader(); - writer = port.writable.getWriter(); - - await sendXYMini(reader, writer, data, baudRate, progressCallback); - await reader.cancel(); - await writer.close(); - await port.close(); + await sendXYMini(serial, data, progressCallback); return true; } catch (err) { - await reader.cancel(); - await writer.close(); - await port.close(); outputErrorCallback(`Error: ${err.message}`); return false; + } finally { + await serial.closePort(); } } -- cgit v1.2.3