Diff: speaker_out.h

Revision:

26:2063ee8419cc

Parent:

18:0e0edd4f9e4d

--- a/speaker_out.h	Mon Apr 13 21:32:00 2020 +0000
+++ b/speaker_out.h	Tue Apr 14 01:40:26 2020 +0000
@@ -1,81 +1,68 @@
 #include "mbed.h"
 #include "Speaker.h"
-
-
-Serial pc(USBTX,USBRX);
-Speaker mySpeaker(p26);
-
-Timer t;
-
-
-char note;
-float freq [100];
-float freq2;
-float limit;
-
-float *record(float freq1[100]) {
+#include <vector>
+Timer t; 
+/*
+void record(vector<float>& song) {
+    float freq; 
+    char note; 
     t.start();
-    for(int i = 0; i<100; i++){
-        pc.printf("Please enter note\n");
+    while(t.read() < 30){
         note = pc.getc();
         switch (note){
             case 'a':
-                freq2 = 523.25;
+                freq = 523.25;
                 break;
             
-            case 'b':
-                freq2 = 554.37;
-                break;
-            
-            case 'c':
-                freq2 = 587.33;
+            case 's':
+                freq = 554.37;
                 break;
             
             case 'd':
-                freq2 = 622.25;
+                freq = 587.33;
+                break;
+            
+            case 'f':
+                freq = 622.25;
+                break;
+            
+            case 'g':
+                freq = 659.26;
+                break;
+            
+            case 'h':
+                freq = 698.46;
+                break;
+            
+            case 'j':
+                freq = 739.99;
+                break;
+            
+            case 'k':
+                freq = 783.99;
+                break;
+            
+            case 'l':
+                freq = 830.61;
+                break;
+            
+            case 'q':
+                freq = 880.00;
+                break;
+            
+            case 'w':
+                freq = 932.33;
                 break;
             
             case 'e':
-                freq2 = 659.26;
-                break;
-            
-            case 'f':
-                freq2 = 698.46;
-                break;
-            
-            case 'g':
-                freq2 = 739.99;
-                break;
-            
-            case 'h':
-                freq2 = 783.99;
-                break;
-            
-            case 'i':
-                freq2 = 830.61;
-                break;
-            
-            case 'j':
-                freq2 = 880.00;
-                break;
-            
-            case 'k':
-                freq2 = 932.33;
-                break;
-            
-            case 'l':
-                freq2 = 987.77;
+                freq = 987.77;
                 break;
             }
-            freq1[i] = freq2;
-            limit = t.read();
-            if(limit > 30){
-                t.stop();
-                break;
-            }
+            song.push_back(freq);
+            mySpeaker.PlayNote(freq,1.0,0.2);
         }
-    return freq1;
-    }
+        t.stop();
+}
 
 
 void audio_out() {
@@ -88,3 +75,4 @@
         }
     }
 }
+*/
\ No newline at end of file