pxt-microbit 4.1.44 → 4.1.45

package/built/editor.js

@@ -3134,6 +3134,8 @@ function log(msg) {
     pxt.debug(`dap ${ts}: ${msg}`);
 }
 const logV = /webusbdbg=1/.test(window.location.href) ? log : (msg) => { };
+const setBaudRateOnConnection = !/webusbbaud=0/.test(window.location.href);
+const resetOnConnection = !/webusbreset=0/.test(window.location.href);
 function murmur3_core(data) {
     let h0 = 0x2F9BE6CC;
     let h1 = 0x1EC3A6C8;
@@ -3337,6 +3339,21 @@ class DAPWrapper {
     isConnecting() {
         return this.io.isConnecting() || (this.io.isConnected() && !this.initialized);
     }
+    async setBaudRate() {
+        log(`set baud rate to 115200`);
+        const baud = new Uint8Array(5);
+        baud[0] = 0x82; // set baud
+        pxt.HF2.write32(baud, 1, 115200);
+        await this.dapCmd(baud);
+        // setting the baud rate on serial may reset NRF (depending on daplink version), so delay after
+        await pxt.Util.delay(200);
+    }
+    async readPageSize() {
+        const res = await this.readWords(0x10000010, 2);
+        this.pageSize = res[0];
+        this.numPages = res[1];
+        log(`page size ${this.pageSize}, num pages ${this.numPages}`);
+    }
     async reconnectAsync() {
         log(`reconnect`);
         this.initialized = false;
@@ -3362,20 +3379,15 @@ class DAPWrapper {
         const binVersion = stringResponse(r);
         log(`bin name: ${this.binName} v:${binVersion}`);
         pxt.tickEvent("hid.flash.connect", { codal: this.usesCODAL ? 1 : 0, daplink: daplinkVersion, bin: binVersion });
-        // set baud rate
-        const baud = new Uint8Array(5);
-        baud[0] = 0x82; // set baud
-        pxt.HF2.write32(baud, 1, 115200);
-        await this.dapCmd(baud);
-        // setting the baud rate on serial may reset NRF (depending on daplink version), so delay after
-        await pxt.Util.delay(200);
+        if (setBaudRateOnConnection)
+            await this.setBaudRate();
         // only init after setting baud rate, in case we got reset
         await this.cortexM.init();
-        await this.cortexM.reset(true);
-        const res = await this.readWords(0x10000010, 2);
-        this.pageSize = res[0];
-        this.numPages = res[1];
-        log(`page size ${this.pageSize}, num pages ${this.numPages}`);
+        if (resetOnConnection) {
+            log(`reset cortex`);
+            await this.cortexM.reset(true);
+        }
+        await this.readPageSize();
         // jacdac needs to run to set the xchg address
         await this.checkStateAsync(true);
         await this.initJacdac(connectionId);