Diff: main.cpp

Revision:

11:4908defcd9d9

Parent:

10:dccb2be41fbd

Child:

12:f9060e568ff9

--- a/main.cpp	Sat May 22 19:12:30 2021 +0000
+++ b/main.cpp	Sun May 23 17:08:47 2021 +0000
@@ -44,7 +44,6 @@
 void print_pixel(uint8_t valR, uint8_t valG, uint8_t valB, int numPixelMatrix_i, int numPixelMatrix_j, int numPixelMatrixOLD_i, int numPixelMatrixOLD_j);
 void setPixelColor(int numPixelMatrix, int r, int g, int b);
 void ctr_ball();
-void ctr_ball_barra();
 
 int main()
 {   int sel_opcio=1;
@@ -268,18 +267,18 @@
     //printf ("\r\nRGB=> %ld, %ld, %ld \r\n", valR, valG, valB);
     int numPixelMatrix;
     if(numPixelMatrix_i%2==0){
-        numPixelMatrix=((numPixelMatrix_i*16)+15)-numPixelMatrix_j;
+        numPixelMatrix=(numPixelMatrix_i*16)+numPixelMatrix_j;
     }else{
-        numPixelMatrix=(numPixelMatrix_i*16)+numPixelMatrix_j;
+        numPixelMatrix=((numPixelMatrix_i*16)+15)-numPixelMatrix_j;
     }
     
     if(numPixelMatrixOLD_i!=-1 and numPixelMatrixOLD_j!=-1){
         
         int numPixelMatrixOLD;
         if(numPixelMatrixOLD_i%2==0){
-            numPixelMatrixOLD=((numPixelMatrixOLD_i*16)+15)-numPixelMatrixOLD_j;
+            numPixelMatrixOLD=(numPixelMatrixOLD_i*16)+numPixelMatrixOLD_j;
         }else{
-            numPixelMatrixOLD=(numPixelMatrixOLD_i*16)+numPixelMatrixOLD_j;
+            numPixelMatrixOLD=((numPixelMatrixOLD_i*16)+15)-numPixelMatrixOLD_j;
         }        
         
         setPixelColor(numPixelMatrixOLD, 0, 0, 0);
@@ -305,34 +304,26 @@
     
     bool found_barra=false;
     int i=0;
-    /*while(!found_barra and i<NUM_LEDS_BARRA){
-        if(barra[i]==old_j and old_i==1){
-            found_barra=true;
-            direct_ball=!direct_ball;           
+    if(old_i==15){
+        direct_ball=!direct_ball;
+    }
+    else{
+        while(!found_barra and i<NUM_LEDS_BARRA){
+            if(barra[i]==old_j and old_i==1){
+                found_barra=true;
+                direct_ball=!direct_ball;           
+            }
+            i++;
         }
-        i++;
+    }
+    
+    /*if((barra[0]==old_j or barra[1]==old_j or barra[2]==old_j or barra[3]==old_j) and old_i==1){
+        direct_ball=!direct_ball; 
     }*/
-    if((barra[0]==old_j or barra[1]==old_j or barra[2]==old_j or barra[3]==old_j) and old_i==1){
-        direct_ball=!direct_ball; 
-    }
     m_ball.movement(direct_ball);   
     
     print_pixel(255, 255, 255, m_ball.getCoordX(), m_ball.getCoordY(),old_i, old_j);
 }
 
-void ctr_ball_barra(){
-    int old_i=m_ball.getCoordX();
-    int old_j=m_ball.getCoordY();
-    
-    bool found_barra=false;
-    int i=0;
-    while(!found_barra and i<NUM_LEDS_BARRA){
-        if(barra[i]==old_j and old_i==1){
-            found_barra=true;
-            direct_ball=!direct_ball;           
-        }
-        i++;
-    }
-    m_ball.movement(direct_ball);
-}
 
+