Diff: display.h

Revision:

8:8d6474336444

Parent:

7:fd3602c86d75

--- a/display.h	Wed Nov 04 15:29:42 2015 +0000
+++ b/display.h	Wed Nov 04 20:41:31 2015 +0000
@@ -53,14 +53,14 @@
 
 void set_pos_vector(int *pos, int distance){
             
-    if(distance <= 10){
+    if(distance <= 9){
         for(int i=0;i<=5;i++){ pos[i] = 1; }
     }
-    else if(distance >= 34){
+    else if(distance >= 33){
         for(int i=24;i<=29;i++){ pos[i] = 1; }
     }
     else{
-        for(int i=(distance-10);i<=(distance-4);i++){ pos[i] = 1; }
+        for(int i=(distance-9);i<=(distance-4);i++){ pos[i] = 1; }
     }   
 }
 
@@ -103,27 +103,27 @@
 int print_ball(Serial &pc, int *distance1, int *distance2, double *posBallX, double *posBallY){
     pc.printf("\033[%d;%dH",(int)*posBallY, (int)*posBallX);     //Place le curseur à 0:0
     pc.printf(" ");     //Place le curseur à 0:0  
-    if(*posBallY <= 50){
+    if(*posBallX <= 50){
         if(*distance1 <= 10){
-            *posBallX = 4;
+            *posBallY = 4;
         }
-        else if(*distance1 >= 34){
-            *posBallX = 27;
+        else if(*distance1 >= 33){
+            *posBallY = 28;
         }
         else{
-            *posBallX = *distance1;
+            *posBallY = *distance1-5;
         }
     }
     else
     {
         if(*distance2 <= 10){
-            *posBallX = 4;
+            *posBallY = 4;
         }
         else if(*distance2 >= 34){
-            *posBallX = 27;
+            *posBallY = 28;
         }
         else{
-            *posBallX = *distance2;
+            *posBallY = *distance2-5;
         }
     }
     pc.printf("\033[%d;%dH",(int)*posBallY, (int)*posBallX);     //Place le curseur à 0:0