Diff: main.cpp

Revision:

15:8ff317cc5d2c

Parent:

14:40f57385c404

Child:

16:e01a77428828

--- a/main.cpp	Fri Apr 29 22:35:08 2016 +0000
+++ b/main.cpp	Fri Apr 29 22:37:02 2016 +0000
@@ -226,10 +226,10 @@
         uLCD.locate(0,0);
         switch(myWave){
         case sine:
-            uLCD.printf("Shape: Sine\r\n");     // if wave type is sine wave, display sine
+            uLCD.printf("Shape: Sine    \r\n");     // if wave type is sine wave, display sine
             break;
         case square:
-            uLCD.printf("Shape: Square\r\n");   // if wave type is square wave, display square
+            uLCD.printf("Shape: Square  \r\n");   // if wave type is square wave, display square
             break;
         case sawtooth:
             uLCD.printf("Shape: Sawtooth\r\n"); // if wave type is sawtooth wave, display sawtooth
@@ -572,10 +572,10 @@
             
         }
         else if((keyPress == D_NOTE_KEY) && (readyFlag)){ // Play note D
-                set_Note_Freq(noteArray[currentOctave-1][1]);
-                create_samples(noteFreq, myWave);
-                write_to_SDCard('D');
-                readyFlag = false;
+            set_Note_Freq(noteArray[currentOctave-1][1]);
+            create_samples(noteFreq, myWave);
+            write_to_SDCard('D');
+            readyFlag = false;
             
         }
         else if((keyPress == E_NOTE_KEY) && (readyFlag)){ // Play note E
@@ -602,11 +602,9 @@
             write_to_SDCard('A');
             readyFlag = false;
         }
-        else if((keyPress == B_NOTE_KEY) && (readyFlag)){ // button M pressed
+        else if((keyPress == B_NOTE_KEY) && (readyFlag)){ // Play note B
             set_Note_Freq(noteArray[currentOctave][6]);
             create_samples(noteFreq, myWave);
-            // Play note that corresponds to M
-            // Make note of which note was played in file on SD Card
             write_to_SDCard('B');
             readyFlag = false;
         }