2015_robocon_bteam / Mbed 2 deprecated 2015robot_main

Dependencies:   PID QEI mbed

Fork of 2015robot_main by Naoto Deguchi

Revision:
49:9276fda93084
Parent:
48:64d005c70df2
Child:
50:8ea4714316ce
--- a/main_ps3.cpp	Sat Sep 26 00:52:38 2015 +0000
+++ b/main_ps3.cpp	Sat Sep 26 01:37:01 2015 +0000
@@ -33,7 +33,7 @@
     sendData(5,31);*/
     while(1) {
         if(autoflag){
-            autoPs3();
+            autoPs3(); /*ps3 button*/
 #ifdef BLUE
             //Blue
             if((step==0)&&((8650.0>x)&&(x>1400.0))) targ_sita=0.0,step=1;
@@ -56,8 +56,8 @@
             if((x>3344.0)&&(CStep==1)) CStep=2,sendData(1,1);
             if((x>6234.0)&&(CStep==2)) CStep=3,sendData(1,3);
             if((x>7885.0)&&(CStep==3)) CStep=4,sendData(1,2);
-            if((x<6074.0)&&(CStep==4)) CStep=5,sendData(1,5);
-            if((x<5574.0)&&(CStep==5)) CStep=6,sendData(1,4);
+            if((x<6074.0)&&(CStep==4)) CStep=5,sendData(1,4);
+            if((x<5574.0)&&(CStep==5)) CStep=6,sendData(1,5);
             pc.printf("sita:%f, x:%f, y:%f ,x1:%f, x2:%f ,velocity:%f\r\n",sita,x,y,x1,x2,velocity);
 #endif            
             move_following();
@@ -66,7 +66,7 @@
         }
         else if(!autoflag) {
             manualMovePs3(); /*analogStick*/
-            manualPs3();     /*button*/
+            manualPs3();     /*ps3 button*/
             //Swing
             swingFollowing();
 //            pc.printf("rad/s:%f",swingRadVelocity);.