pxt-microbit 5.1.33 → 5.1.35

package/built/common-sim.d.ts

@@ -938,9 +938,15 @@ declare namespace pxsim.input {
 }
 declare namespace pxsim {
     interface MicrophoneBoard {
-        microphoneState: AnalogSensorState;
+        microphoneState: MicrophoneState;
     }
-    function microphoneState(): AnalogSensorState;
+    class MicrophoneState extends AnalogSensorState {
+        onSoundRegistered: boolean;
+        soundLevelRequested: boolean;
+        private pingUsed;
+        pingSoundLevel: () => void;
+    }
+    function microphoneState(): MicrophoneState;
 }
 declare namespace pxsim.music {
     function playInstructions(b: RefBuffer): Promise<void>;

package/built/common-sim.js

@@ -3181,6 +3181,27 @@ var pxsim;
 })(pxsim || (pxsim = {}));
 var pxsim;
 (function (pxsim) {
+    class MicrophoneState extends pxsim.AnalogSensorState {
+        constructor() {
+            super(...arguments);
+            this.onSoundRegistered = false;
+            this.soundLevelRequested = false;
+            this.pingSoundLevel = () => {
+                if (this.onSoundRegistered) {
+                    return;
+                }
+                this.soundLevelRequested = true;
+                pxsim.runtime.queueDisplayUpdate();
+                clearTimeout(this.pingUsed);
+                this.pingUsed = setTimeout(() => {
+                    this.soundLevelRequested = false;
+                    pxsim.runtime.queueDisplayUpdate();
+                    this.pingUsed = undefined;
+                }, 100);
+            };
+        }
+    }
+    pxsim.MicrophoneState = MicrophoneState;
     function microphoneState() {
         return pxsim.board().microphoneState;
     }

package/built/editor.js

@@ -3476,7 +3476,7 @@ class DAPWrapper {
         return this.stopReadersAsync()
             .then(() => this.io.disconnectAsync());
     }
-    reflashAsync(resp) {
+    reflashAsync(resp, progressCallback) {
         var _a, _b;
         pxt.tickEvent("hid.flash.start");
         log("reflash");
@@ -3496,7 +3496,7 @@ class DAPWrapper {
             // shortcut, do a full flash
             if (uicr != 0 || this.forceFullFlash) {
                 pxt.tickEvent("hid.flash.uicrfail");
-                return this.fullVendorCommandFlashAsync(resp);
+                return this.fullVendorCommandFlashAsync(resp, progressCallback);
             }
             // check flash checksums
             return this.computeFlashChecksum(resp)
@@ -3504,9 +3504,9 @@ class DAPWrapper {
                 pxt.tickEvent("hid.flash.checksum", { quick: chk.quick ? 1 : 0, changed: chk.changed ? chk.changed.length : 0 });
                 // let's do a quick flash!
                 if (chk.quick)
-                    return this.quickHidFlashAsync(chk.changed);
+                    return this.quickHidFlashAsync(chk.changed, progressCallback);
                 else
-                    return this.fullVendorCommandFlashAsync(resp);
+                    return this.fullVendorCommandFlashAsync(resp, progressCallback);
             });
         })
             .then(() => this.checkStateAsync(true))
@@ -3548,9 +3548,10 @@ class DAPWrapper {
     dapCmdNums(...nums) {
         return this.dapCmd(new Uint8Array(nums));
     }
-    fullVendorCommandFlashAsync(resp) {
+    fullVendorCommandFlashAsync(resp, progressCallback) {
         log("full flash");
         pxt.tickEvent("hid.flash.full.start");
+        const start = Date.now();
         const chunkSize = 62;
         let sentPages = 0;
         return pxt.Util.promiseTimeout(FULL_FLASH_TIMEOUT, Promise.resolve()
@@ -3572,8 +3573,10 @@ class DAPWrapper {
                 cmdData[0] = 0x8C; /* DAPLinkFlash.WRITE */
                 cmdData[1] = nextPageData.length;
                 cmdData.set(nextPageData, 2);
-                if (sentPages % 128 == 0) // reduce logging
+                if (sentPages % 128 == 0) { // reduce logging
+                    progressCallback(offset / hexUint8.length);
                     log(`next page ${sentPages}: [${offset.toString(16)}, ${end.toString(16)}] (${Math.ceil((hexUint8.length - end) / 1000)}kb left)`);
+                }
                 return this.dapCmd(cmdData)
                     .then(() => {
                     this.checkAborted();
@@ -3596,7 +3599,7 @@ class DAPWrapper {
         })
             .then((res) => {
             log(`daplinkreset: ${pxt.U.toHex(res)}`);
-            log(`full flash done`);
+            log(`full flash done after ${Date.now() - start}ms`);
             pxt.tickEvent("hid.flash.full.success");
         }), timeoutMessage).catch((e) => {
             log(`error: abort`);
@@ -3660,9 +3663,10 @@ class DAPWrapper {
             };
         });
     }
-    quickHidFlashAsync(changed) {
+    quickHidFlashAsync(changed, progressCallback) {
         log("quick flash");
         pxt.tickEvent("hid.flash.quick.start");
+        const start = Date.now();
         const runFlash = (b, dataAddr) => {
             const cmd = this.cortexM.prepareCommand();
             cmd.halt();
@@ -3693,6 +3697,7 @@ class DAPWrapper {
                 return Promise.resolve();
             }
             log(`about to write at 0x${b.targetAddr.toString(16)}`);
+            progressCallback(i / changed.length);
             let writeBl = Promise.resolve();
             let thisAddr = (i & 1) ? dataAddr : dataAddr + this.pageSize;
             let nextAddr = (i & 1) ? dataAddr + this.pageSize : dataAddr;
@@ -3721,7 +3726,7 @@ class DAPWrapper {
             });
         }))
             .then(() => {
-            log("quick flash done");
+            log(`quick flash done after ${Date.now() - start}ms`);
             return this.cortexM.reset(false);
         })
             .then(() => {

package/built/sim.d.ts

@@ -18,7 +18,7 @@ declare namespace pxsim {
         lightSensorState: LightSensorState;
         buttonPairState: ButtonPairState;
         radioState: RadioState;
-        microphoneState: AnalogSensorState;
+        microphoneState: MicrophoneState;
         recordingState: RecordingState;
         lightState: pxt.Map<CommonNeoPixelState>;
         fileSystem: FileSystemState;
@@ -898,9 +898,15 @@ declare namespace pxsim {
 }
 declare namespace pxsim {
     interface MicrophoneBoard {
-        microphoneState: AnalogSensorState;
+        microphoneState: MicrophoneState;
     }
-    function microphoneState(): AnalogSensorState;
+    class MicrophoneState extends AnalogSensorState {
+        onSoundRegistered: boolean;
+        soundLevelRequested: boolean;
+        private pingUsed;
+        pingSoundLevel: () => void;
+    }
+    function microphoneState(): MicrophoneState;
 }
 declare namespace pxsim {
     enum NeoPixelMode {

package/built/sim.js

@@ -70,7 +70,7 @@ var pxsim;
                 ID_RADIO: 9 /* MICROBIT_ID_RADIO */,
                 RADIO_EVT_DATAGRAM: 1 /* MICROBIT_RADIO_EVT_DATAGRAM */
             });
-            this.builtinParts["microphone"] = this.microphoneState = new pxsim.AnalogSensorState(3001 /* DEVICE_ID_MICROPHONE */, 0, 255, 86, 165);
+            this.builtinParts["microphone"] = this.microphoneState = new pxsim.MicrophoneState(3001 /* DEVICE_ID_MICROPHONE */, 0, 255, 86, 165);
             this.builtinParts["recording"] = this.recordingState = new pxsim.RecordingState();
             this.builtinParts["accelerometer"] = this.accelerometerState = new pxsim.AccelerometerState(pxsim.runtime);
             this.builtinParts["serial"] = this.serialState = new pxsim.SerialState(pxsim.runtime, this);
@@ -1822,6 +1822,7 @@ var pxsim;
             if (!b)
                 return 0;
             b.setUsed();
+            b.pingSoundLevel();
             return b.getLevel();
         }
         input.soundLevel = soundLevel;
@@ -1830,6 +1831,7 @@ var pxsim;
             if (!b)
                 return;
             b.setUsed();
+            b.onSoundRegistered = true;
             pxsim.pxtcore.registerWithDal(b.id, sound, body);
         }
         input.onSound = onSound;
@@ -1837,7 +1839,6 @@ var pxsim;
             const b = pxsim.microphoneState();
             if (!b)
                 return;
-            b.setUsed();
             if (sound === 2 /* SoundThreshold.Loud */)
                 b.setHighThreshold(threshold);
             else
@@ -2305,6 +2306,7 @@ var pxsim;
         function stopRecorder(b) {
             b.recordingState.recorder.stop();
             b.recordingState.currentlyRecording = false;
+            pxsim.runtime.queueDisplayUpdate();
             if (b.recordingState.stream.active) {
                 b.recordingState.stream.getAudioTracks().forEach(track => {
                     track.stop();
@@ -2336,7 +2338,6 @@ var pxsim;
                     pxsim.runtime.queueDisplayUpdate();
                     b.recordingState.recordTimeoutID = setTimeout(() => {
                         stopRecorder(b);
-                        pxsim.runtime.queueDisplayUpdate();
                     }, 5000);
                     b.recordingState.recorder.ondataavailable = (e) => {
                         b.recordingState.chunks.push(e.data);
@@ -3201,11 +3202,11 @@ path.sim-board {
                     return;
                 let theme = this.props.theme;
                 if (this.microphoneLed) {
-                    if (b.recordingState.currentlyRecording) {
+                    if (b.recordingState.currentlyRecording || b.microphoneState.soundLevelRequested) {
                         pxsim.svg.fills([this.microphoneLed], theme.ledOn);
                         pxsim.svg.filter(this.microphoneLed, `url(#ledglow)`);
                     }
-                    else if (!b.microphoneState.sensorUsed) {
+                    else if (!(b.microphoneState.onSoundRegistered || b.microphoneState.soundLevelRequested)) {
                         pxsim.svg.fills([this.microphoneLed], theme.ledOff);
                         pxsim.svg.filter(this.microphoneLed, `url(#none)`);
                     }
@@ -4427,6 +4428,27 @@ var pxsim;
 })(pxsim || (pxsim = {}));
 var pxsim;
 (function (pxsim) {
+    class MicrophoneState extends pxsim.AnalogSensorState {
+        constructor() {
+            super(...arguments);
+            this.onSoundRegistered = false;
+            this.soundLevelRequested = false;
+            this.pingSoundLevel = () => {
+                if (this.onSoundRegistered) {
+                    return;
+                }
+                this.soundLevelRequested = true;
+                pxsim.runtime.queueDisplayUpdate();
+                clearTimeout(this.pingUsed);
+                this.pingUsed = setTimeout(() => {
+                    this.soundLevelRequested = false;
+                    pxsim.runtime.queueDisplayUpdate();
+                    this.pingUsed = undefined;
+                }, 100);
+            };
+        }
+    }
+    pxsim.MicrophoneState = MicrophoneState;
     function microphoneState() {
         return pxsim.board().microphoneState;
     }