Diff: main.cpp

Revision:

3:427c365950d7

Parent:

2:68c4e1539da5

--- a/main.cpp	Mon Oct 31 20:52:10 2016 +0000
+++ b/main.cpp	Wed Nov 02 17:17:03 2016 +0000
@@ -69,19 +69,19 @@
                 stdio_mutex.lock();
                 myRobot.drawDrown1();
                 stdio_mutex.unlock();
-                Thread::wait(50);
+                Thread::wait(150);
                 stdio_mutex.lock();
                 myRobot.drawDrown2();
                 stdio_mutex.unlock();
-                Thread::wait(50);
+                Thread::wait(150);
                 stdio_mutex.lock();
                 myRobot.drawDrown3();
                 stdio_mutex.unlock();
-                Thread::wait(50);
+                Thread::wait(150);
                 stdio_mutex.lock();
                 myRobot.drawDrown4();
                 stdio_mutex.unlock();
-                Thread::wait(50);
+                Thread::wait(150);
                 stdio_mutex.lock();
                 myRobot.drawDrown5();
                 stdio_mutex.unlock();
@@ -131,8 +131,8 @@
         stdio_mutex.unlock();
         */
         stdio_mutex.lock();
-        myRobot.drawRoad(Column1-10,95);
-        myRobot.drawRoad(Column1-31,95);
+        //myRobot.drawRoad(Column1-10,95);
+        //myRobot.drawRoad(Column1-31,95);
         myRobot.drawCar1(Position1,CarWidth);
         stdio_mutex.unlock();
         Thread::wait(10);
@@ -143,7 +143,7 @@
 {
     while(Alive) {
         Position2 = Position2 - Rate1;
-        if(Position2 < 0 ){
+        if(Position2 < -12 ){
             Position2 = 140;
             }
         
@@ -157,11 +157,11 @@
         }  
         Column2 = (ceil((Position2 - CarWidth)/21))*21;
         stdio_mutex.lock();
-        myRobot.drawRoad(Column2+10,53);
-        myRobot.drawRoad(Column2+31,53);
+        //myRobot.drawRoad(Column2+10,53);
+        //myRobot.drawRoad(Column2+31,53);
         myRobot.drawCar2(Position2,CarWidth);
         stdio_mutex.unlock();
-        Thread::wait(35);
+        Thread::wait(30);
     }
 }
 
@@ -176,10 +176,10 @@
         }
     
     if(Drown == 1){
-        stdio_mutex.lock();
-        uLCD.locate(1,1);
-        uLCD.printf("SPLASH!");
-        stdio_mutex.unlock();
+        //stdio_mutex.lock();
+        //uLCD.locate(1,1);
+        //uLCD.printf("SPLASH!");
+        //stdio_mutex.unlock();
         
         FILE *wave_file;
         wave_file=fopen("/sd/Splash.wav","r");