Diff: main.cpp

Revision:

16:e01a77428828

Parent:

15:8ff317cc5d2c

Child:

17:7dd298995c14

--- a/main.cpp	Fri Apr 29 22:37:02 2016 +0000
+++ b/main.cpp	Fri Apr 29 22:40:35 2016 +0000
@@ -11,8 +11,6 @@
 
 SDFileSystem sd(p5, p6, p7, p8, "sd"); //SD card setup
 
-//Mutex mtx;  //Mutex lock
-
 uLCD_4DGL uLCD(p28,p27,p30); // serial tx, serial rx, reset pin;
 
 AnalogOut synthPin(p18);     // p18 is the pin that will have the output voltages on it
@@ -222,7 +220,6 @@
 
 void uLCD_Display_Thread(void const *args){     // uLCD displays curernt waveform shape, current octave, and the values for the ADSR coefficients
     while(1){
-        uLCD.cls();
         uLCD.locate(0,0);
         switch(myWave){
         case sine:
@@ -709,15 +706,12 @@
             switch(myWave){
                 case sine:
                     myWave = square;
-                    //change_Wave(myWave);
                     break;
                 case square:
                     myWave = sawtooth;
-                    //change_Wave(myWave);
                     break;
                 case sawtooth:
                     myWave = sine;
-                    //change_Wave(myWave);
                     break;
                 default:
                 break;
@@ -729,15 +723,12 @@
             switch(myWave){
                 case sine:
                     myWave = sawtooth;
-                    //change_Wave(myWave);
                     break;
                 case square:
                     myWave = sine;
-                    //change_Wave(myWave);
                     break;
                 case sawtooth:
                     myWave = square;
-                    //change_Wave(myWave);
                     break;
                 default:
                 break;
@@ -745,11 +736,5 @@
                 readyFlag = false;
                 
         }
-        
-        //do other tasks in main - interrupts will process button message characters
-        //myled = 1;
-//        wait(2);
-//        myled = 0;
-//        wait(2);
     }
 }