pxt-common-packages 10.1.7 → 10.1.8

package/libs/lcd/built/debug/binary.js

@@ -56,7 +56,7 @@ const pxsim_pxtrt = pxsim.pxtrt;
 const pxsim_numops = pxsim.numops;
 
 
-function _main___P48221(s) {
+function _main___P48261(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -66,19 +66,19 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    globals._intervals___48464 = (undefined);
-    globals._pollEventQueue___48477 = (undefined);
+    globals._intervals___48504 = (undefined);
+    globals._pollEventQueue___48517 = (undefined);
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-_main___P48221.info = {"start":0,"length":0,"line":0,"column":0,"endLine":0,"endColumn":0,"fileName":"characterlcd.ts","functionName":"<main>","argumentNames":[]}
-_main___P48221.continuations = [  ]
+_main___P48261.info = {"start":0,"length":0,"line":0,"column":0,"endLine":0,"endColumn":0,"fileName":"characterlcd.ts","functionName":"<main>","argumentNames":[]}
+_main___P48261.continuations = [  ]
 
-function _main___P48221_mk(s) {
+function _main___P48261_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: _main___P48221, depth: s.depth + 1,
+        parent: s, fn: _main___P48261, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
 } }
 
@@ -88,5 +88,5 @@ function _main___P48221_mk(s) {
 
 const breakpoints = setupDebugger(1, [])
 
-return _main___P48221
+return _main___P48261
 })

package/libs/light-spectrum-sensor/built/debug/binary.js

@@ -56,7 +56,7 @@ const pxsim_pxtrt = pxsim.pxtrt;
 const pxsim_numops = pxsim.numops;
 
 
-function _main___P96995(s) {
+function _main___P97115(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -66,19 +66,19 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    globals._intervals___97238 = (undefined);
-    globals._pollEventQueue___97251 = (undefined);
+    globals._intervals___97358 = (undefined);
+    globals._pollEventQueue___97371 = (undefined);
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-_main___P96995.info = {"start":0,"length":0,"line":0,"column":0,"endLine":0,"endColumn":0,"fileName":"tsl2591.ts","functionName":"<main>","argumentNames":[]}
-_main___P96995.continuations = [  ]
+_main___P97115.info = {"start":0,"length":0,"line":0,"column":0,"endLine":0,"endColumn":0,"fileName":"tsl2591.ts","functionName":"<main>","argumentNames":[]}
+_main___P97115.continuations = [  ]
 
-function _main___P96995_mk(s) {
+function _main___P97115_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: _main___P96995, depth: s.depth + 1,
+        parent: s, fn: _main___P97115, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
 } }
 
@@ -88,5 +88,5 @@ function _main___P96995_mk(s) {
 
 const breakpoints = setupDebugger(1, [])
 
-return _main___P96995
+return _main___P97115
 })

package/libs/lora/built/debug/binary.js

@@ -56,7 +56,7 @@ const pxsim_pxtrt = pxsim.pxtrt;
 const pxsim_numops = pxsim.numops;
 
 
-function _main___P59523(s) {
+function _main___P59563(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -66,19 +66,19 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    globals._intervals___59766 = (undefined);
-    globals._pollEventQueue___59779 = (undefined);
+    globals._intervals___59806 = (undefined);
+    globals._pollEventQueue___59819 = (undefined);
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-_main___P59523.info = {"start":0,"length":0,"line":0,"column":0,"endLine":0,"endColumn":0,"fileName":"lora.ts","functionName":"<main>","argumentNames":[]}
-_main___P59523.continuations = [  ]
+_main___P59563.info = {"start":0,"length":0,"line":0,"column":0,"endLine":0,"endColumn":0,"fileName":"lora.ts","functionName":"<main>","argumentNames":[]}
+_main___P59563.continuations = [  ]
 
-function _main___P59523_mk(s) {
+function _main___P59563_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: _main___P59523, depth: s.depth + 1,
+        parent: s, fn: _main___P59563, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
 } }
 
@@ -88,5 +88,5 @@ function _main___P59523_mk(s) {
 
 const breakpoints = setupDebugger(1, [])
 
-return _main___P59523
+return _main___P59563
 })

package/libs/matrix-keypad/built/debug/binary.js

@@ -56,7 +56,7 @@ const pxsim_pxtrt = pxsim.pxtrt;
 const pxsim_numops = pxsim.numops;
 
 
-function _main___P188067(s) {
+function _main___P188347(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -66,19 +66,19 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    globals._intervals___188310 = (undefined);
-    globals._pollEventQueue___188323 = (undefined);
+    globals._intervals___188590 = (undefined);
+    globals._pollEventQueue___188603 = (undefined);
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-_main___P188067.info = {"start":0,"length":0,"line":0,"column":0,"endLine":0,"endColumn":0,"fileName":"keypad.ts","functionName":"<main>","argumentNames":[]}
-_main___P188067.continuations = [  ]
+_main___P188347.info = {"start":0,"length":0,"line":0,"column":0,"endLine":0,"endColumn":0,"fileName":"keypad.ts","functionName":"<main>","argumentNames":[]}
+_main___P188347.continuations = [  ]
 
-function _main___P188067_mk(s) {
+function _main___P188347_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: _main___P188067, depth: s.depth + 1,
+        parent: s, fn: _main___P188347, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
 } }
 
@@ -88,5 +88,5 @@ function _main___P188067_mk(s) {
 
 const breakpoints = setupDebugger(1, [])
 
-return _main___P188067
+return _main___P188347
 })

package/libs/mixer/melody.ts

@@ -112,7 +112,7 @@ namespace music {
 
     /**
      * Play a melody from the melody editor.
-     * @param melody - string of up to eight notes [C D E F G A B C5] or rests [-] separated by spaces, 
+     * @param melody - string of up to eight notes [C D E F G A B C5] or rests [-] separated by spaces,
      * which will be played one at a time, ex: "E D G F B A C5 B "
      * @param tempo - number in beats per minute (bpm), dictating how long each note will play for
      */
@@ -176,7 +176,7 @@ namespace music {
      */
     //% help=music/stop-all-sounds
     //% blockId=music_stop_all_sounds block="stop all sounds"
-    //% weight=10
+    //% weight=45
     //% group="Sounds"
     export function stopAllSounds() {
         Melody.stopAll();

package/libs/mixer/pxt.json

@@ -13,6 +13,7 @@
         "ns.ts",
         "targetoverrides.ts",
         "music.ts",
+        "soundEffect.ts",
         "pxtparts.json",
         "headphone.svg"
     ],

package/libs/mixer/sim/music.ts

@@ -1,6 +1,6 @@
 namespace pxsim.music {
     export function playInstructions(b: RefBuffer) {
-        return AudioContextManager.playInstructionsAsync(b)
+        return AudioContextManager.playInstructionsAsync(b.data)
     }
 
     export function queuePlayInstructions(when: number, b: RefBuffer) {

package/libs/mixer/soundEffect.ts

@@ -0,0 +1,380 @@
+enum WaveShape {
+    //% block="sine"
+    Sine = 0,
+    //% block="sawtooth"
+    Sawtooth = 1,
+    //% block="triangle"
+    Triangle = 2,
+    //% block="square"
+    Square = 3,
+    //% block="noise"
+    Noise = 4
+}
+
+enum InterpolationCurve {
+    //% block="linear"
+    Linear,
+    //% block="curve"
+    Curve,
+    //% block="logarithmic"
+    Logarithmic
+}
+
+enum SoundExpressionEffect {
+    //% block="none"
+    None = 0,
+    //% block="vibrato"
+    Vibrato = 1,
+    //% block="tremolo"
+    Tremolo = 2,
+    //% block="warble"
+    Warble = 3
+}
+
+enum SoundExpressionPlayMode {
+    //% block="until done"
+    UntilDone,
+    //% block="in background"
+    InBackground
+}
+
+namespace music {
+    export class SoundEffect {
+        waveShape: WaveShape;
+        startFrequency: number;
+        endFrequency: number;
+        startVolume: number;
+        endVolume: number;
+        duration: number;
+        effect: SoundExpressionEffect;
+        interpolation: InterpolationCurve;
+
+        constructor() {
+            this.waveShape = WaveShape.Sine;
+            this.startFrequency = 5000;
+            this.endFrequency = 1;
+            this.startVolume = 255;
+            this.endVolume = 0;
+            this.duration = 1000;
+            this.effect = SoundExpressionEffect.None;
+            this.interpolation = InterpolationCurve.Linear;
+        }
+
+        toBuffer(volume?: number) {
+            if (volume === undefined) volume = music.volume();
+
+            return soundToInstructionBuffer(
+                this.waveShape,
+                this.startFrequency,
+                this.endFrequency,
+                this.startVolume,
+                this.endVolume,
+                this.duration,
+                this.effect,
+                this.interpolation,
+                20,
+                1,
+                volume
+            );
+        }
+    }
+
+
+    /**
+     * Play a SoundEffect.
+     * @param sound the SoundEffect to play
+     * @param mode the play mode, play until done or in the background
+     */
+    //% blockId=soundExpression_playSoundEffect
+    //% block="play sound $sound $mode"
+    //% sound.shadow=soundExpression_createSoundEffect
+    //% weight=30
+    //% help=music/play-sound-effect
+    //% blockGap=8
+    //% group="Sounds"
+    export function playSoundEffect(sound: SoundEffect, mode: SoundExpressionPlayMode) {
+        const toPlay = sound.toBuffer(music.volume());
+
+        queuePlayInstructions(0, toPlay);
+        if (mode === SoundExpressionPlayMode.UntilDone) {
+            pause(sound.duration);
+        }
+    }
+
+    /**
+     * Create a sound expression from a set of sound effect parameters.
+     * @param waveShape waveform of the sound effect
+     * @param startFrequency starting frequency for the sound effect waveform
+     * @param endFrequency ending frequency for the sound effect waveform
+     * @param startVolume starting volume of the sound, or starting amplitude
+     * @param endVolume ending volume of the sound, or ending amplitude
+     * @param duration the amount of time in milliseconds (ms) that sound will play for
+     * @param effect the effect to apply to the waveform or volume
+     * @param interpolation interpolation method for frequency scaling
+     */
+    //% blockId=soundExpression_createSoundEffect
+    //% help=music/create-sound-effect
+    //% block="$waveShape|| start frequency $startFrequency end frequency $endFrequency duration $duration start volume $startVolume end volume $endVolume effect $effect interpolation $interpolation"
+    //% waveShape.defl=WaveShape.Sine
+    //% waveShape.fieldEditor=soundeffect
+    //% waveShape.fieldOptions.useMixerSynthesizer=true
+    //% startFrequency.defl=5000
+    //% startFrequency.min=0
+    //% startFrequency.max=5000
+    //% endFrequency.defl=0
+    //% endFrequency.min=0
+    //% endFrequency.max=5000
+    //% startVolume.defl=255
+    //% startVolume.min=0
+    //% startVolume.max=255
+    //% endVolume.defl=0
+    //% endVolume.min=0
+    //% endVolume.max=255
+    //% duration.defl=500
+    //% duration.min=1
+    //% duration.max=9999
+    //% effect.defl=SoundExpressionEffect.None
+    //% interpolation.defl=InterpolationCurve.Linear
+    //% compileHiddenArguments=true
+    //% inlineInputMode="variable"
+    //% inlineInputModeLimit=3
+    //% expandableArgumentBreaks="3,5"
+    //% weight=20
+    //% group="Sounds"
+    export function createSoundEffect(waveShape: WaveShape, startFrequency: number, endFrequency: number, startVolume: number, endVolume: number, duration: number, effect: SoundExpressionEffect, interpolation: InterpolationCurve): SoundEffect {
+        const result = new SoundEffect();
+
+        result.waveShape = waveShape;
+        result.startFrequency = startFrequency;
+        result.endFrequency = endFrequency;
+        result.startVolume = startVolume;
+        result.endVolume = endVolume;
+        result.duration = duration;
+        result.effect = effect;
+        result.interpolation = interpolation;
+
+        return result;
+    }
+
+    interface Step {
+        frequency: number;
+        volume: number;
+    }
+
+     export function soundToInstructionBuffer(waveShape: WaveShape, startFrequency: number, endFrequency: number, startVolume: number, endVolume: number, duration: number, effect: SoundExpressionEffect, interpolation: InterpolationCurve, fxSteps: number, fxRange: number, globalVolume: number) {
+        const steps: Step[] = [];
+
+        // Optimize the simple case
+        if (interpolation === InterpolationCurve.Linear && effect === SoundExpressionEffect.None) {
+            steps.push({
+                frequency: startFrequency,
+                volume: (startVolume / 255) * globalVolume,
+            })
+            steps.push({
+                frequency: endFrequency,
+                volume: (endVolume / 255) * globalVolume,
+            })
+        }
+        else {
+
+            fxSteps = Math.min(fxSteps, Math.floor(duration / 5))
+
+            const getVolumeAt = (t: number) => ((startVolume + t * (endVolume - startVolume) / duration) / 255) * globalVolume;
+            let getFrequencyAt: (t: number) => number;
+
+            switch (interpolation) {
+                case InterpolationCurve.Linear:
+                    getFrequencyAt = t => startFrequency + t * (endFrequency - startFrequency) / duration;
+                    break;
+                case InterpolationCurve.Curve:
+                    getFrequencyAt = t => startFrequency + (endFrequency - startFrequency) * Math.sin(t / duration * (Math.PI / 2));
+                    break;
+                case InterpolationCurve.Logarithmic:
+                    getFrequencyAt = t => startFrequency + (Math.log(1 + 9 * (t / duration)) / Math.log(10)) * (endFrequency - startFrequency)
+                    break;
+            }
+
+            const timeSlice = duration / fxSteps;
+
+            for (let i = 0; i < fxSteps; i++) {
+                const newStep = {
+                    frequency: getFrequencyAt(i * timeSlice),
+                    volume: getVolumeAt(i * timeSlice)
+                };
+
+                if (effect === SoundExpressionEffect.Tremolo) {
+                    if (i % 2 === 0) {
+                        newStep.volume = Math.max(newStep.volume - fxRange * 500, 0)
+                    }
+                    else {
+                        newStep.volume = Math.min(newStep.volume + fxRange * 500, 1023)
+                    }
+                }
+                else if (effect === SoundExpressionEffect.Vibrato) {
+                    if (i % 2 === 0) {
+                        newStep.frequency = Math.max(newStep.frequency - fxRange * 100, 0)
+                    }
+                    else {
+                        newStep.frequency = newStep.frequency + fxRange * 100
+                    }
+                }
+                else if (effect === SoundExpressionEffect.Warble) {
+                    if (i % 2 === 0) {
+                        newStep.frequency = Math.max(newStep.frequency - fxRange * 1000, 0)
+                    }
+                    else {
+                        newStep.frequency = newStep.frequency + fxRange * 1000
+                    }
+                }
+
+                steps.push(newStep)
+            }
+        }
+
+        const out = control.createBuffer(12 * (steps.length - 1));
+        const stepDuration = Math.floor(duration / (steps.length - 1))
+
+        for (let i = 0; i < steps.length - 1; i++) {
+            const offset = i * 12;
+            out.setNumber(NumberFormat.UInt8LE, offset, waveToValue(waveShape));
+            out.setNumber(NumberFormat.UInt16LE, offset + 2, steps[i].frequency);
+            out.setNumber(NumberFormat.UInt16LE, offset + 4, stepDuration);
+            out.setNumber(NumberFormat.UInt16LE, offset + 6, steps[i].volume);
+            out.setNumber(NumberFormat.UInt16LE, offset + 8, steps[i + 1].volume);
+            out.setNumber(NumberFormat.UInt16LE, offset + 10, steps[i + 1].frequency);
+        }
+
+        return out;
+    }
+
+    function waveToValue(wave: WaveShape) {
+        switch (wave) {
+            case WaveShape.Square: return 15;
+            case WaveShape.Sine: return 3;
+            case WaveShape.Triangle: return 1;
+            case WaveShape.Noise: return 18;
+            case WaveShape.Sawtooth: return 2;
+        }
+    }
+
+
+    /**
+     * Generate a random similar sound effect to the given one.
+     *
+     * @param sound the sound effect
+     */
+    //% blockId=soundExpression_generateSimilarSound
+    //% block="randomize $sound"
+    //% sound.shadow=soundExpression_createSoundEffect
+    //% weight=0 help=music/generate-similar-sound
+    //% blockGap=8
+    //% group="Sounds"
+    export function randomizeSound(sound: SoundEffect) {
+        const res = new SoundEffect();
+        res.waveShape = sound.waveShape;
+        res.startFrequency = sound.startFrequency;
+        res.endFrequency = sound.endFrequency;
+        res.startVolume = sound.startVolume;
+        res.endVolume = sound.endVolume;
+        res.duration = sound.duration;
+        res.effect = sound.effect;
+        res.interpolation = randomInterpolation();
+
+        res.duration = Math.clamp(
+            Math.min(100, res.duration),
+            Math.max(2000, res.duration),
+            res.duration + (Math.random() - 0.5) * res.duration,
+        );
+
+        if (res.waveShape === WaveShape.Noise) {
+            // The primary waveforms don't produce sounds that are similar to noise,
+            // but adding an effect sorta does
+            if (Math.percentChance(20)) {
+                res.waveShape = randomWave();
+                res.effect = randomEffect();
+            }
+        }
+        else {
+            res.waveShape = randomWave();
+
+            // Adding an effect can drastically alter the sound, so keep it
+            // at a low percent chance unless there already is one
+            if (res.effect !== SoundExpressionEffect.None || Math.percentChance(10)) {
+                res.effect = randomEffect();
+            }
+        }
+
+        // Instead of randomly changing the frequency, change the slope and choose
+        // a new start frequency. This keeps a similar profile to the sound
+        const oldFrequencyDifference = res.endFrequency - res.startFrequency;
+        let newFrequencyDifference = oldFrequencyDifference + (oldFrequencyDifference * 2) * (Math.random() - 0.5);
+
+        if (Math.sign(oldFrequencyDifference) !== Math.sign(newFrequencyDifference)) {
+            newFrequencyDifference *= -1;
+        }
+
+        newFrequencyDifference = Math.clamp(-5000, 5000, newFrequencyDifference);
+
+        res.startFrequency = Math.clamp(
+            Math.max(-newFrequencyDifference, 1),
+            Math.clamp(1, 5000, 5000 - newFrequencyDifference),
+            Math.random() * 5000,
+        );
+
+        res.endFrequency = Math.clamp(1, 5000, res.startFrequency + newFrequencyDifference);
+
+        // Same strategy for volume
+        const oldVolumeDifference = res.endVolume - res.startVolume;
+        let newVolumeDifference = oldVolumeDifference + oldVolumeDifference * (Math.random() - 0.5);
+
+        newVolumeDifference = Math.clamp(-255, 255, newVolumeDifference);
+
+        if (Math.sign(oldVolumeDifference) !== Math.sign(newVolumeDifference)) {
+            newVolumeDifference *= -1;
+        }
+
+        res.startVolume = Math.clamp(
+            Math.max(-newVolumeDifference, 0),
+            Math.clamp(0, 255, 255 - newVolumeDifference),
+            Math.random() * 255,
+        );
+
+        res.endVolume = Math.clamp(0, 255, res.startVolume + newVolumeDifference);
+
+        return res;
+    }
+
+    function randomWave() {
+        switch (Math.randomRange(0, 3)) {
+            case 1: return WaveShape.Sawtooth;
+            case 2: return WaveShape.Square;
+            case 3: return WaveShape.Triangle;
+            case 0:
+            default:
+                return WaveShape.Sine;
+        }
+    }
+
+    function randomEffect() {
+        switch (Math.randomRange(0, 2)) {
+            case 1: return SoundExpressionEffect.Warble;
+            case 2: return  SoundExpressionEffect.Tremolo;
+            case 0:
+            default:
+                return SoundExpressionEffect.Vibrato;
+        }
+    }
+
+    function randomInterpolation() {
+        switch (Math.randomRange(0, 2)) {
+            case 1: return InterpolationCurve.Linear;
+            case 2: return  InterpolationCurve.Curve;
+            case 0:
+            default:
+                return InterpolationCurve.Logarithmic;
+        }
+    }
+
+    //% shim=music::queuePlayInstructions
+    function queuePlayInstructions(timeDelta: number, buf: Buffer) { }
+}