pxt-microbit 5.1.30 → 5.1.32

package/built/editor.js

@@ -3355,9 +3355,12 @@ class DAPWrapper {
         this.cortexM = new DapJS.CortexM(this.dap);
     }
     get binName() {
+        return `${this.devVariant}-${pxtc.BINARY_HEX}`;
+    }
+    get devVariant() {
         if (this.usesCODAL === undefined)
             console.warn('try to access codal information before it is computed');
-        return (this.usesCODAL ? "mbcodal-" : "mbdal-") + pxtc.BINARY_HEX;
+        return this.usesCODAL ? "mbcodal" : "mbdal";
     }
     unsupportedParts() {
         if (this.usesCODAL === undefined)
@@ -3551,7 +3554,7 @@ class DAPWrapper {
                 pxt.tickEvent('hid.flash.full.error.open', { res: res[1] });
                 throw new Error(lf("Download failed, please try again"));
             }
-            const binFile = resp.outfiles[this.binName];
+            const binFile = this.getBinFile(resp);
             log(`bin file ${this.binName} in ${Object.keys(resp.outfiles).join(', ')}, ${(binFile === null || binFile === void 0 ? void 0 : binFile.length) || -1}b`);
             const hexUint8 = pxt.U.stringToUint8Array(binFile);
             log(`hex ${(hexUint8 === null || hexUint8 === void 0 ? void 0 : hexUint8.byteLength) || -1}b, ~${(hexUint8.byteLength / chunkSize) | 0} chunks of ${chunkSize}b`);
@@ -3620,10 +3623,18 @@ class DAPWrapper {
             return uicr;
         });
     }
+    getBinFile(resp) {
+        var _a;
+        const multiVariantBinFile = resp.outfiles[this.binName];
+        if (multiVariantBinFile)
+            return multiVariantBinFile;
+        const dvBin = ((_a = resp.builtVariants) === null || _a === void 0 ? void 0 : _a.find(el => el === this.devVariant)) && resp.outfiles[pxtc.BINARY_HEX];
+        if (dvBin)
+            return resp.outfiles[pxtc.BINARY_HEX];
+        throw new Error(`unable to find ${this.binName} in outfiles ${Object.keys(resp.outfiles).join(', ')}`);
+    }
     computeFlashChecksum(resp) {
-        const binFile = resp.outfiles[this.binName];
-        if (!binFile)
-            throw new Error(`unable to find ${this.binName} in outfiles ${Object.keys(resp.outfiles).join(', ')}`);
+        const binFile = this.getBinFile(resp);
         return this.getFlashChecksumsAsync()
             .then(checksums => {
             log(`checksums ${pxt.Util.toHex(checksums)}`);