2015_robocon_bteam / Mbed 2 deprecated 2015robot_main_zenkoku

Dependencies:   PID QEI mbed

Revision:
32:b8c8ad2eeca7
Parent:
30:cd344beb415d
Child:
33:a4323c20494b
--- a/manualMode.h	Tue Nov 10 10:27:47 2015 +0000
+++ b/manualMode.h	Wed Nov 11 06:40:39 2015 +0000
@@ -43,14 +43,24 @@
     else if(b==6){
         if(edge6){
             edge6=0;
+//            sendData(1,7);
             sendData(1,1);
+            /*wait(0.5);
+            sendData(1,2);
+            wait(0.5);
+            sendData(1,3);
+            wait(0.5);
+            sendData(1,4);
+            wait(0.5);
+            sendData(1,5);
+            wait(0.5);
+            sendData(1,6);*/
         }
     }
     else if(b==8){
         if(edge8){
             edge8=0;
-            sendData(1,1);
-            wait(0.5);
+            targ_sita=PI/4.0;
         }
     }
     else if(b==1){
@@ -85,15 +95,15 @@
         if(edge10){
             edge10=0;
             resetState(0);
-            flagf=1;
+            flagf=0;
             spcount=0.0;
             dpcount=0.0;
             direction_controller.setBias(0.0);
-            sendData(5,90); //right
+            sendData(5,60); //right
             wait(0.05);
-            sendData(4,90); //left
+            sendData(4,60); //left
             wait(0.05);
-            sendData(6,90); //middle
+            sendData(6,30); //middle
             stateR = 90;
             stateL = 90;
             mstep   = 0;