pxt-common-packages 13.2.6 → 13.2.8

package/libs/mixer/instrument.ts

@@ -619,6 +619,18 @@ namespace music.sequencer {
                 timePoints.push(nextALTime);
                 nextALTime += ampLFOInterval;
             }
+            // This can happen if our attack + decay time is greater than gate length. Make sure we start
+            // the release stage on time
+            else if (time < gateLength) {
+                time = gateLength;
+                timePoints.push(gateLength);
+            }
+            // If we reach this point, the only thing left is the end of the release stage
+            else {
+                time = totalDuration;
+                timePoints.push(totalDuration);
+            }
+
 
 
             if (time >= totalDuration) {
@@ -669,18 +681,18 @@ namespace music.sequencer {
 
         let nextAmp: number;
         let nextPitch: number;
+        let ptr = 0;
         const out = control.createBuffer(BUFFER_SIZE * timePoints.length);
         for (let i = 1; i < timePoints.length; i++) {
             if (timePoints[i] - prevTime < 5) {
-                prevTime = timePoints[i];
                 continue;
             }
 
             nextAmp = instrumentVolumeAtTime(instrument, gateLength, timePoints[i], volume) | 0;
             nextPitch = instrumentPitchAtTime(instrument, noteFrequency, gateLength, timePoints[i]) | 0
-            addNote(
+            ptr = addNote(
                 out,
-                (i - 1) * 12,
+                ptr,
                 (timePoints[i] - prevTime) | 0,
                 prevAmp,
                 nextAmp,
@@ -697,17 +709,19 @@ namespace music.sequencer {
 
         // Finally, add one extra step to move the amplitude to 0 without
         // clipping just in case the amp LFO caused it to be nonzero
-        addNote(
-            out,
-            (timePoints.length - 1) * 12,
-            10,
-            prevAmp,
-            0,
-            instrument.waveform,
-            prevPitch,
-            255,
-            prevPitch
-        )
+        if (prevAmp > 0) {
+            ptr = addNote(
+                out,
+                ptr,
+                10,
+                prevAmp,
+                0,
+                instrument.waveform,
+                prevPitch,
+                255,
+                prevPitch
+            )
+        }
         return out;
     }
 
@@ -783,7 +797,7 @@ namespace music.sequencer {
      *      of the sound instructions will be longer than this if the amplitude envelope of the
      *      instrument has a nonzero release time
      */
-    function envelopeValueAtTime(envelope: Envelope, time: number, gateLength: number) {
+    function envelopeValueAtTime(envelope: Envelope, time: number, gateLength: number): number {
         // ADSR envelopes consist of 4 stages. They are (in order):
         //     1. The attack stage, where the value starts at 0 and rises to the maximum value
         //     2. The decay stage, where the value falls from the maximum value to the sustain value
@@ -796,19 +810,9 @@ namespace music.sequencer {
         // First check to see if we are already in the release stage
         if (time > gateLength) {
             if (time - gateLength > envelope.release) return 0;
-
-            // Did the gate length end before the attack stage finished?
-            else if (time < envelope.attack) {
-                const height = (envelope.amplitude / envelope.attack) * gateLength;
-                return height - ((height / envelope.release) * (time - gateLength))
-            }
-            // Did the gate length end before the decay stage finished?
-            else if (time < envelope.attack + envelope.decay) {
-                const height2 = envelope.amplitude - ((envelope.amplitude - adjustedSustain) / envelope.decay) * (gateLength - envelope.attack);
-                return height2 - ((height2 / envelope.release) * (time - gateLength))
-            }
             else {
-                return adjustedSustain - (adjustedSustain / envelope.release) * (time - gateLength)
+                const releaseStartLevel = envelopeValueAtTime(envelope, gateLength, gateLength);
+                return releaseStartLevel - (releaseStartLevel / envelope.release) * (time - gateLength)
             }
         }
         else if (time < envelope.attack) {

package/libs/net-game/built/debug/binary.js

@@ -1,4 +1,4 @@
-// total=1991744 new=74.73% cached=0.00% other=25.27%
+// total=1991747 new=74.73% cached=0.00% other=25.27%
 (function (ectx) {
 'use strict';
 const runtime = ectx.runtime;
@@ -3174,7 +3174,7 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-control_popEventContext__P114927.info = {"start":7755,"length":413,"line":236,"column":4,"endLine":250,"endColumn":5,"fileName":"pxt_modules/base/eventcontext.ts","functionName":"popEventContext","argumentNames":[]}
+control_popEventContext__P114927.info = {"start":7802,"length":413,"line":237,"column":4,"endLine":251,"endColumn":5,"fileName":"pxt_modules/base/eventcontext.ts","functionName":"popEventContext","argumentNames":[]}
 
 function control_popEventContext__P114927_mk(s) {
     checkStack(s.depth);
@@ -3241,7 +3241,7 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-control_EventContext_register__P114913.info = {"start":4573,"length":138,"line":135,"column":8,"endLine":139,"endColumn":9,"fileName":"pxt_modules/base/eventcontext.ts","functionName":"register","argumentNames":["this"]}
+control_EventContext_register__P114913.info = {"start":4620,"length":138,"line":136,"column":8,"endLine":140,"endColumn":9,"fileName":"pxt_modules/base/eventcontext.ts","functionName":"register","argumentNames":["this"]}
 
 function control_EventContext_register__P114913_mk(s) {
     checkStack(s.depth);
@@ -3300,7 +3300,7 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-control_EventContext_registerFrameCallbacks__P114912.info = {"start":3668,"length":895,"line":109,"column":8,"endLine":133,"endColumn":9,"fileName":"pxt_modules/base/eventcontext.ts","functionName":"registerFrameCallbacks","argumentNames":["this"]}
+control_EventContext_registerFrameCallbacks__P114912.info = {"start":3715,"length":895,"line":110,"column":8,"endLine":134,"endColumn":9,"fileName":"pxt_modules/base/eventcontext.ts","functionName":"registerFrameCallbacks","argumentNames":["this"]}
 
 function control_EventContext_registerFrameCallbacks__P114912_mk(s) {
     checkStack(s.depth);
@@ -3376,7 +3376,7 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-control_EventContext_registerFrameCallbacks_inline__P117628.info = {"start":3829,"length":723,"line":113,"column":34,"endLine":132,"endColumn":13,"fileName":"pxt_modules/base/eventcontext.ts","functionName":"inline","argumentNames":[]}
+control_EventContext_registerFrameCallbacks_inline__P117628.info = {"start":3876,"length":723,"line":114,"column":34,"endLine":133,"endColumn":13,"fileName":"pxt_modules/base/eventcontext.ts","functionName":"inline","argumentNames":[]}
 
 function control_EventContext_registerFrameCallbacks_inline__P117628_mk(s) {
     checkStack(s.depth);
@@ -3410,7 +3410,7 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-control_EventContext_registerFrameCallbacks_inline__P117634.info = {"start":4060,"length":28,"line":117,"column":31,"endLine":117,"endColumn":59,"fileName":"pxt_modules/base/eventcontext.ts","functionName":"inline","argumentNames":[]}
+control_EventContext_registerFrameCallbacks_inline__P117634.info = {"start":4107,"length":28,"line":118,"column":31,"endLine":118,"endColumn":59,"fileName":"pxt_modules/base/eventcontext.ts","functionName":"inline","argumentNames":[]}
 
 function control_EventContext_registerFrameCallbacks_inline__P117634_mk(s) {
     checkStack(s.depth);
@@ -3677,7 +3677,7 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-control_EventContext_runCallbacks__P114911.info = {"start":2220,"length":1395,"line":75,"column":8,"endLine":106,"endColumn":9,"fileName":"pxt_modules/base/eventcontext.ts","functionName":"runCallbacks","argumentNames":["this"]}
+control_EventContext_runCallbacks__P114911.info = {"start":2267,"length":1395,"line":76,"column":8,"endLine":107,"endColumn":9,"fileName":"pxt_modules/base/eventcontext.ts","functionName":"runCallbacks","argumentNames":["this"]}
 
 function control_EventContext_runCallbacks__P114911_mk(s) {
     checkStack(s.depth);
@@ -3747,7 +3747,7 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-control_EventHandler_register__P114905.info = {"start":961,"length":165,"line":30,"column":8,"endLine":34,"endColumn":9,"fileName":"pxt_modules/base/eventcontext.ts","functionName":"register","argumentNames":["this"]}
+control_EventHandler_register__P114905.info = {"start":1008,"length":165,"line":31,"column":8,"endLine":35,"endColumn":9,"fileName":"pxt_modules/base/eventcontext.ts","functionName":"register","argumentNames":["this"]}
 
 function control_EventHandler_register__P114905_mk(s) {
     checkStack(s.depth);
@@ -3797,7 +3797,7 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-control_EventHandler_register_inline__P117802.info = {"start":1032,"length":71,"line":31,"column":58,"endLine":33,"endColumn":13,"fileName":"pxt_modules/base/eventcontext.ts","functionName":"inline","argumentNames":[]}
+control_EventHandler_register_inline__P117802.info = {"start":1079,"length":71,"line":32,"column":58,"endLine":34,"endColumn":13,"fileName":"pxt_modules/base/eventcontext.ts","functionName":"inline","argumentNames":[]}
 
 function control_EventHandler_register_inline__P117802_mk(s) {
     checkStack(s.depth);
@@ -3862,7 +3862,7 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-control_EventContext_unregister__P114914.info = {"start":4721,"length":131,"line":141,"column":8,"endLine":145,"endColumn":9,"fileName":"pxt_modules/base/eventcontext.ts","functionName":"unregister","argumentNames":["this"]}
+control_EventContext_unregister__P114914.info = {"start":4768,"length":131,"line":142,"column":8,"endLine":146,"endColumn":9,"fileName":"pxt_modules/base/eventcontext.ts","functionName":"unregister","argumentNames":["this"]}
 
 function control_EventContext_unregister__P114914_mk(s) {
     checkStack(s.depth);
@@ -3908,7 +3908,7 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-control_EventHandler_unregister__P114906.info = {"start":1136,"length":106,"line":36,"column":8,"endLine":38,"endColumn":9,"fileName":"pxt_modules/base/eventcontext.ts","functionName":"unregister","argumentNames":["this"]}
+control_EventHandler_unregister__P114906.info = {"start":1183,"length":106,"line":37,"column":8,"endLine":39,"endColumn":9,"fileName":"pxt_modules/base/eventcontext.ts","functionName":"unregister","argumentNames":["this"]}
 
 function control_EventHandler_unregister__P114906_mk(s) {
     checkStack(s.depth);
@@ -3938,7 +3938,7 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-control_doNothing__P114908.info = {"start":1254,"length":24,"line":41,"column":4,"endLine":41,"endColumn":28,"fileName":"pxt_modules/base/eventcontext.ts","functionName":"doNothing","argumentNames":[]}
+control_doNothing__P114908.info = {"start":1301,"length":24,"line":42,"column":4,"endLine":42,"endColumn":28,"fileName":"pxt_modules/base/eventcontext.ts","functionName":"doNothing","argumentNames":[]}
 
 function control_doNothing__P114908_mk(s) {
     checkStack(s.depth);
@@ -7606,7 +7606,7 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-console_inspect__P114882.info = {"start":2271,"length":1190,"line":81,"column":4,"endLine":114,"endColumn":5,"fileName":"pxt_modules/base/console.ts","functionName":"inspect","argumentNames":["obj","maxElements"]}
+console_inspect__P114882.info = {"start":2345,"length":1190,"line":83,"column":4,"endLine":116,"endColumn":5,"fileName":"pxt_modules/base/console.ts","functionName":"inspect","argumentNames":["obj","maxElements"]}
 
 function console_inspect__P114882_mk(s) {
     checkStack(s.depth);
@@ -7698,7 +7698,7 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-console_inspect_inline__P118864.info = {"start":3293,"length":61,"line":108,"column":20,"endLine":108,"endColumn":81,"fileName":"pxt_modules/base/console.ts","functionName":"inline","argumentNames":["prev","currKey"]}
+console_inspect_inline__P118864.info = {"start":3367,"length":61,"line":110,"column":20,"endLine":110,"endColumn":81,"fileName":"pxt_modules/base/console.ts","functionName":"inline","argumentNames":["prev","currKey"]}
 
 function console_inspect_inline__P118864_mk(s) {
     checkStack(s.depth);
@@ -9638,7 +9638,7 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-control_onEvent__P114902.info = {"start":336,"length":325,"line":9,"column":4,"endLine":15,"endColumn":5,"fileName":"pxt_modules/base/eventcontext.ts","functionName":"onEvent","argumentNames":["src","value","handler","flags"]}
+control_onEvent__P114902.info = {"start":383,"length":325,"line":10,"column":4,"endLine":16,"endColumn":5,"fileName":"pxt_modules/base/eventcontext.ts","functionName":"onEvent","argumentNames":["src","value","handler","flags"]}
 
 function control_onEvent__P114902_mk(s) {
     checkStack(s.depth);
@@ -9745,7 +9745,7 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-control_EventContext_registerHandler__P114917.info = {"start":5760,"length":525,"line":173,"column":8,"endLine":186,"endColumn":9,"fileName":"pxt_modules/base/eventcontext.ts","functionName":"registerHandler","argumentNames":["this","src","value","handler","flags"]}
+control_EventContext_registerHandler__P114917.info = {"start":5807,"length":525,"line":174,"column":8,"endLine":187,"endColumn":9,"fileName":"pxt_modules/base/eventcontext.ts","functionName":"registerHandler","argumentNames":["this","src","value","handler","flags"]}
 
 function control_EventContext_registerHandler__P114917_mk(s) {
     checkStack(s.depth);
@@ -9800,7 +9800,7 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-control_EventHandler_constructor__P114907.info = {"start":786,"length":165,"line":23,"column":8,"endLine":28,"endColumn":13,"fileName":"pxt_modules/base/eventcontext.ts","functionName":"inline","argumentNames":["this","src","value","handler","flags"]}
+control_EventHandler_constructor__P114907.info = {"start":833,"length":165,"line":24,"column":8,"endLine":29,"endColumn":13,"fileName":"pxt_modules/base/eventcontext.ts","functionName":"inline","argumentNames":["this","src","value","handler","flags"]}
 
 function control_EventHandler_constructor__P114907_mk(s) {
     checkStack(s.depth);
@@ -9845,7 +9845,7 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-control_eventContext__P114925.info = {"start":7094,"length":136,"line":213,"column":4,"endLine":215,"endColumn":5,"fileName":"pxt_modules/base/eventcontext.ts","functionName":"eventContext","argumentNames":[]}
+control_eventContext__P114925.info = {"start":7141,"length":136,"line":214,"column":4,"endLine":216,"endColumn":5,"fileName":"pxt_modules/base/eventcontext.ts","functionName":"eventContext","argumentNames":[]}
 
 function control_eventContext__P114925_mk(s) {
     checkStack(s.depth);
@@ -16538,7 +16538,7 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-console_log__P114880.info = {"start":1450,"length":86,"line":58,"column":4,"endLine":60,"endColumn":5,"fileName":"pxt_modules/base/console.ts","functionName":"log","argumentNames":["value"]}
+console_log__P114880.info = {"start":1478,"length":86,"line":59,"column":4,"endLine":61,"endColumn":5,"fileName":"pxt_modules/base/console.ts","functionName":"log","argumentNames":["value"]}
 
 function console_log__P114880_mk(s) {
     checkStack(s.depth);
@@ -21676,7 +21676,7 @@ switch (step) {
     return leaveAccessor(s, r0)
   default: oops()
 } } }
-control_EventContext_deltaTime__P114910.info = {"start":2135,"length":75,"line":71,"column":8,"endLine":73,"endColumn":9,"fileName":"pxt_modules/base/eventcontext.ts","functionName":"deltaTime","argumentNames":["this"]}
+control_EventContext_deltaTime__P114910.info = {"start":2182,"length":75,"line":72,"column":8,"endLine":74,"endColumn":9,"fileName":"pxt_modules/base/eventcontext.ts","functionName":"deltaTime","argumentNames":["this"]}
 control_EventContext_deltaTime__P114910.isGetter = true;
 
 function control_EventContext_deltaTime__P114910_mk(s) {
@@ -22133,7 +22133,7 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-control_EventContext_registerFrameHandler__P114915.info = {"start":4862,"length":643,"line":147,"column":8,"endLine":164,"endColumn":9,"fileName":"pxt_modules/base/eventcontext.ts","functionName":"registerFrameHandler","argumentNames":["this","order","handler"]}
+control_EventContext_registerFrameHandler__P114915.info = {"start":4909,"length":643,"line":148,"column":8,"endLine":165,"endColumn":9,"fileName":"pxt_modules/base/eventcontext.ts","functionName":"registerFrameHandler","argumentNames":["this","order","handler"]}
 
 function control_EventContext_registerFrameHandler__P114915_mk(s) {
     checkStack(s.depth);
@@ -22240,7 +22240,7 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-control_pushEventContext__P114926.info = {"start":7310,"length":340,"line":220,"column":4,"endLine":231,"endColumn":5,"fileName":"pxt_modules/base/eventcontext.ts","functionName":"pushEventContext","argumentNames":[]}
+control_pushEventContext__P114926.info = {"start":7357,"length":340,"line":221,"column":4,"endLine":232,"endColumn":5,"fileName":"pxt_modules/base/eventcontext.ts","functionName":"pushEventContext","argumentNames":[]}
 
 function control_pushEventContext__P114926_mk(s) {
     checkStack(s.depth);
@@ -22295,7 +22295,7 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-control_EventContext_constructor__P114923.info = {"start":1778,"length":347,"line":59,"column":8,"endLine":69,"endColumn":9,"fileName":"pxt_modules/base/eventcontext.ts","functionName":"inline","argumentNames":["this"]}
+control_EventContext_constructor__P114923.info = {"start":1825,"length":347,"line":60,"column":8,"endLine":70,"endColumn":9,"fileName":"pxt_modules/base/eventcontext.ts","functionName":"inline","argumentNames":["this"]}
 
 function control_EventContext_constructor__P114923_mk(s) {
     checkStack(s.depth);
@@ -27099,7 +27099,7 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-console_addListener__P114883.info = {"start":3558,"length":197,"line":121,"column":4,"endLine":124,"endColumn":5,"fileName":"pxt_modules/base/console.ts","functionName":"addListener","argumentNames":["listener"]}
+console_addListener__P114883.info = {"start":3632,"length":197,"line":123,"column":4,"endLine":126,"endColumn":5,"fileName":"pxt_modules/base/console.ts","functionName":"addListener","argumentNames":["listener"]}
 
 function console_addListener__P114883_mk(s) {
     checkStack(s.depth);
@@ -35180,7 +35180,7 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-control_ramSize__P114850.info = {"start":4847,"length":100,"line":165,"column":4,"endLine":167,"endColumn":5,"fileName":"pxt_modules/base/control.ts","functionName":"ramSize","argumentNames":[]}
+control_ramSize__P114850.info = {"start":4922,"length":100,"line":167,"column":4,"endLine":169,"endColumn":5,"fileName":"pxt_modules/base/control.ts","functionName":"ramSize","argumentNames":[]}
 
 function control_ramSize__P114850_mk(s) {
     checkStack(s.depth);
@@ -35208,7 +35208,7 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-control__ramSize__P114849.info = {"start":4727,"length":60,"line":160,"column":4,"endLine":162,"endColumn":5,"fileName":"pxt_modules/base/control.ts","functionName":"_ramSize","argumentNames":[]}
+control__ramSize__P114849.info = {"start":4802,"length":60,"line":162,"column":4,"endLine":164,"endColumn":5,"fileName":"pxt_modules/base/control.ts","functionName":"_ramSize","argumentNames":[]}
 
 function control__ramSize__P114849_mk(s) {
     checkStack(s.depth);
@@ -37349,7 +37349,7 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-pause__P114931.info = {"start":246,"length":57,"line":7,"column":0,"endLine":9,"endColumn":1,"fileName":"pxt_modules/base/pause.ts","functionName":"pause","argumentNames":["ms"]}
+pause__P114931.info = {"start":267,"length":57,"line":8,"column":0,"endLine":10,"endColumn":1,"fileName":"pxt_modules/base/pause.ts","functionName":"pause","argumentNames":["ms"]}
 
 function pause__P114931_mk(s) {
     checkStack(s.depth);
@@ -48410,7 +48410,7 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-control_allocateEventSource__P114840.info = {"start":2528,"length":72,"line":85,"column":4,"endLine":87,"endColumn":5,"fileName":"pxt_modules/base/control.ts","functionName":"allocateEventSource","argumentNames":[]}
+control_allocateEventSource__P114840.info = {"start":2603,"length":72,"line":87,"column":4,"endLine":89,"endColumn":5,"fileName":"pxt_modules/base/control.ts","functionName":"allocateEventSource","argumentNames":[]}
 
 function control_allocateEventSource__P114840_mk(s) {
     checkStack(s.depth);

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

@@ -1,4 +1,4 @@
-// total=1687709 new=70.95% cached=0.00% other=29.05%
+// total=1687712 new=70.95% cached=0.00% other=29.05%
 (function (ectx) {
 'use strict';
 const runtime = ectx.runtime;
@@ -2207,7 +2207,7 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-console_addListener__P177327.info = {"start":3558,"length":197,"line":121,"column":4,"endLine":124,"endColumn":5,"fileName":"pxt_modules/base/console.ts","functionName":"addListener","argumentNames":["listener"]}
+console_addListener__P177327.info = {"start":3632,"length":197,"line":123,"column":4,"endLine":126,"endColumn":5,"fileName":"pxt_modules/base/console.ts","functionName":"addListener","argumentNames":["listener"]}
 
 function console_addListener__P177327_mk(s) {
     checkStack(s.depth);
@@ -4971,7 +4971,7 @@ switch (step) {
     return leaveAccessor(s, r0)
   default: oops()
 } } }
-control_EventContext_deltaTime__P177354.info = {"start":2135,"length":75,"line":71,"column":8,"endLine":73,"endColumn":9,"fileName":"pxt_modules/base/eventcontext.ts","functionName":"deltaTime","argumentNames":["this"]}
+control_EventContext_deltaTime__P177354.info = {"start":2182,"length":75,"line":72,"column":8,"endLine":74,"endColumn":9,"fileName":"pxt_modules/base/eventcontext.ts","functionName":"deltaTime","argumentNames":["this"]}
 control_EventContext_deltaTime__P177354.isGetter = true;
 
 function control_EventContext_deltaTime__P177354_mk(s) {
@@ -7014,7 +7014,7 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-control_onEvent__P177346.info = {"start":336,"length":325,"line":9,"column":4,"endLine":15,"endColumn":5,"fileName":"pxt_modules/base/eventcontext.ts","functionName":"onEvent","argumentNames":["src","value","handler","flags"]}
+control_onEvent__P177346.info = {"start":383,"length":325,"line":10,"column":4,"endLine":16,"endColumn":5,"fileName":"pxt_modules/base/eventcontext.ts","functionName":"onEvent","argumentNames":["src","value","handler","flags"]}
 
 function control_onEvent__P177346_mk(s) {
     checkStack(s.depth);
@@ -7121,7 +7121,7 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-control_EventContext_registerHandler__P177361.info = {"start":5760,"length":525,"line":173,"column":8,"endLine":186,"endColumn":9,"fileName":"pxt_modules/base/eventcontext.ts","functionName":"registerHandler","argumentNames":["this","src","value","handler","flags"]}
+control_EventContext_registerHandler__P177361.info = {"start":5807,"length":525,"line":174,"column":8,"endLine":187,"endColumn":9,"fileName":"pxt_modules/base/eventcontext.ts","functionName":"registerHandler","argumentNames":["this","src","value","handler","flags"]}
 
 function control_EventContext_registerHandler__P177361_mk(s) {
     checkStack(s.depth);
@@ -7178,7 +7178,7 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-control_EventHandler_register__P177349.info = {"start":961,"length":165,"line":30,"column":8,"endLine":34,"endColumn":9,"fileName":"pxt_modules/base/eventcontext.ts","functionName":"register","argumentNames":["this"]}
+control_EventHandler_register__P177349.info = {"start":1008,"length":165,"line":31,"column":8,"endLine":35,"endColumn":9,"fileName":"pxt_modules/base/eventcontext.ts","functionName":"register","argumentNames":["this"]}
 
 function control_EventHandler_register__P177349_mk(s) {
     checkStack(s.depth);
@@ -7228,7 +7228,7 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-control_EventHandler_register_inline__P181253.info = {"start":1032,"length":71,"line":31,"column":58,"endLine":33,"endColumn":13,"fileName":"pxt_modules/base/eventcontext.ts","functionName":"inline","argumentNames":[]}
+control_EventHandler_register_inline__P181253.info = {"start":1079,"length":71,"line":32,"column":58,"endLine":34,"endColumn":13,"fileName":"pxt_modules/base/eventcontext.ts","functionName":"inline","argumentNames":[]}
 
 function control_EventHandler_register_inline__P181253_mk(s) {
     checkStack(s.depth);
@@ -7270,7 +7270,7 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-control_EventHandler_constructor__P177351.info = {"start":786,"length":165,"line":23,"column":8,"endLine":28,"endColumn":13,"fileName":"pxt_modules/base/eventcontext.ts","functionName":"inline","argumentNames":["this","src","value","handler","flags"]}
+control_EventHandler_constructor__P177351.info = {"start":833,"length":165,"line":24,"column":8,"endLine":29,"endColumn":13,"fileName":"pxt_modules/base/eventcontext.ts","functionName":"inline","argumentNames":["this","src","value","handler","flags"]}
 
 function control_EventHandler_constructor__P177351_mk(s) {
     checkStack(s.depth);
@@ -7315,7 +7315,7 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-control_eventContext__P177369.info = {"start":7094,"length":136,"line":213,"column":4,"endLine":215,"endColumn":5,"fileName":"pxt_modules/base/eventcontext.ts","functionName":"eventContext","argumentNames":[]}
+control_eventContext__P177369.info = {"start":7141,"length":136,"line":214,"column":4,"endLine":216,"endColumn":5,"fileName":"pxt_modules/base/eventcontext.ts","functionName":"eventContext","argumentNames":[]}
 
 function control_eventContext__P177369_mk(s) {
     checkStack(s.depth);
@@ -11127,7 +11127,7 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-control_EventContext_registerFrameHandler__P177359.info = {"start":4862,"length":643,"line":147,"column":8,"endLine":164,"endColumn":9,"fileName":"pxt_modules/base/eventcontext.ts","functionName":"registerFrameHandler","argumentNames":["this","order","handler"]}
+control_EventContext_registerFrameHandler__P177359.info = {"start":4909,"length":643,"line":148,"column":8,"endLine":165,"endColumn":9,"fileName":"pxt_modules/base/eventcontext.ts","functionName":"registerFrameHandler","argumentNames":["this","order","handler"]}
 
 function control_EventContext_registerFrameHandler__P177359_mk(s) {
     checkStack(s.depth);
@@ -11192,7 +11192,7 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-control_EventContext_registerFrameCallbacks__P177356.info = {"start":3668,"length":895,"line":109,"column":8,"endLine":133,"endColumn":9,"fileName":"pxt_modules/base/eventcontext.ts","functionName":"registerFrameCallbacks","argumentNames":["this"]}
+control_EventContext_registerFrameCallbacks__P177356.info = {"start":3715,"length":895,"line":110,"column":8,"endLine":134,"endColumn":9,"fileName":"pxt_modules/base/eventcontext.ts","functionName":"registerFrameCallbacks","argumentNames":["this"]}
 
 function control_EventContext_registerFrameCallbacks__P177356_mk(s) {
     checkStack(s.depth);
@@ -11268,7 +11268,7 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-control_EventContext_registerFrameCallbacks_inline__P182416.info = {"start":3829,"length":723,"line":113,"column":34,"endLine":132,"endColumn":13,"fileName":"pxt_modules/base/eventcontext.ts","functionName":"inline","argumentNames":[]}
+control_EventContext_registerFrameCallbacks_inline__P182416.info = {"start":3876,"length":723,"line":114,"column":34,"endLine":133,"endColumn":13,"fileName":"pxt_modules/base/eventcontext.ts","functionName":"inline","argumentNames":[]}
 
 function control_EventContext_registerFrameCallbacks_inline__P182416_mk(s) {
     checkStack(s.depth);
@@ -11302,7 +11302,7 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-control_EventContext_registerFrameCallbacks_inline__P182422.info = {"start":4060,"length":28,"line":117,"column":31,"endLine":117,"endColumn":59,"fileName":"pxt_modules/base/eventcontext.ts","functionName":"inline","argumentNames":[]}
+control_EventContext_registerFrameCallbacks_inline__P182422.info = {"start":4107,"length":28,"line":118,"column":31,"endLine":118,"endColumn":59,"fileName":"pxt_modules/base/eventcontext.ts","functionName":"inline","argumentNames":[]}
 
 function control_EventContext_registerFrameCallbacks_inline__P182422_mk(s) {
     checkStack(s.depth);
@@ -11569,7 +11569,7 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-control_EventContext_runCallbacks__P177355.info = {"start":2220,"length":1395,"line":75,"column":8,"endLine":106,"endColumn":9,"fileName":"pxt_modules/base/eventcontext.ts","functionName":"runCallbacks","argumentNames":["this"]}
+control_EventContext_runCallbacks__P177355.info = {"start":2267,"length":1395,"line":76,"column":8,"endLine":107,"endColumn":9,"fileName":"pxt_modules/base/eventcontext.ts","functionName":"runCallbacks","argumentNames":["this"]}
 
 function control_EventContext_runCallbacks__P177355_mk(s) {
     checkStack(s.depth);
@@ -12061,7 +12061,7 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-control_pushEventContext__P177370.info = {"start":7310,"length":340,"line":220,"column":4,"endLine":231,"endColumn":5,"fileName":"pxt_modules/base/eventcontext.ts","functionName":"pushEventContext","argumentNames":[]}
+control_pushEventContext__P177370.info = {"start":7357,"length":340,"line":221,"column":4,"endLine":232,"endColumn":5,"fileName":"pxt_modules/base/eventcontext.ts","functionName":"pushEventContext","argumentNames":[]}
 
 function control_pushEventContext__P177370_mk(s) {
     checkStack(s.depth);
@@ -12116,7 +12116,7 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-control_EventContext_constructor__P177367.info = {"start":1778,"length":347,"line":59,"column":8,"endLine":69,"endColumn":9,"fileName":"pxt_modules/base/eventcontext.ts","functionName":"inline","argumentNames":["this"]}
+control_EventContext_constructor__P177367.info = {"start":1825,"length":347,"line":60,"column":8,"endLine":70,"endColumn":9,"fileName":"pxt_modules/base/eventcontext.ts","functionName":"inline","argumentNames":["this"]}
 
 function control_EventContext_constructor__P177367_mk(s) {
     checkStack(s.depth);
@@ -12182,7 +12182,7 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-control_EventContext_unregister__P177358.info = {"start":4721,"length":131,"line":141,"column":8,"endLine":145,"endColumn":9,"fileName":"pxt_modules/base/eventcontext.ts","functionName":"unregister","argumentNames":["this"]}
+control_EventContext_unregister__P177358.info = {"start":4768,"length":131,"line":142,"column":8,"endLine":146,"endColumn":9,"fileName":"pxt_modules/base/eventcontext.ts","functionName":"unregister","argumentNames":["this"]}
 
 function control_EventContext_unregister__P177358_mk(s) {
     checkStack(s.depth);
@@ -12228,7 +12228,7 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-control_EventHandler_unregister__P177350.info = {"start":1136,"length":106,"line":36,"column":8,"endLine":38,"endColumn":9,"fileName":"pxt_modules/base/eventcontext.ts","functionName":"unregister","argumentNames":["this"]}
+control_EventHandler_unregister__P177350.info = {"start":1183,"length":106,"line":37,"column":8,"endLine":39,"endColumn":9,"fileName":"pxt_modules/base/eventcontext.ts","functionName":"unregister","argumentNames":["this"]}
 
 function control_EventHandler_unregister__P177350_mk(s) {
     checkStack(s.depth);
@@ -12258,7 +12258,7 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-control_doNothing__P177352.info = {"start":1254,"length":24,"line":41,"column":4,"endLine":41,"endColumn":28,"fileName":"pxt_modules/base/eventcontext.ts","functionName":"doNothing","argumentNames":[]}
+control_doNothing__P177352.info = {"start":1301,"length":24,"line":42,"column":4,"endLine":42,"endColumn":28,"fileName":"pxt_modules/base/eventcontext.ts","functionName":"doNothing","argumentNames":[]}
 
 function control_doNothing__P177352_mk(s) {
     checkStack(s.depth);
@@ -14078,7 +14078,7 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-control_popEventContext__P177371.info = {"start":7755,"length":413,"line":236,"column":4,"endLine":250,"endColumn":5,"fileName":"pxt_modules/base/eventcontext.ts","functionName":"popEventContext","argumentNames":[]}
+control_popEventContext__P177371.info = {"start":7802,"length":413,"line":237,"column":4,"endLine":251,"endColumn":5,"fileName":"pxt_modules/base/eventcontext.ts","functionName":"popEventContext","argumentNames":[]}
 
 function control_popEventContext__P177371_mk(s) {
     checkStack(s.depth);
@@ -14145,7 +14145,7 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-control_EventContext_register__P177357.info = {"start":4573,"length":138,"line":135,"column":8,"endLine":139,"endColumn":9,"fileName":"pxt_modules/base/eventcontext.ts","functionName":"register","argumentNames":["this"]}
+control_EventContext_register__P177357.info = {"start":4620,"length":138,"line":136,"column":8,"endLine":140,"endColumn":9,"fileName":"pxt_modules/base/eventcontext.ts","functionName":"register","argumentNames":["this"]}
 
 function control_EventContext_register__P177357_mk(s) {
     checkStack(s.depth);
@@ -19796,7 +19796,7 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-console_log__P177324.info = {"start":1450,"length":86,"line":58,"column":4,"endLine":60,"endColumn":5,"fileName":"pxt_modules/base/console.ts","functionName":"log","argumentNames":["value"]}
+console_log__P177324.info = {"start":1478,"length":86,"line":59,"column":4,"endLine":61,"endColumn":5,"fileName":"pxt_modules/base/console.ts","functionName":"log","argumentNames":["value"]}
 
 function console_log__P177324_mk(s) {
     checkStack(s.depth);
@@ -20111,7 +20111,7 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-console_inspect__P177326.info = {"start":2271,"length":1190,"line":81,"column":4,"endLine":114,"endColumn":5,"fileName":"pxt_modules/base/console.ts","functionName":"inspect","argumentNames":["obj","maxElements"]}
+console_inspect__P177326.info = {"start":2345,"length":1190,"line":83,"column":4,"endLine":116,"endColumn":5,"fileName":"pxt_modules/base/console.ts","functionName":"inspect","argumentNames":["obj","maxElements"]}
 
 function console_inspect__P177326_mk(s) {
     checkStack(s.depth);
@@ -20203,7 +20203,7 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-console_inspect_inline__P184971.info = {"start":3293,"length":61,"line":108,"column":20,"endLine":108,"endColumn":81,"fileName":"pxt_modules/base/console.ts","functionName":"inline","argumentNames":["prev","currKey"]}
+console_inspect_inline__P184971.info = {"start":3367,"length":61,"line":110,"column":20,"endLine":110,"endColumn":81,"fileName":"pxt_modules/base/console.ts","functionName":"inline","argumentNames":["prev","currKey"]}
 
 function console_inspect_inline__P184971_mk(s) {
     checkStack(s.depth);
@@ -25316,7 +25316,7 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-control_ramSize__P177294.info = {"start":4847,"length":100,"line":165,"column":4,"endLine":167,"endColumn":5,"fileName":"pxt_modules/base/control.ts","functionName":"ramSize","argumentNames":[]}
+control_ramSize__P177294.info = {"start":4922,"length":100,"line":167,"column":4,"endLine":169,"endColumn":5,"fileName":"pxt_modules/base/control.ts","functionName":"ramSize","argumentNames":[]}
 
 function control_ramSize__P177294_mk(s) {
     checkStack(s.depth);
@@ -25344,7 +25344,7 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-control__ramSize__P177293.info = {"start":4727,"length":60,"line":160,"column":4,"endLine":162,"endColumn":5,"fileName":"pxt_modules/base/control.ts","functionName":"_ramSize","argumentNames":[]}
+control__ramSize__P177293.info = {"start":4802,"length":60,"line":162,"column":4,"endLine":164,"endColumn":5,"fileName":"pxt_modules/base/control.ts","functionName":"_ramSize","argumentNames":[]}
 
 function control__ramSize__P177293_mk(s) {
     checkStack(s.depth);
@@ -27610,7 +27610,7 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-pause__P177375.info = {"start":246,"length":57,"line":7,"column":0,"endLine":9,"endColumn":1,"fileName":"pxt_modules/base/pause.ts","functionName":"pause","argumentNames":["ms"]}
+pause__P177375.info = {"start":267,"length":57,"line":8,"column":0,"endLine":10,"endColumn":1,"fileName":"pxt_modules/base/pause.ts","functionName":"pause","argumentNames":["ms"]}
 
 function pause__P177375_mk(s) {
     checkStack(s.depth);

package/libs/radio/radio.cpp

@@ -151,6 +151,7 @@ CODAL_RADIO* getRadio() {
     * Sends an event over radio to neigboring devices
     */
     //% blockId=radioRaiseEvent block="radio raise event|from source %src=control_event_source_id|with value %value=control_event_value_id"
+    //% src.label="source" value.label="value"
     //% blockExternalInputs=1
     //% advanced=true
     //% weight=1
@@ -236,6 +237,7 @@ CODAL_RADIO* getRadio() {
     //% help=radio/set-group
     //% weight=100
     //% blockId=radio_set_group block="radio set group %ID"
+    //% id.label="value"
     //% id.min=0 id.max=255
     //% group="Group"
     void setGroup(int id) {
@@ -253,6 +255,7 @@ CODAL_RADIO* getRadio() {
     //% help=radio/set-transmit-power
     //% weight=9 blockGap=8
     //% blockId=radio_set_transmit_power block="radio set transmit power %power"
+    //% power.label="value"
     //% power.min=0 power.max=7
     //% advanced=true
     void setTransmitPower(int power) {
@@ -270,6 +273,7 @@ CODAL_RADIO* getRadio() {
     //% help=radio/set-frequency-band
     //% weight=8 blockGap=8
     //% blockId=radio_set_frequency_band block="radio set frequency band %band"
+    //% band.label="value"
     //% band.min=0 band.max=83
     //% advanced=true
     void setFrequencyBand(int band) {