Diff: main.cpp

Revision:

20:a63273c11af0

Parent:

19:bb0179b9043f

Child:

21:a554229e884b

--- a/main.cpp	Fri Aug 23 20:42:56 2013 +0000
+++ b/main.cpp	Mon Aug 26 14:20:32 2013 +0000
@@ -219,8 +219,8 @@
     Ticker updater;
     //Ticker demopaddlepos;
     Timer  gametimer;
-    PongGameButton buttonleft(PTD5,1);
-    PongGameButton buttonright(PTD0, 1);
+    PongGameButton buttonleft(PTD0,1);
+    PongGameButton buttonright(PTD5, 1);
     uint8_t ledcounter;
     uint8_t left_score = 0, right_score = 0;
     pc.baud(115200);
@@ -261,7 +261,7 @@
                     if(buttonright.paddlepos >= NUMBER_OF_PIXELS-1  ) //also count when hit at last pixel = NUMBER_OF_PIXELS-1
                     {
                         paddle.direction = 0;
-                        paddle.setSpeed(25+(buttonright.paddlepos-(NUMBER_OF_PIXELS-1))*6);
+                        paddle.setSpeed(20+(buttonright.paddlepos-(NUMBER_OF_PIXELS-1))*2);
                         paddle.position = NUMBER_OF_PIXELS-2;
                     }
                     pc.printf("\n\rright pushed. Paddle position: %d, registered: %d, speed: %", paddle.position, buttonright.paddlepos,paddle.getSpeed());
@@ -277,7 +277,7 @@
                     if(buttonleft.paddlepos <= 0  )
                     {
                         paddle.direction = 1;
-                        paddle.setSpeed(25+(-buttonleft.paddlepos)*6);
+                        paddle.setSpeed(20+(-buttonleft.paddlepos)*2);
                         paddle.position  = 0;
                     }
                     pc.printf("\n\rleft pushed. Paddle position: %d, registered: %d, speed %d", paddle.position, buttonleft.paddlepos, paddle.getSpeed());
@@ -391,7 +391,7 @@
         templeft = left>scorecounter?scorecounter:left;
         tempright = right>scorecounter?scorecounter:right;
         uint8_t sidecounter;
-        if(scorecounter == maxscore)
+        if(scorecounter == maxscore-1)
         {
             if(left >= right)
             {
@@ -409,7 +409,7 @@
             leftled.green = leftled.red = leftled.blue = rightled.green = rightled.red = rightled.blue = 255;
         }    
   
-        for(ledcounter = 0; ledcounter < NUMBER_OF_PIXELS; ledcounter++)
+        for(ledcounter = 0; ledcounter < NUMBER_OF_PIXELS; ledcounter++)//blank memory
         {
             write_led(&totalstrip[ledcounter], 0, 0 ,0);
         }