Diff: main.cpp

Revision:

1:32b9ad362749

Parent:

0:3403a3415306

Child:

2:0dfa60f22f07

diff -r 3403a3415306 -r 32b9ad362749 main.cpp
--- a/main.cpp	Wed May 04 10:58:52 2016 +0000
+++ b/main.cpp	Wed May 04 14:18:38 2016 +0000
@@ -83,14 +83,10 @@
 void units()
 {
     g_button1_flag =!g_button1_flag ;   // set flag in ISR
-   // r_led = !r_led;
 }
 void mode()
 {
     g_button2_flag =!g_button2_flag ;
-   // b_led = !b_led;
-  // lcd.clear();
-   //lcd.refresh();
 }
 void timeout_isr()
 {
@@ -132,9 +128,6 @@
 void redLedIndicator()
 {
     if (averageDistance<=30) {
-        // r_led = 1;
-        //   g_led = 1;
-        //  b_led = 1;
         myled = 1;
         lcd.clear();
         lcd.printString(" ***COLLISION ",2,1);
@@ -205,22 +198,8 @@
 {
 
     for (int i=81 ; i>0; i--) {
-        //move elements of distance to right
         graphArray[i] = graphArray[i-1];  //moving each element of array to right
-    }
-    
-    /*    for ( int i=0 ; i<5; i++) {
-        int distance = sensor.getDistanceCm();
-        if (distance < 400) { // decrease random error
-            averageDistance += distance;
-        } else {
-            i--;
-        }
-    }
-    //lcd.clear();
-    averageDistance = averageDistance/5; */
-   //get_averageDistance();
-    
+    } 
 }
 void adjacentArrayElements()
 {
@@ -262,87 +241,4 @@
     }
     lcd.refresh();
 }
-void modeTwo()
-{
-    for (int i=81 ; i>0; i--) {
-        //move elements of distance to right
-        graphArray[i] = graphArray[i-1];  //moving each element of array to right
-    }
-    for ( int i=0 ; i<5; i++) {
-        int distance = sensor.getDistanceCm();
-        if (distance < 400) { // decrease random error
-            averageDistance += distance;
-        } else {
-            i--;
-        }
-    }
-    lcd.clear();
-    averageDistance = averageDistance/5;
 
-
-    graphArray[0]= averageDistance; //plot distance
-    if ((int)graphArray[0] != (int)graphArray[1]) {
-        myled=1;
-        buzzer = delay; // duty cycle
-        buzzer.period(buzzerPeriod); //set pwm to my freq
-    } else {
-        myled=0;
-        buzzer=0;
-    }
-
-    for ( int i=0; i<84; i++) {
-        lcd.setPixel(i,46);
-        lcd.setPixel(i,47);
-    }
-    for ( int i=0; i<48; i++) {
-        lcd.setPixel(0,i);
-        lcd.setPixel(1,i);
-    }
-    // i in this loop is element of the array NOT pixel
-    for (int i=0; i<82; i++) {
-        //x position + y position)
-        int p = (int)(45-(graphArray[i]/(200/46)));
-        //convert from float distance to integer pixel
-        lcd.setPixel(83-i,p);
-    }
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-/*switch(averageDistance) {
-      case 380 :
-      lcd.drawRect(67,2,5,16,1);
-      break;
-      case 330 :
-       lcd.drawRect(59,2,5,16,1);
-       break;
-       case 280 :
-         lcd.drawRect(51,2,5,16,1);
-         break;
-         case 230 :
-         lcd.drawRect(43,2,5,16,1);
-         break;
-         case 180 :
-         lcd.drawRect(35,2,5,16,1);
-         break;
-         case 130 :
-         lcd.drawRect(27,2,5,16,1);
-         break;
-         case 80 :
-                lcd.drawRect(19,2,5,16,1); //Draw 2 Bars
-                break;
-                case 30 :
-                  lcd.drawRect(12,2,5,16,1); // 1 rectangle
-                  break;
-                  } */
-