Merge branch 'master' of github.com:Microsoft/pxt-microbit

libs/microbit/music.ts

@@ -1,63 +1,110 @@
 enum Note {
     C = 262,
     //% block=C#
+    //% blockIdentity=music.noteFrequency
     CSharp = 277,
+    //% blockIdentity=music.noteFrequency
     D = 294,
+    //% blockIdentity=music.noteFrequency
     Eb = 311,
+    //% blockIdentity=music.noteFrequency
     E = 330,
+    //% blockIdentity=music.noteFrequency
     F = 349,
     //% block=F#
+    //% blockIdentity=music.noteFrequency
     FSharp = 370,
+    //% blockIdentity=music.noteFrequency
     G = 392,
     //% block=G#
+    //% blockIdentity=music.noteFrequency
     GSharp = 415,
+    //% blockIdentity=music.noteFrequency
     A = 440,
+    //% blockIdentity=music.noteFrequency
     Bb = 466,
+    //% blockIdentity=music.noteFrequency
     B = 494,
+    //% blockIdentity=music.noteFrequency
     C3 = 131,
     //% block=C#3
+    //% blockIdentity=music.noteFrequency
     CSharp3 = 139,
+    //% blockIdentity=music.noteFrequency
     D3 = 147,
+    //% blockIdentity=music.noteFrequency
     Eb3 = 156,
+    //% blockIdentity=music.noteFrequency
     E3 = 165,
+    //% blockIdentity=music.noteFrequency
     F3 = 175,
     //% block=F#3
+    //% blockIdentity=music.noteFrequency
     FSharp3 = 185,
+    //% blockIdentity=music.noteFrequency
     G3 = 196,
     //% block=G#3
+    //% blockIdentity=music.noteFrequency
     GSharp3 = 208,
+    //% blockIdentity=music.noteFrequency
     A3 = 220,
+    //% blockIdentity=music.noteFrequency
     Bb3 = 233,
+    //% blockIdentity=music.noteFrequency
     B3 = 247,
+    //% blockIdentity=music.noteFrequency
     C4 = 262,
     //% block=C#4
+    //% blockIdentity=music.noteFrequency
     CSharp4 = 277,
+    //% blockIdentity=music.noteFrequency
     D4 = 294,
+    //% blockIdentity=music.noteFrequency
     Eb4 = 311,
+    //% blockIdentity=music.noteFrequency
     E4 = 330,
+    //% blockIdentity=music.noteFrequency
     F4 = 349,
     //% block=F#4
+    //% blockIdentity=music.noteFrequency
     FSharp4 = 370,
+    //% blockIdentity=music.noteFrequency
     G4 = 392,
     //% block=G#4
+    //% blockIdentity=music.noteFrequency
     GSharp4 = 415,
+    //% blockIdentity=music.noteFrequency
     A4 = 440,
+    //% blockIdentity=music.noteFrequency
     Bb4 = 466,
+    //% blockIdentity=music.noteFrequency
     B4 = 494,
+    //% blockIdentity=music.noteFrequency
     C5 = 523,
     //% block=C#5
+    //% blockIdentity=music.noteFrequency
     CSharp5 = 555,
+    //% blockIdentity=music.noteFrequency
     D5 = 587,
+    //% blockIdentity=music.noteFrequency
     Eb5 = 622,
+    //% blockIdentity=music.noteFrequency
     E5 = 659,
+    //% blockIdentity=music.noteFrequency
     F5 = 698,
     //% block=F#5
+    //% blockIdentity=music.noteFrequency
     FSharp5 = 740,
+    //% blockIdentity=music.noteFrequency
     G5 = 784,
     //% block=G#5
+    //% blockIdentity=music.noteFrequency
     GSharp5 = 831,
+    //% blockIdentity=music.noteFrequency
     A5 = 880,
+    //% blockIdentity=music.noteFrequency
     Bb5 = 932,
+    //% blockIdentity=music.noteFrequency
     B5 = 989,
 }
 
@@ -88,6 +135,7 @@ namespace music {
      */
     //% help=music/play-tone weight=90
     //% blockId=device_play_note block="play|tone %note=device_note|for %duration=device_beat" icon="\uf025" blockGap=8
+    //% parts="speaker"
     export function playTone(frequency: number, ms: number): void {
         pins.analogSetPitchPin(AnalogPin.P0);
         pins.analogPitch(frequency, ms);
@@ -99,6 +147,7 @@ namespace music {
      */
     //% help=music/ring-tone weight=80
     //% blockId=device_ring block="ring tone (Hz)|%note=device_note" icon="\uf025" blockGap=8
+    //% parts="speaker"
     export function ringTone(frequency: number): void {
         pins.analogSetPitchPin(AnalogPin.P0);
         pins.analogPitch(frequency, 0);
@@ -110,6 +159,7 @@ namespace music {
      */
     //% help=music/rest weight=79
     //% blockId=device_rest block="rest(ms)|%duration=device_beat"
+    //% parts="speaker"
     export function rest(ms: number): void {
         playTone(0, ms);
     }
@@ -121,6 +171,8 @@ namespace music {
      */
     //% weight=50 help=music/note-frequency
     //% blockId=device_note block="%note"
+    //% parts="speaker"
+    //% shim=TD_ID
     export function noteFrequency(name: Note): number {
         return name;
     }
@@ -134,6 +186,7 @@ namespace music {
      */
     //% help=music/beat weight=49
     //% blockId=device_beat block="%fraction|beat"
+    //% parts="speaker"
     export function beat(fraction?: BeatFraction): number {
         init();
         if (fraction == null) fraction = BeatFraction.Whole;
@@ -150,6 +203,7 @@ namespace music {
      */
     //% help=music/tempo weight=40
     //% blockId=device_tempo block="tempo (bpm)" blockGap=8
+    //% parts="speaker"
     export function tempo(): number {
         init();
         return beatsPerMinute;
@@ -161,8 +215,9 @@ namespace music {
      */
     //% help=music/change-tempo weight=39
     //% blockId=device_change_tempo block="change tempo by (bpm)|%value" blockGap=8
+    //% parts="speaker"
     export function changeTempoBy(bpm: number): void {
-	init();
+        init();
         setTempo(beatsPerMinute + bpm);
     }
 
@@ -172,6 +227,7 @@ namespace music {
      */
     //% help=music/set-tempo weight=38
     //% blockId=device_set_tempo block="set tempo to (bpm)|%value"
+    //% parts="speaker"
     export function setTempo(bpm: number): void {
         init();
         if (bpm > 0) {