2015_robocon_bteam / Mbed 2 deprecated 2015robot_main

Dependencies:   PID QEI mbed

Fork of 2015robot_main by Naoto Deguchi

Revision:
101:b67d33e56b66
Parent:
93:9cacc1763463
Child:
105:0be5d5d64782
--- a/manualMode.h	Fri Oct 16 10:58:18 2015 +0000
+++ b/manualMode.h	Sat Oct 17 06:04:49 2015 +0000
@@ -34,20 +34,18 @@
             Indicator4=1;
             IndicatorAuto=0;
             resetState();
+            Move_l(0.0);
+            Move_r(0.0);
             flaga=0;
-            spcount=speed;
+            step=114;
+            CStep=114;
+            spcount=speed;            
         }
     }
     else if(b==5){
         if(edge5){
             edge5=0;
             interruptSwingSpeed.attach(&countSwingSpeed, 0.05);
-            /*
-            for(float i=0.0;i<swingspeed;i+=swingspeed/10.0){
-                targSwingRadVelocity=i;
-                wait(0.05);
-            }
-            */
 //            targSwingRadVelocity = swingspeed;
             /*for(float i=0.0;i<0.6;i+=0.01){
                 Motor_swing=i;
@@ -63,9 +61,9 @@
         }
     }
     else if(b==9){
+        interruptSwingSpeed.detach();
         targSwingRadVelocity = 0.0;
         contSwing.reset();
-        interruptSwingSpeed.detach();
 //        Motor_swing = 0.0;
     }
     /*else if(b==5){