Skip to content

Commit d37a6b6

Browse files
committed
Fix upload speed and status percentage after Connection change
1 parent 9209af5 commit d37a6b6

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

core/serial.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -736,9 +736,8 @@ To add a new serial device, you must add an object to
736736
* sent blocks to 512 because on Mac we seem to lose
737737
* data otherwise (not on any other platforms!) */
738738
if (slowWrite) blockSize=19;
739-
writeData.blockSize = blockSize;
740739

741-
writeData.showStatus &= writeData.data.length>writeData.blockSize;
740+
writeData.showStatus &= writeData.data.length>blockSize;
742741
if (writeData.showStatus) {
743742
Espruino.Core.Status.setStatus("Sending...", writeData.data.length);
744743
console.log("serial: ---> "+JSON.stringify(writeData.data));
@@ -775,12 +774,13 @@ To add a new serial device, you must add an object to
775774
}
776775

777776
let isLast = writeData.data.length == 0;
778-
// update status
779-
if (writeData.showStatus)
780-
Espruino.Core.Status.incrementProgress(d.length);
781777
// actually write data
782778
//console.log("serial: Sending block "+JSON.stringify(d)+", wait "+split.delay+"ms");
779+
Espruino.Core.Serial.connection.chunkSize = blockSize;
783780
Espruino.Core.Serial.connection.write(d, function() { // write data, but the callback returns a promise that delays
781+
// update status
782+
if (writeData.showStatus)
783+
Espruino.Core.Status.incrementProgress(d.length);
784784
return new Promise(resolve => setTimeout(function() {
785785
if (isLast && writeData.showStatus) {
786786
Espruino.Core.Status.setStatus("Sent");

0 commit comments

Comments
 (0)