pxt-microbit 4.1.37 → 4.1.38

package/built/editor.js

@@ -3160,14 +3160,13 @@ function bufferConcat(a, b) {
 class DAPWrapper {
     constructor(io) {
         this.io = io;
-        this.flashing = false;
         this.flashAborted = false;
-        this.readSerialId = 0;
+        this.connectionId = 0;
         this.pbuf = new pxt.U.PromiseBuffer();
         this.pageSize = 1024;
         this.numPages = 256;
-        this.usesCODAL = false;
-        this.jacdacInHex = false;
+        // we don't know yet if jacdac was compiled in the hex
+        this.jacdacInHex = undefined;
         this.forceFullFlash = /webusbfullflash=1/.test(window.location.href);
         this.onSerial = (buf, isStderr) => { };
         this.onCustomEvent = (type, payload) => { };
@@ -3178,7 +3177,14 @@ class DAPWrapper {
         this.io.onDeviceConnectionChanged = (connect) => {
             log(`device connection changed`);
             this.disconnectAsync()
-                .then(() => connect && this.reconnectAsync());
+                .then(() => {
+                if (!connect)
+                    return;
+                // we don't know what's being connected
+                this.usesCODAL = undefined;
+                this.jacdacInHex = undefined;
+                this.reconnectAsync();
+            });
         };
         this.io.onData = buf => {
             // console.log("RD: " + pxt.Util.toHex(buf))
@@ -3186,9 +3192,6 @@ class DAPWrapper {
         };
         this.allocDAP();
     }
-    get useJACDAC() {
-        return this.jacdacInHex && this.usesCODAL;
-    }
     processSerialLine(line) {
         if (this.onSerial) {
             try {
@@ -3243,12 +3246,12 @@ class DAPWrapper {
         return len;
     }
     startReadSerial() {
-        const rid = this.readSerialId;
+        const rid = this.connectionId;
         const startTime = Date.now();
         log(`start read serial ${rid}`);
         const readSerialLoop = async () => {
             try {
-                while (rid === this.readSerialId) {
+                while (rid === this.connectionId) {
                     const len = await this.readSerial();
                     const hasData = len > 0;
                     //if (hasData)
@@ -3260,7 +3263,7 @@ class DAPWrapper {
             catch (err) {
                 log(`serial error ${rid}: ${err.message}`);
                 console.error(err);
-                if (rid != this.readSerialId) {
+                if (rid != this.connectionId) {
                     log(`stopped serial reader ${rid}`);
                 }
                 else {
@@ -3277,9 +3280,9 @@ class DAPWrapper {
         };
         readSerialLoop();
     }
-    stopSerialAsync() {
-        log(`cancelling serial reader ${this.readSerialId}`);
-        this.readSerialId++;
+    stopReadersAsync() {
+        log(`cancelling connection ${this.connectionId}`);
+        this.connectionId++;
         return pxt.Util.delay(200);
     }
     allocDAP() {
@@ -3291,7 +3294,6 @@ class DAPWrapper {
             read: () => this.recvPacketAsync(),
             //sendMany: sendMany
         });
-        this.cmsisdap = this.dap.dap;
         this.cortexM = new DapJS.CortexM(this.dap);
     }
     get binName() {
@@ -3309,7 +3311,7 @@ class DAPWrapper {
         function stringResponse(buf) {
             return pxt.U.uint8ArrayToString(buf.slice(2, 2 + buf[1]));
         }
-        await this.stopSerialAsync();
+        await this.stopReadersAsync();
         this.allocDAP(); // clean dap apis
         await this.io.reconnectAsync();
         // before calling into dapjs, we use our dapCmdNums() a few times, which which will make sure the responses
@@ -3337,7 +3339,8 @@ class DAPWrapper {
         this.numPages = res[1];
         log(`page size ${this.pageSize}, num pages ${this.numPages}`);
         await this.checkStateAsync(true);
-        await this.jacdacSetup();
+        // start jacdac, serial async
+        this.startJacdacSetup();
         this.startReadSerial();
     }
     async checkStateAsync(resume) {
@@ -3361,7 +3364,7 @@ class DAPWrapper {
     disconnectAsync() {
         log(`disconnect`);
         this.flashAborted = true;
-        return this.stopSerialAsync()
+        return this.stopReadersAsync()
             .then(() => this.io.disconnectAsync());
     }
     reflashAsync(resp) {
@@ -3369,13 +3372,12 @@ class DAPWrapper {
         pxt.tickEvent("hid.flash.start");
         log("reflash");
         startTime = 0;
-        const codalJson = resp.outfiles["codal.json"];
         // JACDAC_WEBUSB is defined in microsoft/pxt-jacdac/pxt.json
+        const codalJson = resp.outfiles["codal.json"];
         this.jacdacInHex = codalJson && !!((_b = (_a = pxt.Util.jsonTryParse(codalJson)) === null || _a === void 0 ? void 0 : _a.definitions) === null || _b === void 0 ? void 0 : _b.JACDAC_WEBUSB);
         this.flashAborted = false;
-        this.flashing = true;
         return (this.io.isConnected() ? Promise.resolve() : this.io.reconnectAsync())
-            .then(() => this.stopSerialAsync())
+            .then(() => this.stopReadersAsync())
             .then(() => this.cortexM.init())
             .then(() => this.cortexM.reset(true))
             .then(() => this.checkStateAsync())
@@ -3399,8 +3401,7 @@ class DAPWrapper {
             });
         })
             .then(() => this.checkStateAsync(true))
-            .then(() => pxt.tickEvent("hid.flash.success"))
-            .finally(() => { this.flashing = false; });
+            .then(() => pxt.tickEvent("hid.flash.success"));
         // don't disconnect here
         // the micro:bit will automatically disconnect and reconnect
         // via the webusb events
@@ -3691,7 +3692,7 @@ class DAPWrapper {
     writeWord(addr, val) {
         return this.cortexM.memory.write32(addr, val);
     }
-    async findJacdacXchgAddr() {
+    async findJacdacXchgAddr(cid) {
         const memStart = 536870912;
         const memStop = memStart + 128 * 1024;
         const checkSize = 1024;
@@ -3709,7 +3710,7 @@ class DAPWrapper {
             }
             return 0;
         };
-        while (true) {
+        while (cid == this.connectionId) {
             const a0 = await check(p0);
             if (a0)
                 return a0;
@@ -3721,46 +3722,77 @@ class DAPWrapper {
             p0 -= checkSize;
             p1 += checkSize;
         }
+        return null;
     }
-    async jacdacSetup() {
+    /**
+     * Start trying to connect to Jacdac in the background
+     * and gracefull cancel as needed
+     * @returns
+     */
+    async startJacdacSetup() {
         this.xchgAddr = null;
-        if (!this.useJACDAC) {
-            log(`jacdac: disabled`);
+        this.irqn = undefined;
+        if (!this.usesCODAL) {
+            log(`jacdac: CODAL disabled`);
             return;
         }
-        // allow jacdac to boot
-        const now = pxt.U.now();
-        await pxt.Util.delay(1000);
-        let xchgRetry = 0;
-        let xchg;
-        while (xchg == null && xchgRetry++ < 2) {
-            log(`jacdac: finding xchg address (retry ${xchgRetry})`);
-            await pxt.Util.delay(100); // wait for the program to start and setup memory correctly
-            xchg = await this.findJacdacXchgAddr();
-        }
-        log(`jacdac: exchange address 0x${xchg ? xchg.toString(16) : "?"}; ${xchgRetry} retries; ${(pxt.U.now() - now) | 0}ms`);
-        if (xchg == null) {
-            log("jacdac: xchg address not found");
-            pxt.tickEvent("hid.flash.jacdac.error.missingxchg");
+        if (this.jacdacInHex === false) {
+            log(`jacdac: jacdac not compiled in`);
             return;
         }
-        const info = await this.readBytes(xchg, 16);
-        this.irqn = info[8];
-        if (info[12 + 2] != 0xff) {
-            log("jacdac: invalid memory; try power-cycling the micro:bit");
-            pxt.tickEvent("hid.flash.jacdac.error.invalidmemory");
-            console.debug({ info, xchg });
-            return;
+        const cid = this.connectionId;
+        try {
+            // allow jacdac to boot
+            const now = pxt.U.now();
+            await pxt.Util.delay(1000);
+            let xchgRetry = 0;
+            let xchg;
+            while (xchg == null && xchgRetry++ < 2) {
+                log(`jacdac: finding xchg address (retry ${xchgRetry})`);
+                await pxt.Util.delay(100); // wait for the program to start and setup memory correctly
+                if (cid != this.connectionId)
+                    return;
+                xchg = await this.findJacdacXchgAddr(cid);
+            }
+            log(`jacdac: exchange address 0x${xchg ? xchg.toString(16) : "?"}; ${xchgRetry} retries; ${(pxt.U.now() - now) | 0}ms`);
+            if (xchg == null) {
+                log("jacdac: xchg address not found");
+                this.jacdacInHex = false;
+                pxt.tickEvent("hid.flash.jacdac.error.missingxchg");
+                return;
+            }
+            if (cid != this.connectionId)
+                return;
+            const info = await this.readBytes(xchg, 16);
+            if (info[12 + 2] != 0xff) {
+                log("jacdac: invalid memory; try power-cycling the micro:bit");
+                pxt.tickEvent("hid.flash.jacdac.error.invalidmemory");
+                console.debug({ info, xchg });
+                return;
+            }
+            // make sure connection is not outdated
+            if (cid != this.connectionId)
+                return;
+            // clear initial lock
+            await this.writeWord(xchg + 12, 0);
+            // allow serial thread to use jacdac
+            this.irqn = info[8];
+            this.xchgAddr = xchg;
+            log(`jacdac: exchange address 0x${this.xchgAddr.toString(16)}; irqn=${this.irqn}`);
+            pxt.tickEvent("hid.flash.jacdac.connected");
+        }
+        catch (e) {
+            if (cid != this.connectionId) {
+                log(`jacdac: setup aborted`);
+                return;
+            }
+            else
+                throw e;
         }
-        this.xchgAddr = xchg;
-        // clear initial lock
-        await this.writeWord(xchg + 12, 0);
-        log(`jacdac: exchange address 0x${xchg.toString(16)}; irqn=${this.irqn}`);
-        pxt.tickEvent("hid.flash.jacdac.connected");
     }
-    async triggerIRQ(irqn) {
-        const addr = 0xE000E200 + (irqn >> 5) * 4;
-        await this.writeWord(addr, 1 << (irqn & 31));
+    async triggerIRQ() {
+        const addr = 0xE000E200 + (this.irqn >> 5) * 4;
+        await this.writeWord(addr, 1 << (this.irqn & 31));
     }
     async jacdacProcess(hadSerial) {
         if (this.xchgAddr == null) {
@@ -3778,7 +3810,7 @@ class DAPWrapper {
         let inp = await this.readBytes(this.xchgAddr + 12, 256);
         if (inp[2]) {
             await this.writeWord(this.xchgAddr + 12, 0);
-            await this.triggerIRQ(this.irqn);
+            await this.triggerIRQ();
             inp = inp.slice(0, inp[2] + 12);
             this.onCustomEvent("jacdac", inp);
             numev++;
@@ -3805,7 +3837,7 @@ class DAPWrapper {
                 await this.writeWords(this.xchgAddr + 12 + 256 + 4, new Uint32Array(bbody.buffer));
                 const bhead = this.currSend.buf.slice(0, 4);
                 await this.writeWords(this.xchgAddr + 12 + 256, new Uint32Array(bhead.buffer));
-                await this.triggerIRQ(this.irqn);
+                await this.triggerIRQ();
                 this.lastSend = Date.now();
                 numev++;
             }

package/built/sim.d.ts

@@ -585,6 +585,7 @@ declare namespace pxsim.serial {
     function setTxBufferSize(size: number): void;
     function readBuffer(length: number): RefBuffer;
     function setBaudRate(rate: number): void;
+    function writeDmesg(): void;
 }
 declare namespace pxsim.music {
     function __playSoundExpression(notes: string, waitTillDone: boolean): void;

package/built/sim.js

@@ -2359,6 +2359,10 @@ var pxsim;
             // TODO
         }
         serial.setBaudRate = setBaudRate;
+        function writeDmesg() {
+            // TODO
+        }
+        serial.writeDmesg = writeDmesg;
     })(serial = pxsim.serial || (pxsim.serial = {}));
 })(pxsim || (pxsim = {}));
 var pxsim;