Diff: main.cpp

Revision:

27:d48bf4e8f1a0

Parent:

26:8826ed43fad2

Child:

28:aab0aa846cf6

--- a/main.cpp	Mon Jan 24 21:06:31 2022 +0000
+++ b/main.cpp	Tue Jan 25 20:45:48 2022 +0000
@@ -183,39 +183,29 @@
  
     while(1) {
         // section to try to get POC of number comparitor without using the US for repeatablity// to get if statements correct possibly change to switch 
-        long Scan1[5];
-         long Scan2[5];
-         long Scan3[5];
-         long Scan4[5];
-         long Scan5[5];
-        int num2;
-        int num3;
-        int num4;
-
-    
-
-       // cout << "Test value collection";
-     //Scan1Input();    
-     /*
-cout << Scan1[0];cout <<"/n";
-cout << Scan1[1];"/n";
-cout << Scan1[2];"/n";
-cout << Scan1[3];"/n";
-cout << Scan1[4];"/n";
-cout << Scan1[5];"/n";
-cout << Scan1[6];"/n";
-cout << Scan1[7];"/n";
-cout << Scan1[8];"/n";
-cout << Scan1[9];"/n";
-*/
+         int Scan1[5];
+         int Scan2[5];
+         int Scan3[5];
+         int Scan4[5];
+         int Scan5[5];
+         int num2;
+         int num3;
+         int num4;
+char Decide[5];
+        
        //  IF Statement to decide on shape to draw
           if (Scan1[0] > Scan1[1]){
-            printf("01Higher\n%d  %d",Scan1[0],Scan1[1]);
+            printf("+");
+            Decide[0]= 'x';
+            printf( "chosen 1 %c\n",Decide[0]);
             }else if (Scan1[0] = Scan1[1]){
-             printf("01Equal\n%d  %d",Scan1[0],Scan1[1]);}
+            printf("=");
+            Decide[0]='=';
+            printf( "chosen2 %c\n",Decide[0]);}
             else if (Scan1[0] < Scan1[1]){
-              //  cout <<'Lower';}
-               printf("01Lower \n%d  %d",Scan1[0],Scan1[1]);}
+            printf("-");
+            Decide[0]='-';}
+            printf( "chosen3 %c\n",Decide[0]);
                          if (Scan1[1] > Scan1[2]){
             printf("12Higher\n");
             }else if (Scan1[1] = Scan1[2]){
@@ -245,8 +235,24 @@
             else if (Scan1[4] < Scan1[5]){
               //  cout <<'Lower';}
                printf("Lower \n");}
+    
 
+       // cout << "Test value collection";
+     //Scan1Input();    
+     /*
+cout << Scan1[0];cout <<"/n";
+cout << Scan1[1];"/n";
+cout << Scan1[2];"/n";
+cout << Scan1[3];"/n";
+cout << Scan1[4];"/n";
+cout << Scan1[5];"/n";
+cout << Scan1[6];"/n";
+cout << Scan1[7];"/n";
+cout << Scan1[8];"/n";
+cout << Scan1[9];"/n";
+*/
 
+printf("press count = %i\n",PressA);
 
  printf("Scan1 1 :  %d cm\n", Scan1[0]);
   printf("Scan1 2 :  %d cm\n", Scan1[1]);
@@ -348,7 +354,10 @@
      lcd.drawLine(0,10,80,10,2);
       
      lcd.printString("A to begin new Scan",0,2);
-     lcd.printString("B to Display last object",0,3);       
+     lcd.printString("Scan Starts move pad",0,3);
+     lcd.printString("B to display Shape",0,4);
+     lcd.printString("Kory 18689004",0,5);
+            
      lcd.refresh();
      wait_ms(50);
      
@@ -357,7 +366,7 @@
      case 1:
      PressA =1;
       lcd.clear();        
-    lcd.printString("First Scan",0,0); 
+      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);
@@ -387,7 +396,7 @@
          lcd.clear();lcd.refresh();
          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("Third Scan",0,0); 
+         lcd.printString("Third Scan",0,0); 
          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();
@@ -397,13 +406,12 @@
          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();;
-          lcd.printString("Scan 3 Done",0,0); lcd.refresh();
-        
+         lcd.printString("Scan 3 Done",0,0); lcd.refresh();  
          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();
-        wait(2);
-        lcd.printString("Fourth Scan",0,0); 
+         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();
+         wait(2);
+         lcd.printString("Fourth Scan",0,0); 
          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();
@@ -429,7 +437,9 @@
          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();;
-       
+     
+        PressA=0;
+     
         
         break;
 ////////////////////////////////////////////////////////////////////////////        
@@ -601,6 +611,7 @@
     g_buttonB_flag = 1;   // set flag in ISR
        lcd.clear(); 
         lcd.printString("Button B Pressed",0,0);
+        
          lcd.refresh(); // set flag in ISR
            printf("press count = %i\n",PressB);
 }