Rename NoteFrequency samples

examples/Analysis/NoteFrequency/AudioSampleBbb_tuba_1.h

@@ -1,3 +0,0 @@
-// Audio data converted from WAV file by wav2sketch
-
-extern const unsigned int AudioSampleBbb_tuba_1[31041];

examples/Analysis/NoteFrequency/AudioSampleBbb_tuba_2.h

@@ -1,3 +0,0 @@
-// Audio data converted from WAV file by wav2sketch
-
-extern const unsigned int AudioSampleBbb_tuba_2[31873];

examples/Analysis/NoteFrequency/AudioSampleBbb_tuba_3.h

@@ -1,3 +0,0 @@
-// Audio data converted from WAV file by wav2sketch
-
-extern const unsigned int AudioSampleBbb_tuba_3[31425];

examples/Analysis/NoteFrequency/AudioSampleBbb_tuba_4.h

@@ -1,3 +0,0 @@
-// Audio data converted from WAV file by wav2sketch
-
-extern const unsigned int AudioSampleBbb_tuba_4[31425];

examples/Analysis/NoteFrequency/AudioSampleBbb_tuba_5.h

@@ -1,3 +0,0 @@
-// Audio data converted from WAV file by wav2sketch
-
-extern const unsigned int AudioSampleBbb_tuba_5[33217];

examples/Analysis/NoteFrequency/NoteFrequency.ino

@@ -33,17 +33,17 @@
 #include <SPI.h>
 #include <SD.h>
 //---------------------------------------------------------------------------------------
-#include "e2_note.h"
-#include "a2_note.h"
-#include "d3_note.h"
-#include "g3_note.h"
-#include "b3_note.h"
-#include "e4_note.h"
-#include "AudioSampleBbb_tuba_1.h"
-#include "AudioSampleBbb_tuba_2.h"
-#include "AudioSampleBbb_tuba_3.h"
-#include "AudioSampleBbb_tuba_4.h"
-#include "AudioSampleBbb_tuba_5.h"
+#include "guitar_e2_note.h"
+#include "guitar_a2_note.h"
+#include "guitar_d3_note.h"
+#include "guitar_g3_note.h"
+#include "guitar_b3_note.h"
+#include "guitar_e4_note.h"
+#include "tuba_1.h"
+#include "tuba_2.h"
+#include "tuba_3.h"
+#include "tuba_4.h"
+#include "tuba_5.h"
 //---------------------------------------------------------------------------------------
 AudioAnalyzeNoteFrequency notefreq;
 AudioOutputAnalog         dac;
@@ -58,17 +58,18 @@ IntervalTimer playNoteTimer;
 
 void playNote(void) {
     if (!wav_note.isPlaying()) {
-        wav_note.play(e2_note);
-        //wav_note.play(a2_note);
-        //wav_note.play(d3_note);
-        //wav_note.play(g3_note);
-        //wav_note.play(b3_note);
-        //wav_note.play(e4_note);
-        //wav_note.play(AudioSampleBbb_tuba_1);
-        //wav_note.play(AudioSampleBbb_tuba_2);
-        //wav_note.play(AudioSampleBbb_tuba_3);
-        //wav_note.play(AudioSampleBbb_tuba_4);
-        //wav_note.play(AudioSampleBbb_tuba_5);
+        // Uncomment one of these sounds to test notefreq
+        wav_note.play(guitar_e2_note);
+        //wav_note.play(guitar_a2_note);
+        //wav_note.play(guitar_d3_note);
+        //wav_note.play(guitar_g3_note);
+        //wav_note.play(guitar_b3_note);
+        //wav_note.play(guitar_e4_note);
+        //wav_note.play(tuba_1);
+        //wav_note.play(tuba_2);
+        //wav_note.play(tuba_3);
+        //wav_note.play(tuba_4);
+        //wav_note.play(tuba_5);
         digitalWriteFast(LED_BUILTIN, !digitalReadFast(LED_BUILTIN));
     }
 }

examples/Analysis/NoteFrequency/a2_note.h

@@ -1 +0,0 @@
-extern const unsigned int a2_note[52184];

examples/Analysis/NoteFrequency/b3_note.h

@@ -1 +0,0 @@
-extern const unsigned int b3_note[52184];

examples/Analysis/NoteFrequency/d3_note.h

@@ -1 +0,0 @@
-extern const unsigned int d3_note[52184];

examples/Analysis/NoteFrequency/e2_note.h

@@ -1 +0,0 @@
-extern const unsigned int e2_note[52184];

examples/Analysis/NoteFrequency/e4_note.h

@@ -1 +0,0 @@
-extern const unsigned int e4_note[52184];

examples/Analysis/NoteFrequency/g3_note.h

@@ -1 +0,0 @@
-extern const unsigned int g3_note[52184];

examples/Analysis/NoteFrequency/a2_note.cpp → examples/Analysis/NoteFrequency/guitar_a2_note.cpp

@@ -1,5 +1,5 @@
-#include "a2_note.h"
-const unsigned int a2_note[52184] = {
+#include "guitar_a2_note.h"
+const unsigned int guitar_a2_note[52184] = {
 0x8100CBD8, 0xFFF7FFFB, 0xFFF7FFF8, 0xFFF3FFF6, 0xFFEDFFEF, 0xFFEAFFEC, 0xFFE6FFE9, 0xFFE0FFE2, 0xFFDAFFDD, 0xFFD5FFD7, 0xFFCFFFD3, 
 0xFFC9FFCB, 0xFFC6FFC9, 0xFFC0FFC4, 0xFFBBFFBD, 0xFFB4FFB7, 0xFFB0FFB0, 0xFFABFFAE, 0xFFA3FFA7, 0xFF9CFFA0, 0xFF99FF9A, 0xFF94FF96, 
 0xFF90FF93, 0xFF8CFF8D, 0xFF85FF89, 0xFF83FF82, 0xFF7DFF80, 0xFF78FF7C, 0xFF75FF77, 0xFF6EFF72, 0xFF6AFF6C, 0xFF69FF6A, 0xFF63FF67, 

examples/Analysis/NoteFrequency/guitar_a2_note.h

@@ -0,0 +1 @@
+extern const unsigned int guitar_a2_note[52184];

examples/Analysis/NoteFrequency/b3_note.cpp → examples/Analysis/NoteFrequency/guitar_b3_note.cpp

@@ -1,5 +1,5 @@
-#include "b3_note.h"
-const unsigned int b3_note[52184] = {
+#include "guitar_b3_note.h"
+const unsigned int guitar_b3_note[52184] = {
 0x8100CBD8, 0xFFB8FFBE, 0xFFB6FFB8, 0xFFBAFFB9, 0xFFC0FFBC, 0xFFC0FFC0, 0xFFBDFFC0, 0xFFB5FFBB, 0xFFA8FFAF, 0xFF98FFA0, 0xFF8CFF90, 
 0xFF83FF85, 0xFF7BFF7F, 0xFF79FF7A, 0xFF73FF74, 0xFF72FF73, 0xFF71FF72, 0xFF6CFF70, 0xFF62FF68, 0xFF56FF5C, 0xFF4BFF51, 0xFF43FF46, 
 0xFF43FF42, 0xFF42FF43, 0xFF3DFF40, 0xFF2CFF35, 0xFF1EFF25, 0xFF18FF1A, 0xFF1BFF18, 0xFF24FF1E, 0xFF2CFF27, 0xFF2DFF2E, 0xFF2DFF2D, 

examples/Analysis/NoteFrequency/guitar_b3_note.h

@@ -0,0 +1 @@
+extern const unsigned int guitar_b3_note[52184];

examples/Analysis/NoteFrequency/d3_note.cpp → examples/Analysis/NoteFrequency/guitar_d3_note.cpp

@@ -1,5 +1,5 @@
-#include "d3_note.h"
-const unsigned int d3_note[52184] = {
+#include "guitar_d3_note.h"
+const unsigned int guitar_d3_note[52184] = {
 0x8100CBD8, 0xFFF9FFFE, 0xFFEFFFF5, 0xFFE5FFE8, 0xFFDAFFE0, 0xFFD1FFD6, 0xFFC4FFCA, 0xFFBAFFC0, 0xFFB1FFB5, 0xFFA8FFAC, 0xFF9FFFA3, 
 0xFF93FF9A, 0xFF88FF8D, 0xFF7EFF82, 0xFF76FF7A, 0xFF6DFF73, 0xFF65FF67, 0xFF5DFF61, 0xFF54FF58, 0xFF4DFF52, 0xFF41FF47, 0xFF34FF3B, 
 0xFF2EFF30, 0xFF28FF2A, 0xFF20FF24, 0xFF19FF1C, 0xFF16FF17, 0xFF0EFF13, 0xFF03FF09, 0xFEFEFF00, 0xFEF8FEFA, 0xFEF2FEF4, 0xFEEFFEF1, 

examples/Analysis/NoteFrequency/guitar_d3_note.h

@@ -0,0 +1 @@
+extern const unsigned int guitar_d3_note[52184];

examples/Analysis/NoteFrequency/e2_note.cpp → examples/Analysis/NoteFrequency/guitar_e2_note.cpp

@@ -1,5 +1,5 @@
-#include "e2_note.h"
-const unsigned int e2_note[52184] = {
+#include "guitar_e2_note.h"
+const unsigned int guitar_e2_note[52184] = {
 0x8100CBD8, 0xFFFBFFFC, 0xFFF8FFFB, 0xFFF3FFF3, 0xFFF6FFF5, 0xFFEDFFF4, 0xFFE2FFE7, 0xFFDBFFDC, 0xFFD9FFD9, 0xFFDDFFDC, 0xFFDEFFDE, 
 0xFFDBFFDE, 0xFFD3FFD7, 0xFFCDFFCF, 0xFFC7FFCA, 0xFFC6FFC6, 0xFFC0FFC4, 0xFFBDFFBD, 0xFFBDFFBD, 0xFFB8FFBB, 0xFFAFFFB2, 0xFFABFFAC, 
 0xFFACFFAB, 0xFFACFFAD, 0xFFA7FFA9, 0xFFA5FFA5, 0xFF9DFFA2, 0xFF92FF97, 0xFF8CFF90, 0xFF88FF8A, 0xFF82FF86, 0xFF78FF7C, 0xFF79FF76, 

examples/Analysis/NoteFrequency/guitar_e2_note.h

@@ -0,0 +1 @@
+extern const unsigned int guitar_e2_note[52184];

examples/Analysis/NoteFrequency/e4_note.cpp → examples/Analysis/NoteFrequency/guitar_e4_note.cpp

@@ -1,5 +1,5 @@
-#include "e4_note.h"
-const unsigned int e4_note[52184] = {
+#include "guitar_e4_note.h"
+const unsigned int guitar_e4_note[52184] = {
 0x8100CBD8, 0xFFE4FFC2, 0x0007FFFF, 0x0019000C, 0x004B0032, 0x0089006C, 0x007E0090, 0x00C6007B, 0x018C0145, 0x013C0173, 0x01FB014A, 
 0x051F0365, 0x07F30698, 0x0BBD09B7, 0x0E870D64, 0x11C80FA9, 0x1B3215C5, 0x2270200E, 0x21602257, 0x21BD2117, 0x22292271, 0x1EDF20C1, 
 0x1AF11CF1, 0x1876191D, 0x1D6219F8, 0x23D72130, 0x242224C5, 0x1F3B2222, 0x19AC1C3F, 0x151E175B, 0x12321340, 0x10D511C8, 0x076A0DAC, 

examples/Analysis/NoteFrequency/guitar_e4_note.h

@@ -0,0 +1 @@
+extern const unsigned int guitar_e4_note[52184];

examples/Analysis/NoteFrequency/g3_note.cpp → examples/Analysis/NoteFrequency/guitar_g3_note.cpp

@@ -1,5 +1,5 @@
-#include "g3_note.h"
-const unsigned int g3_note[52184] = {
+#include "guitar_g3_note.h"
+const unsigned int guitar_g3_note[52184] = {
 0x8100CBD8, 0xFFF6FFFA, 0xFFF3FFF5, 0xFFEFFFF1, 0xFFE3FFEB, 0xFFD0FFDA, 0xFFBFFFC7, 0xFFAFFFB6, 0xFFB0FFB1, 0xFFA3FFAB, 0xFF95FF9B, 
 0xFF89FF8F, 0xFF7EFF82, 0xFF6CFF74, 0xFF66FF68, 0xFF61FF67, 0xFF53FF58, 0xFF50FF52, 0xFF49FF4B, 0xFF49FF49, 0xFF47FF48, 0xFF3BFF42, 
 0xFF33FF34, 0xFF33FF36, 0xFF2EFF2F, 0xFF2EFF2E, 0xFF27FF2B, 0xFF21FF26, 0xFF1AFF1D, 0xFF1AFF1B, 0xFF1AFF1B, 0xFF17FF19, 0xFF16FF16, 

examples/Analysis/NoteFrequency/guitar_g3_note.h

@@ -0,0 +1 @@
+extern const unsigned int guitar_g3_note[52184];

examples/Analysis/NoteFrequency/AudioSampleBbb_tuba_1.cpp → examples/Analysis/NoteFrequency/tuba_1.cpp

@@ -1,9 +1,9 @@
 // Audio data converted from WAV file by wav2sketch
 
-#include "AudioSampleBbb_tuba_1.h"
+#include "tuba_1.h"
 
 // Converted from BBb_Tuba_1.wav, using 44100 Hz, 16 bit PCM encoding
-const unsigned int AudioSampleBbb_tuba_1[31041] = {
+const unsigned int tuba_1[31041] = {
 0x8100F209,0x0718073C,0x06D106FA,0x068706AF,0x0629065A,0x05BB05F4,0x054A0582,0x04CB050B,
 0x043E0485,0x03B403FB,0x03260371,0x028F02DD,0x01F10240,0x015601A5,0x00C3010B,0x002F0074,
 0xFF96FFE2,0xFEFFFF4E,0xFE72FEC0,0xFDE6FE30,0xFD5BFDA0,0xFCD1FD17,0xFC45FC8D,0xFBC3FC08,

examples/Analysis/NoteFrequency/tuba_1.h

@@ -0,0 +1,3 @@
+// Audio data converted from WAV file by wav2sketch
+
+extern const unsigned int tuba_1[31041];

examples/Analysis/NoteFrequency/AudioSampleBbb_tuba_2.cpp → examples/Analysis/NoteFrequency/tuba_2.cpp

@@ -1,9 +1,9 @@
 // Audio data converted from WAV file by wav2sketch
 
-#include "AudioSampleBbb_tuba_2.h"
+#include "tuba_2.h"
 
 // Converted from BBb_Tuba_2.wav, using 44100 Hz, 16 bit PCM encoding
-const unsigned int AudioSampleBbb_tuba_2[31873] = {
+const unsigned int tuba_2[31873] = {
 0x8100F8DB,0x01B20196,0x01ED01D4,0x022D0213,0x02700252,0x02B20296,0x02EE02D5,0x0323030B,
 0x03420332,0x034F0349,0x0349034E,0x03330340,0x030A0322,0x02CC02ED,0x027302A3,0x0200023D,
 0x017301BB,0x00CA011F,0x000E006B,0xFF40FFA5,0xFE67FED4,0xFD92FDFF,0xFCBEFD28,0xFBF2FC5A,

examples/Analysis/NoteFrequency/tuba_2.h

@@ -0,0 +1,3 @@
+// Audio data converted from WAV file by wav2sketch
+
+extern const unsigned int tuba_2[31873];

examples/Analysis/NoteFrequency/AudioSampleBbb_tuba_3.cpp → examples/Analysis/NoteFrequency/tuba_3.cpp

@@ -1,9 +1,9 @@
 // Audio data converted from WAV file by wav2sketch
 
-#include "AudioSampleBbb_tuba_3.h"
+#include "tuba_3.h"
 
 // Converted from BBb_Tuba_3.wav, using 44100 Hz, 16 bit PCM encoding
-const unsigned int AudioSampleBbb_tuba_3[31425] = {
+const unsigned int tuba_3[31425] = {
 0x8100F571,0xFF7FFFA1,0xFF38FF5C,0xFEEBFF13,0xFE9FFEC7,0xFE54FE7B,0xFE0DFE2F,0xFDC9FDE8,
 0xFD86FDA6,0xFD48FD68,0xFD15FD2E,0xFCE8FCFE,0xFCC7FCDB,0xFCB3FCC1,0xFCA4FCAD,0xFC98FCA0,
 0xFC8DFC93,0xFC81FC86,0xFC6FFC73,0xFC56FC5D,0xFC37FC45,0xFC16FC28,0xFBF0FC06,0xFBCAFBDD,

examples/Analysis/NoteFrequency/tuba_3.h

@@ -0,0 +1,3 @@
+// Audio data converted from WAV file by wav2sketch
+
+extern const unsigned int tuba_3[31425];

examples/Analysis/NoteFrequency/AudioSampleBbb_tuba_4.cpp → examples/Analysis/NoteFrequency/tuba_4.cpp

@@ -1,9 +1,9 @@
 // Audio data converted from WAV file by wav2sketch
 
-#include "AudioSampleBbb_tuba_4.h"
+#include "tuba_4.h"
 
 // Converted from BBb_Tuba_4.wav, using 44100 Hz, 16 bit PCM encoding
-const unsigned int AudioSampleBbb_tuba_4[31425] = {
+const unsigned int tuba_4[31425] = {
 0x8100F571,0xFF7FFFA1,0xFF39FF5D,0xFEEFFF11,0xFEA3FEC3,0xFE56FE77,0xFE0EFE2F,0xFDC7FDE9,
 0xFD84FDA8,0xFD49FD68,0xFD14FD2E,0xFCE6FD00,0xFCC7FCDD,0xFCB2FCC2,0xFCA4FCAE,0xFC98FC9F,
 0xFC8CFC94,0xFC7EFC87,0xFC6CFC76,0xFC56FC5F,0xFC39FC44,0xFC15FC29,0xFBEFFC08,0xFBC9FBDF,

examples/Analysis/NoteFrequency/tuba_4.h

@@ -0,0 +1,3 @@
+// Audio data converted from WAV file by wav2sketch
+
+extern const unsigned int tuba_4[31425];

examples/Analysis/NoteFrequency/AudioSampleBbb_tuba_5.cpp → examples/Analysis/NoteFrequency/tuba_5.cpp

@@ -1,9 +1,9 @@
 // Audio data converted from WAV file by wav2sketch
 
-#include "AudioSampleBbb_tuba_5.h"
+#include "tuba_5.h"
 
 // Converted from BBb_Tuba_5.wav, using 44100 Hz, 16 bit PCM encoding
-const unsigned int AudioSampleBbb_tuba_5[33217] = {
+const unsigned int tuba_5[33217] = {
 0x81010315,0x059404F1,0x06E6063D,0x0834078E,0x097008D4,0x0A900A05,0x0B8B0B15,0x0C500BF6,
 0x0CD90C9D,0x0D220D04,0x0D280D2B,0x0CE90D11,0x0C6A0CB3,0x0BB70C1B,0x0ADB0B50,0x09E20A65,
 0x08E3096A,0x07E40868,0x06E10763,0x05E00660,0x04DA055E,0x03D00459,0x02C7034F,0x01C50245,

examples/Analysis/NoteFrequency/tuba_5.h

@@ -0,0 +1,3 @@
+// Audio data converted from WAV file by wav2sketch
+
+extern const unsigned int tuba_5[33217];