From f611b589d60ad9fc5406118cf8e15944494f11db Mon Sep 17 00:00:00 2001
From: GrandpaBond <89019204+GrandpaBond@users.noreply.github.com>
Date: Thu, 9 Nov 2023 07:16:46 +0000
Subject: [PATCH] makeTunedPlay() fixed default pitch=0 bug; most tests
 commented-out for now

---
 flexFX.ts |   5 +-
 test.ts   | 222 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 225 insertions(+), 2 deletions(-)

diff --git a/flexFX.ts b/flexFX.ts
index af90fb0..27b3d6e 100644
--- a/flexFX.ts
+++ b/flexFX.ts
@@ -438,9 +438,10 @@ namespace flexFX {
         makeTunedPlay(pitch: number, volumeLimit: number, newDuration: number): Play {
             let play = new Play;
             let sound = new soundExpression.Sound;
-            let pitchRatio = pitch/this.pitchAverage;
+            let pitchRatio = 1.0;
             let volumeRatio = 1.0;
-            let durationRatio = 1.0;
+            let durationRatio = 1.0; 
+            if (pitch != 0) pitch = pitch / this.pitchAverage;
             if (volumeLimit != 0) volumeRatio = volumeLimit / this.peakVolume;
             if (newDuration != 0) durationRatio = newDuration / this.fullDuration;
             // apply ratios (where changed from 1.0) to relevant fields of each part in turn
diff --git a/test.ts b/test.ts
index e69de29..6379aea 100644
--- a/test.ts
+++ b/test.ts
@@ -0,0 +1,222 @@
+// *********** test codes **********
+
+// perform a built-in FlexFX with all the defaults
+flexFX.playFlexFX("TING", true);
+/*********************
+
+// perform the simple built-in chime flexFX
+flexFX.playFlexFX("TING", true, Note.G5, 180, 400); // up a fifth
+flexFX.playFlexFX("TING", true, Note.E5, 180, 400); // up a major 3rd
+flexFX.playFlexFX("TING", true, Note.C5, 250, 1600);
+pause(1000);
+
+
+// perform like a cat
+flexFX.playFlexFX("miaow", true, 900, 255, 1000);
+pause(300);
+flexFX.playFlexFX("miaow", true, 1100, 255, 500);
+pause(300);
+flexFX.playFlexFX("miaow", true, 800, 255, 1500);
+
+pause(1000);
+
+
+// perform "New World" theme on the 2-part horn flexFX
+flexFX.playFlexFX("horn", true, Note.E3, 255, 900);
+flexFX.playFlexFX("horn", true, Note.G3, 255, 300);
+flexFX.playFlexFX("horn", true, Note.G3, 255, 1200);
+flexFX.playFlexFX("horn", true, Note.E3, 255, 900);
+flexFX.playFlexFX("horn", true, Note.D3, 255, 300);
+flexFX.playFlexFX("horn", true, Note.C3, 255, 1200);
+flexFX.playFlexFX("horn", true, Note.D3, 255, 600);
+flexFX.playFlexFX("horn", true, Note.E3, 255, 600);
+flexFX.playFlexFX("horn", true, Note.G3, 255, 600);
+flexFX.playFlexFX("horn", true, Note.E3, 255, 600);
+flexFX.playFlexFX("horn", true, Note.D3, 255, 2400);
+
+pause(1000);
+
+// create a flexFX for a two-tone police-siren (middle part is silent)
+flexFX.defineFlexFX("police", flexFX.Wave.Sawtooth, 760, 800, 160, 200, 450,
+    flexFX.Effect.None, flexFX.Attack.Even);
+// (add a silent gap in the middle)
+flexFX.extendFlexFX("police", flexFX.Wave.Silence, 0, 0, 100,
+    flexFX.Effect.None, flexFX.Attack.Even);
+flexFX.extendFlexFX("police", flexFX.Wave.Sawtooth, 600, 160, 450,
+    flexFX.Effect.None, flexFX.Attack.Even);
+
+// queue-up a sequence of Plays on the Play-list (complete with Doppler-shift)
+flexFX.playFlexFX("police", false, 800, 16, 1000);
+flexFX.playFlexFX("police", false, 800, 32, 1000);
+flexFX.playFlexFX("police", false, 800, 64, 1000);
+flexFX.playFlexFX("police", false, 800, 128, 1000);
+flexFX.playFlexFX("police", false, 800, 255, 1000);
+flexFX.playFlexFX("police", false, 775, 255, 1000);
+flexFX.playFlexFX("police", false, 750, 128, 1000);
+flexFX.playFlexFX("police", false, 750, 64, 1000);
+flexFX.playFlexFX("police", false, 750, 32, 1000);
+flexFX.playFlexFX("police", false, 750, 16, 1000);
+
+// while the Play-list is playing, flash the blue light (sort of)
+while (flexFX.isActive()) {
+    basic.showIcon(IconNames.SmallDiamond);
+    basic.showIcon(IconNames.Diamond);
+}
+
+pause(1000);
+
+// queue-up a sequence of Plays on the Play-list (J.S.Bach)
+flexFX.playFlexFX("violin", false, Note.E5, 250, 300);
+flexFX.playFlexFX("violin", false, Note.A5, 250, 900);
+flexFX.playFlexFX("violin", false, Note.E5, 250, 300);
+flexFX.playFlexFX("violin", false, Note.F5, 250, 900);
+flexFX.playFlexFX("violin", false, Note.D5, 250, 300);
+flexFX.playFlexFX("violin", false, Note.E5, 250, 150);
+flexFX.playFlexFX("violin", false, Note.D5, 250, 150);
+flexFX.playFlexFX("violin", false, Note.C5, 250, 150);
+flexFX.playFlexFX("violin", false, Note.E5, 250, 150);
+flexFX.playFlexFX("violin", false, Note.D5, 250, 150);
+flexFX.playFlexFX("violin", false, Note.C5, 250, 150);
+flexFX.playFlexFX("violin", false, Note.B4, 250, 150);
+flexFX.playFlexFX("violin", false, Note.D5, 250, 150);
+flexFX.playFlexFX("violin", false, Note.C5, 250, 300);
+flexFX.playFlexFX("violin", false, Note.A4, 250, 900);
+
+// while the Play-list is playing, jiggle a note around
+while (flexFX.isActive()) {
+    images.iconImage(IconNames.QuarterNote).showImage(-2, 150);
+    images.iconImage(IconNames.QuarterNote).showImage(-1, 150);
+    images.iconImage(IconNames.QuarterNote).showImage(0, 150);
+    images.iconImage(IconNames.QuarterNote).showImage(-1, 150);
+}
+
+basic.showIcon(IconNames.Target);
+pause(1000);
+
+
+// queue up some Plays on the Play-list, with pauses queued in-between
+flexFX.stopPlaying();  // don't start Playing yet...
+flexFX.playFlexFX("cry", false, 200, 250, 1000);
+flexFX.playSilence(2000);
+flexFX.playFlexFX("cry", false, 300, 250, 1000);
+flexFX.playSilence(1500);
+flexFX.playFlexFX("cry", false, 400, 250, 1000);
+flexFX.playSilence(1000);
+flexFX.playFlexFX("cry", false, 600, 250, 1000);
+flexFX.playSilence(800);
+flexFX.playFlexFX("cry", false, 800, 250, 1000);
+basic.showNumber(flexFX.waitingToPlay());
+pause(500);
+// use events to choreograph faces to sounds
+basic.showIcon(IconNames.Sad);
+pause(1000)
+flexFX.startPlaying(); // kick off the Play-list
+while (flexFX.isActive()) {
+    flexFX.awaitPlayStart(); // starting the next (non-silent) Play...
+    basic.showIcon(IconNames.Surprised); // ... so open the mouth
+    flexFX.awaitPlayFinish();
+    basic.showIcon(IconNames.Sad); // close the mouth again
+    // (the active Player now "Plays" the queued silence)
+}
+pause(500);
+basic.showIcon(IconNames.Happy);
+
+pause(2000)
+// now re-build the Play-list of 5 cries
+basic.showIcon(IconNames.Sad);
+flexFX.stopPlaying();  // inhibit Playing
+flexFX.playFlexFX("cry", false, 200, 250, 1000);
+flexFX.playFlexFX("cry", false, 300, 250, 1000);
+flexFX.playFlexFX("cry", false, 400, 250, 1000);
+flexFX.playFlexFX("cry", false, 600, 250, 1000);
+flexFX.playFlexFX("cry", false, 800, 250, 1000);
+basic.showNumber(flexFX.waitingToPlay());
+
+pause(1000)
+// synchronise a different way, by playing queued Plays one-at-a-time, 
+// with explicit pauses...
+let delay = 1600;
+while (flexFX.waitingToPlay() > 0) {
+    flexFX.startPlaying(); // allow the next Play to happen
+    pause(20);
+    // as soon as the first Play begins, prevent any more being started
+    flexFX.stopPlaying();
+    basic.showIcon(IconNames.Surprised);  // open the mouth...
+    flexFX.awaitPlayFinish();
+    basic.showIcon(IconNames.Sad); // close the mouth again
+    pause(delay);
+    delay -= 200; // decrease the silence in-between 
+}
+
+pause(500);
+basic.showIcon(IconNames.Happy);
+pause(2000)
+
+// check we can delete an unwanted Play-list of 5 tweets
+flexFX.stopPlaying();  // inhibit Playing
+flexFX.playFlexFX("tweet", false, 200, 250, 1000);
+flexFX.playFlexFX("tweet", false, 300, 250, 1000);
+flexFX.playFlexFX("tweet", false, 400, 250, 1000);
+flexFX.playFlexFX("tweet", false, 600, 250, 1000);
+flexFX.playFlexFX("tweet", false, 800, 250, 1000);
+basic.showNumber(flexFX.waitingToPlay());
+pause(1000);
+basic.showIcon(IconNames.No);
+pause(1000);
+flexFX.deletePlaylist();
+basic.showNumber(flexFX.waitingToPlay());
+pause(2000);
+
+// check playing of tunes
+flexFX.playTune("birthday", "ting");
+flexFX.playTune("newWorld", "horn",true,100,);
+flexFX.playTune("birthday", "woof",);
+
+// compose a new tune
+flexFX.composeTune("edelweiss", "4E4 2G4 6D5 4C5 2G4 6F4");
+flexFX.extendTune("edelweiss", "4E4 2E4 2E4 2F4 2G4 6A4 6G4");
+flexFX.extendTune("edelweiss", "4E4 2G4 6D5 4C5 2G4 6F4");
+flexFX.extendTune("edelweiss", "4E4 2G4 2G4 2A4 2B4 6C5 6C5");
+flexFX.extendTune("edelweiss", "3B5 1G4 2G4 3B4 1A4 2G4 4E4 2G4 6C5");
+flexFX.extendTune("edelweiss", "4A4 2C5 4D5 2C5 6B4 6G4");
+flexFX.extendTune("edelweiss", "4E4 2G4 6D5 4C5 2G#4 6F5");
+flexFX.extendTune("edelweiss", "4E5 2G4 2G4 2A4 2B4 6C5 6C5");
+
+// Play it asynchronously on the flute, lasting a minute
+flexFX.playTune("edelweiss","flute",false, 150, 60000);
+// while the Play-list is playing, keep rotating a flower!
+while (flexFX.isActive()) {
+    basic.showLeds(`
+        . . # . .
+        # . # . #
+        . # # # .
+        # . # . #
+        . . # . .
+        `);
+    basic.pause(30);
+    basic.showLeds(`
+        # . . # .
+        . . # . .
+        # # # # #
+        . . # . .
+        . # . . #
+        `);
+    basic.pause(30);
+    basic.showLeds(`
+        . # . # .
+        . . # . .
+        # # # # #
+        . . # . .
+        . # . # .
+        `);
+    basic.pause(30);
+    basic.showLeds(`
+        . . # . #
+        # . # . .
+        . # # # .
+        . . # . #
+        # . # . .
+        `);
+    basic.pause(30);
+}
+******************/
\ No newline at end of file