Diff: main.cpp

Revision:

30:9d39318ef584

Parent:

29:1aef0ecf9840

Child:

31:91a3c61d33e6

--- a/main.cpp	Fri Jan 28 13:07:11 2022 +0000
+++ b/main.cpp	Fri Jan 28 14:47:06 2022 +0000
@@ -704,81 +704,85 @@
       lcd.clear();        
       lcd.printString("First Scan",0,0); 
       lcd.refresh();
-         Buzzer.play(300,120);  lcd.printString("X",0,1); lcd.refresh();       Scan1[0] = sensor.distance();
-         wait(2);
-         Buzzer.play(200,120);  lcd.printString("X",0,2);lcd.refresh();        Scan1[1] = sensor.distance();
-         wait(2);
-         Buzzer.play(200,120);  lcd.printString("X",0,3);lcd.refresh();        Scan1[2] = sensor.distance();
-         wait(2);
-         Buzzer.play(200,120);  lcd.printString("X",0,4);lcd.refresh();         Scan1[3] = sensor.distance();;
-         wait(2);
-         Buzzer.play(200,120);  lcd.printString("X",0,5);lcd.refresh();         Scan1[4] = sensor.distance();;
-         wait(2);
+      
+       Buzzer.play(300,120); wait(2);  lcd.printString("X",0,1); lcd.refresh();       Scan1[0] = sensor.distance();
+        wait_ms(5);
+         Buzzer.play(200,120); wait(2);  lcd.printString("X",0,2);lcd.refresh();        Scan1[1] = sensor.distance();
+        wait_ms(5);
+         Buzzer.play(200,120); wait(2);  lcd.printString("X",0,3);lcd.refresh();        Scan1[2] = sensor.distance();
+        wait_ms(5);
+         Buzzer.play(200,120); wait(2);  lcd.printString("X",0,4);lcd.refresh();         Scan1[3] = sensor.distance();;
+        wait_ms(5);
+         Buzzer.play(200,120); wait(2);  lcd.printString("X",0,5);lcd.refresh();         Scan1[4] = sensor.distance();;
+        wait_ms(5);
          lcd.printString("Scan 1 Done",0,0); lcd.refresh();
 
-         wait(2); // required to stop Black screen issue}
+        wait_ms(5); // required to stop Black screen issue}
          lcd.clear();lcd.refresh();
          lcd.printString("Second Scan",0,0);
          lcd.printString("X",0,1),lcd.printString("X",0,2),lcd.printString("X",0,3),lcd.printString("X",0,4),lcd.printString("X",0,5); lcd.refresh();
-         Buzzer.play(300,120);  lcd.printString("X",15,1); lcd.refresh();       Scan2[0] = sensor.distance();
-         wait(2);
-         Buzzer.play(200,120);  lcd.printString("X",15,2);lcd.refresh();        Scan2[1] = sensor.distance();
-         wait(2);
-         Buzzer.play(200,120);  lcd.printString("X",15,3);lcd.refresh();        Scan2[2] = sensor.distance();
-         wait(2);
-         Buzzer.play(200,120);  lcd.printString("X",15,4);lcd.refresh();         Scan2[3] = sensor.distance();
-         wait(2);
-         Buzzer.play(200,120);  lcd.printString("X",15,5);lcd.refresh();         Scan2[4] = sensor.distance();
+         Buzzer.play(300,120); wait(2);  lcd.printString("X",15,1); lcd.refresh();       Scan2[0] = sensor.distance();
+        wait_ms(5);
+         Buzzer.play(200,120); wait(2);  lcd.printString("X",15,2);lcd.refresh();        Scan2[1] = sensor.distance();
+        wait_ms(5);
+         Buzzer.play(200,120); wait(2);  lcd.printString("X",15,3);lcd.refresh();        Scan2[2] = sensor.distance();
+        wait_ms(5);
+         Buzzer.play(200,120); wait(2);  lcd.printString("X",15,4);lcd.refresh();         Scan2[3] = sensor.distance();
+        wait_ms(5);
+         Buzzer.play(200,120); wait(2);  lcd.printString("X",15,5);lcd.refresh();         Scan2[4] = sensor.distance();
          lcd.printString("Scan 2 Done",0,0); lcd.refresh();
 
-         wait(2); // required to stop Black screen issue}
+        wait_ms(5); // required to stop Black screen issue}
          lcd.clear();lcd.refresh();
          lcd.printString("Third Scan",0,0); 
          lcd.printString("X",0,1),lcd.printString("X",0,2),lcd.printString("X",0,3),lcd.printString("X",0,4),lcd.printString("X",0,5); lcd.refresh();
          lcd.printString("X",15,1),lcd.printString("X",15,2),lcd.printString("X",15,3),lcd.printString("X",15,4),lcd.printString("X",15,5); lcd.refresh();
-         Buzzer.play(300,120);  lcd.printString("X",30,1); lcd.refresh();       Scan3[0] = sensor.distance();
-         wait(2);
-         Buzzer.play(200,120);  lcd.printString("X",30,2);lcd.refresh();        Scan3[1] = sensor.distance();
-         wait(2);
-         Buzzer.play(200,120);  lcd.printString("X",30,3);lcd.refresh();        Scan3[2] = sensor.distance();
-         wait(2);
-         Buzzer.play(200,120);  lcd.printString("X",30,4);lcd.refresh();         Scan3[3] = sensor.distance();
-         wait(2);
-         Buzzer.play(200,120);  lcd.printString("X",30,5);lcd.refresh();         Scan3[4] = sensor.distance();
+         Buzzer.play(300,120); wait(2);  lcd.printString("X",30,1); lcd.refresh();       Scan3[0] = sensor.distance();
+        wait_ms(5);
+         Buzzer.play(200,120); wait(2);  lcd.printString("X",30,2);lcd.refresh();        Scan3[1] = sensor.distance();
+        wait_ms(5);
+         Buzzer.play(200,120); wait(2);  lcd.printString("X",30,3);lcd.refresh();        Scan3[2] = sensor.distance();
+         wait_ms(5);
+         Buzzer.play(200,120); wait(2);  lcd.printString("X",30,4);lcd.refresh();         Scan3[3] = sensor.distance();
+         wait_ms(5);
+         Buzzer.play(200,120); wait(2);  lcd.printString("X",30,5);lcd.refresh();         Scan3[4] = sensor.distance();
          lcd.printString("Scan 3 Done",0,0); lcd.refresh(); 
 
-         wait(2); // required to stop Black screen issue}
+         wait_ms(5); // required to stop Black screen issue}
          lcd.printString("Fourth Scan",0,0); 
          lcd.printString("X",0,1),lcd.printString("X",0,2),lcd.printString("X",0,3),lcd.printString("X",0,4),lcd.printString("X",0,5); lcd.refresh();
          lcd.printString("X",15,1),lcd.printString("X",15,2),lcd.printString("X",15,3),lcd.printString("X",15,4),lcd.printString("X",15,5); lcd.refresh();
          lcd.printString("X",30,1),lcd.printString("X",30,2),lcd.printString("X",30,3),lcd.printString("X",30,4),lcd.printString("X",30,5); lcd.refresh();        
-         Buzzer.play(300,120);  lcd.printString("X",45,1); lcd.refresh();       Scan4[0] = sensor.distance();
-         wait(2);
-         Buzzer.play(200,120);  lcd.printString("X",45,2);lcd.refresh();        Scan4[1] = sensor.distance();
-         wait(2);
-         Buzzer.play(200,120);  lcd.printString("X",45,3);lcd.refresh();        Scan4[2] = sensor.distance();
-         wait(2);
-         Buzzer.play(200,120);  lcd.printString("X",45,4);lcd.refresh();         Scan4[3] = sensor.distance();
-         wait(2);
-         Buzzer.play(200,120);  lcd.printString("X",45,5);lcd.refresh();         Scan4[4] = sensor.distance();
+         Buzzer.play(300,120); wait(2);  lcd.printString("X",45,1); lcd.refresh();       Scan4[0] = sensor.distance();
+         wait_ms(5);
+         Buzzer.play(200,120); wait(2);  lcd.printString("X",45,2);lcd.refresh();        Scan4[1] = sensor.distance();
+         wait_ms(5);
+         Buzzer.play(200,120); wait(2);  lcd.printString("X",45,3);lcd.refresh();        Scan4[2] = sensor.distance();
+         wait_ms(5);
+         Buzzer.play(200,120); wait(2);  lcd.printString("X",45,4);lcd.refresh();         Scan4[3] = sensor.distance();
+         wait_ms(5);
+         Buzzer.play(200,120); wait(2);  lcd.printString("X",45,5);lcd.refresh();         Scan4[4] = sensor.distance();
          lcd.printString("Scan 4 Done",0,0); lcd.refresh();
 
-         wait(2);
+         wait_ms(5);
          lcd.printString("Fifth Scan",0,0);
          lcd.printString("X",0,1),lcd.printString("X",0,2),lcd.printString("X",0,3),lcd.printString("X",0,4),lcd.printString("X",0,5); lcd.refresh();
          lcd.printString("X",15,1),lcd.printString("X",15,2),lcd.printString("X",15,3),lcd.printString("X",15,4),lcd.printString("X",15,5); lcd.refresh();
          lcd.printString("X",30,1),lcd.printString("X",30,2),lcd.printString("X",30,3),lcd.printString("X",30,4),lcd.printString("X",30,5); lcd.refresh();
          lcd.printString("X",45,1),lcd.printString("X",45,2),lcd.printString("X",45,3),lcd.printString("X",45,4),lcd.printString("X",45,5); lcd.refresh(); 
-         Buzzer.play(300,120);  lcd.printString("X",60,1); lcd.refresh();       Scan3[0] = sensor.distance();
-         wait(2);
-         Buzzer.play(200,120);  lcd.printString("X",60,2);lcd.refresh();        Scan3[1] = sensor.distance();
-         wait(2);
-         Buzzer.play(200,120);  lcd.printString("X",60,3);lcd.refresh();        Scan3[2] = sensor.distance();
-         wait(2);
-         Buzzer.play(200,120);  lcd.printString("X",60,4);lcd.refresh();         Scan3[3] = sensor.distance();
-         wait(2);
-         Buzzer.play(200,120);  lcd.printString("X",60,5);lcd.refresh();         Scan3[4] = sensor.distance();
+         Buzzer.play(300,120); wait(2);  lcd.printString("X",60,1); lcd.refresh();       Scan3[0] = sensor.distance();
+         wait_ms(5);
+         Buzzer.play(200,120); wait(2);  lcd.printString("X",60,2);lcd.refresh();        Scan3[1] = sensor.distance();
+         wait_ms(5);
+         Buzzer.play(200,120); wait(2);  lcd.printString("X",60,3);lcd.refresh();        Scan3[2] = sensor.distance();
+         wait_ms(5);
+         Buzzer.play(200,120); wait(2);  lcd.printString("X",60,4);lcd.refresh();         Scan3[3] = sensor.distance();
+         wait_ms(5);
+         Buzzer.play(200,120); wait(2);  lcd.printString("X",60,5);lcd.refresh();         Scan3[4] = sensor.distance();
          lcd.printString("Scan 5 Done",0,0); lcd.refresh();
+      
+
+      
          g_ButtonAPress=0;
      
         break;