pxt-microbit 4.1.39 → 4.1.42

package/built/editor.js

@@ -3160,11 +3160,13 @@ function bufferConcat(a, b) {
 class DAPWrapper {
     constructor(io) {
         this.io = io;
+        this.initialized = false;
         this.flashAborted = false;
         this.connectionId = 0;
         this.pbuf = new pxt.U.PromiseBuffer();
         this.pageSize = 1024;
         this.numPages = 256;
+        this.usesCODAL = undefined;
         // we don't know yet if jacdac was compiled in the hex
         this.jacdacInHex = undefined;
         this.forceFullFlash = /webusbfullflash=1/.test(window.location.href);
@@ -3178,11 +3180,11 @@ class DAPWrapper {
             log(`device connection changed`);
             this.disconnectAsync()
                 .then(() => {
-                if (!connect)
-                    return;
                 // we don't know what's being connected
                 this.usesCODAL = undefined;
                 this.jacdacInHex = undefined;
+                if (!connect)
+                    return;
                 this.reconnectAsync();
             });
         };
@@ -3241,6 +3243,7 @@ class DAPWrapper {
             if (d > 500) {
                 this.processSerialLine(this.pendingSerial);
                 this.pendingSerial = null;
+                this.lastPendingSerial = undefined;
             }
         }
         return len;
@@ -3250,12 +3253,21 @@ class DAPWrapper {
         log(`start read serial ${connectionId}`);
         const readSerialLoop = async () => {
             try {
+                let numSer = 0;
+                let numEv = 0;
                 while (connectionId === this.connectionId) {
-                    const len = await this.readSerial();
-                    const hasData = len > 0;
-                    //if (hasData)
-                    //    logV(`serial read ${len} bytes`)
-                    await this.jacdacProcess(hasData);
+                    numSer = await this.readSerial();
+                    // we need to read jacdac in a tight loop
+                    // so we don't miss any event
+                    if (this.xchgAddr)
+                        numEv = await this.jacdacProcess();
+                    else
+                        numEv = 0;
+                    // no data on either side, wait as little as possible
+                    // the browser will eventually throttle this call
+                    // https://developer.mozilla.org/en-US/docs/Web/API/setTimeout#reasons_for_delays_longer_than_specified
+                    if (!numSer && !numEv)
+                        await pxt.U.delay(0);
                 }
                 log(`stopped serial reader ${connectionId}`);
             }
@@ -3272,10 +3284,21 @@ class DAPWrapper {
                     // if we've been running for a while, try reconnecting
                     if (timeRunning > 1000) {
                         log(`auto-reconnect`);
-                        await this.reconnectAsync();
+                        try {
+                            await this.reconnectAsync();
+                        }
+                        catch (e) {
+                            if (e.type === "devicenotfound")
+                                return;
+                            throw e;
+                        }
                     }
                 }
             }
+            finally {
+                this.pendingSerial = undefined;
+                this.lastPendingSerial = undefined;
+            }
         };
         readSerialLoop();
     }
@@ -3296,23 +3319,39 @@ class DAPWrapper {
         this.cortexM = new DapJS.CortexM(this.dap);
     }
     get binName() {
+        if (this.usesCODAL === undefined)
+            console.warn('try to access codal information before it is computed');
         return (this.usesCODAL ? "mbcodal-" : "mbdal-") + pxtc.BINARY_HEX;
     }
     unsupportedParts() {
+        if (this.usesCODAL === undefined)
+            console.warn('try to access codal information before it is computed');
         if (!this.usesCODAL) {
             return ["logotouch", "builtinspeaker", "microphone", "flashlog"];
         }
         return [];
     }
+    isConnected() {
+        return this.io.isConnected() && this.initialized;
+    }
+    isConnecting() {
+        return this.io.isConnecting() || (this.io.isConnected() && !this.initialized);
+    }
     async reconnectAsync() {
         log(`reconnect`);
+        this.initialized = false;
         this.flashAborted = false;
+        this.io.onConnectionChanged();
         function stringResponse(buf) {
             return pxt.U.uint8ArrayToString(buf.slice(2, 2 + buf[1]));
         }
         await this.stopReadersAsync();
+        const connectionId = this.connectionId;
         this.allocDAP(); // clean dap apis
         await this.io.reconnectAsync();
+        // halt before reading from dap
+        // to avoid interference from data logger
+        await this.cortexM.halt();
         // before calling into dapjs, we use our dapCmdNums() a few times, which which will make sure the responses
         // to commends from previous sessions (if any) are flushed
         const info = await this.dapCmdNums(0x00, 0x04); // info
@@ -3337,11 +3376,13 @@ class DAPWrapper {
         this.pageSize = res[0];
         this.numPages = res[1];
         log(`page size ${this.pageSize}, num pages ${this.numPages}`);
+        // jacdac needs to run to set the xchg address
         await this.checkStateAsync(true);
+        await this.initJacdac(connectionId);
+        this.initialized = true;
+        this.io.onConnectionChanged();
         // start jacdac, serial async
-        const connectionId = this.connectionId;
-        this.startJacdacSetup(connectionId)
-            .then(() => this.startReadSerial(connectionId));
+        this.startReadSerial(connectionId);
     }
     async checkStateAsync(resume) {
         const states = ["reset", "lockup", "sleeping", "halted", "running"];
@@ -3364,6 +3405,7 @@ class DAPWrapper {
     disconnectAsync() {
         log(`disconnect`);
         this.flashAborted = true;
+        this.initialized = false;
         return this.stopReadersAsync()
             .then(() => this.io.disconnectAsync());
     }
@@ -3424,8 +3466,10 @@ class DAPWrapper {
                 log(msg + "; retrying");
                 return this.recvPacketAsync()
                     .then(resp => {
-                    if (resp[0] == buf[0])
+                    if (resp[0] == buf[0]) {
+                        log(msg + "; retry success");
                         return resp;
+                    }
                     throw new Error(msg);
                 }, err => {
                     throw new Error(msg);
@@ -3706,11 +3750,10 @@ class DAPWrapper {
         return null;
     }
     /**
-     * Start trying to connect to Jacdac in the background
-     * and gracefull cancel as needed
+     * Sniff Jacdac exchange address
      * @returns
      */
-    async startJacdacSetup(connectionId) {
+    async initJacdac(connectionId) {
         this.xchgAddr = null;
         this.irqn = undefined;
         this.lastXchg = undefined;
@@ -3730,7 +3773,8 @@ class DAPWrapper {
             let xchg;
             while (xchg == null && xchgRetry++ < 3) {
                 log(`jacdac: finding xchg address (retry ${xchgRetry})`);
-                await pxt.Util.delay(500); // wait for the program to start and setup memory correctly
+                if (xchgRetry > 0)
+                    await pxt.Util.delay(500); // wait for the program to start and setup memory correctly
                 if (connectionId != this.connectionId)
                     return;
                 xchg = await this.findJacdacXchgAddr(connectionId);
@@ -3775,12 +3819,7 @@ class DAPWrapper {
         const addr = 0xE000E200 + (this.irqn >> 5) * 4;
         await this.writeWord(addr, 1 << (this.irqn & 31));
     }
-    async jacdacProcess(hadSerial) {
-        if (this.xchgAddr == null) {
-            if (!hadSerial)
-                await this.dapDelay(5000);
-            return;
-        }
+    async jacdacProcess() {
         const now = Date.now();
         if (this.lastXchg && now - this.lastXchg > 50) {
             logV("slow xchg: " + (now - this.lastXchg) + "ms");
@@ -3832,15 +3871,7 @@ class DAPWrapper {
                 }
             }
         }
-        if (numev == 0 && !hadSerial)
-            await this.dapDelay(5000);
-    }
-    dapDelay(micros) {
-        if (micros > 0xffff)
-            throw new Error("too large delay");
-        const cmd = new Uint8Array([0x09, 0, 0]);
-        pxt.HF2.write16(cmd, 1, micros);
-        return this.dapCmd(cmd);
+        return numev;
     }
 }
 function mkDAPLinkPacketIOWrapper(io) {