From 670b9720c2894b77407bd9dd0c90f1d0c4027d28 Mon Sep 17 00:00:00 2001
From: Gawain Hewitt <gawain@gawainhewitt.co.uk>
Date: Fri, 21 Apr 2023 12:31:08 +0100
Subject: [PATCH] changed default scale to fm for event

---
 dist/index.html | 18 +++++++++---------
 dist/sketch.js  |  7 ++++---
 index.html      | 16 ++++++++--------
 sketch.js       |  7 ++++---
 4 files changed, 25 insertions(+), 23 deletions(-)

diff --git a/dist/index.html b/dist/index.html
index d8f60ca..10cbe5c 100644
--- a/dist/index.html
+++ b/dist/index.html
@@ -95,15 +95,15 @@ <h1>loading...<br>loading...<br>loading...<br>loading...<br>loading...<br>loadin
       <br>
     </div>
     <div id="notesDiv">
-      <div id="image0"><h2 id="i0">C</h2></div>
-      <div id="image1"><h2 id="i1">D</h2></div>
-      <div id="image2"><h2 id="i2">E</h2></div>
-      <div id="image3"><h2 id="i3">F</h2></div>
-      <div id="image4"><h2 id="i4">G</h2></div>
-      <div id="image5"><h2 id="i5">A</h2></div>
-      <div id="image6"><h2 id="i6">B</h2></div>
-      <div id="image7"><h2 id="i7">C</h2></div>
-      <div id="image8"><h2 id="i8">D</h2></div>
+      <div id="image0"><h2 id="i0">F</h2></div>
+      <div id="image1"><h2 id="i1">G</h2></div>
+      <div id="image2"><h2 id="i2">G#</h2></div>
+      <div id="image3"><h2 id="i3">A#</h2></div>
+      <div id="image4"><h2 id="i4">C</h2></div>
+      <div id="image5"><h2 id="i5">C#</h2></div>
+      <div id="image6"><h2 id="i6">D#</h2></div>
+      <div id="image7"><h2 id="i7">F</h2></div>
+      <div id="image8"><h2 id="i8">G</h2></div>
   </div>
     
     <!-- <span class="clear"></span> this keeps the above elements within the parent div -->
diff --git a/dist/sketch.js b/dist/sketch.js
index 41826b3..fa0d7c8 100644
--- a/dist/sketch.js
+++ b/dist/sketch.js
@@ -3,7 +3,8 @@ var info = true;    // this tells us whether to display the info screen or not
 var notePlaying = [0,0,0,0,0,0,0,0,0]; // array to store if a note is playing - not using this at the moment, but might
 var ongoingTouches = []; // to store ongoing touches in for multitouch
 const now = Tone.now(); // time variable to tell the tone.js when to play - i.e play now! (when function called for example)
-var notes = ["C3", "D3", "E3", "G3", "A3", "C4", "D4", "E4", "G4"];    // array containing our musical notes that we are currently using (tone.js will respond to these as is)
+// var notes = ["C3", "D3", "E3", "G3", "A3", "C4", "D4", "E4", "G4"];    // array containing our musical notes that we are currently using (tone.js will respond to these as is)
+var notes = ["F3", "G3", "G#3", "A#3", "C4", "C#4", "D#4", "F4", "G4"];    // array containing our musical notes that we are currently using (tone.js will respond to these as is)
 var allTheNotes =  ["C1", "C#1", "D1", "D#1", "E1", "F1", "F#1", "G1", "G#1", "A1", "A#1", "B1",
                     "C2", "C#2", "D2", "D#2", "E2", "F2", "F#2", "G2", "G#2", "A2", "A#2", "B2",
                     "C3", "C#3", "D3", "D#3", "E3", "F3", "F#3", "G3", "G#3", "A3", "A#3", "B3",
@@ -18,8 +19,8 @@ var minor = [0,2,3,5,7,8,10,12,14]; // intervals for a minor scale for 9 notes
 var majorBlues = [0,2,3,4,7,9,12,14,15]; // intervals for a major blues scale for 9 notes
 var minorBlues = [0,3,5,6,7,10,12,15,17]; // intervals for a minor scale for 9 notes
 var scales = ["default", pentatonic, major, minor, majorBlues, minorBlues];
-var scale = pentatonic; // this variable sets the default scale on load
-var theKey = 0; // this variable sets the default key on load
+var scale = minor; // this variable sets the default scale on load
+var theKey = 5; // this variable sets the default key on load
 var octave = 24; //set the default octave on load
 var whichClicked = [0,0,0,0,0,0,0,0,0];
 var whichKey = [0,0,0,0,0,0,0,0,0];
diff --git a/index.html b/index.html
index 79b4701..10cbe5c 100644
--- a/index.html
+++ b/index.html
@@ -95,14 +95,14 @@ <h1>loading...<br>loading...<br>loading...<br>loading...<br>loading...<br>loadin
       <br>
     </div>
     <div id="notesDiv">
-      <div id="image0"><h2 id="i0">C</h2></div>
-      <div id="image1"><h2 id="i1">D</h2></div>
-      <div id="image2"><h2 id="i2">E</h2></div>
-      <div id="image3"><h2 id="i3">G</h2></div>
-      <div id="image4"><h2 id="i4">A</h2></div>
-      <div id="image5"><h2 id="i5">C</h2></div>
-      <div id="image6"><h2 id="i6">D</h2></div>
-      <div id="image7"><h2 id="i7">E</h2></div>
+      <div id="image0"><h2 id="i0">F</h2></div>
+      <div id="image1"><h2 id="i1">G</h2></div>
+      <div id="image2"><h2 id="i2">G#</h2></div>
+      <div id="image3"><h2 id="i3">A#</h2></div>
+      <div id="image4"><h2 id="i4">C</h2></div>
+      <div id="image5"><h2 id="i5">C#</h2></div>
+      <div id="image6"><h2 id="i6">D#</h2></div>
+      <div id="image7"><h2 id="i7">F</h2></div>
       <div id="image8"><h2 id="i8">G</h2></div>
   </div>
     
diff --git a/sketch.js b/sketch.js
index 41826b3..fa0d7c8 100644
--- a/sketch.js
+++ b/sketch.js
@@ -3,7 +3,8 @@ var info = true;    // this tells us whether to display the info screen or not
 var notePlaying = [0,0,0,0,0,0,0,0,0]; // array to store if a note is playing - not using this at the moment, but might
 var ongoingTouches = []; // to store ongoing touches in for multitouch
 const now = Tone.now(); // time variable to tell the tone.js when to play - i.e play now! (when function called for example)
-var notes = ["C3", "D3", "E3", "G3", "A3", "C4", "D4", "E4", "G4"];    // array containing our musical notes that we are currently using (tone.js will respond to these as is)
+// var notes = ["C3", "D3", "E3", "G3", "A3", "C4", "D4", "E4", "G4"];    // array containing our musical notes that we are currently using (tone.js will respond to these as is)
+var notes = ["F3", "G3", "G#3", "A#3", "C4", "C#4", "D#4", "F4", "G4"];    // array containing our musical notes that we are currently using (tone.js will respond to these as is)
 var allTheNotes =  ["C1", "C#1", "D1", "D#1", "E1", "F1", "F#1", "G1", "G#1", "A1", "A#1", "B1",
                     "C2", "C#2", "D2", "D#2", "E2", "F2", "F#2", "G2", "G#2", "A2", "A#2", "B2",
                     "C3", "C#3", "D3", "D#3", "E3", "F3", "F#3", "G3", "G#3", "A3", "A#3", "B3",
@@ -18,8 +19,8 @@ var minor = [0,2,3,5,7,8,10,12,14]; // intervals for a minor scale for 9 notes
 var majorBlues = [0,2,3,4,7,9,12,14,15]; // intervals for a major blues scale for 9 notes
 var minorBlues = [0,3,5,6,7,10,12,15,17]; // intervals for a minor scale for 9 notes
 var scales = ["default", pentatonic, major, minor, majorBlues, minorBlues];
-var scale = pentatonic; // this variable sets the default scale on load
-var theKey = 0; // this variable sets the default key on load
+var scale = minor; // this variable sets the default scale on load
+var theKey = 5; // this variable sets the default key on load
 var octave = 24; //set the default octave on load
 var whichClicked = [0,0,0,0,0,0,0,0,0];
 var whichKey = [0,0,0,0,0,0,0,0,0];