2015_robocon_bteam / Mbed 2 deprecated 2015robot_main

Dependencies:   PID QEI mbed

Fork of 2015robot_main by Naoto Deguchi

Revision:
105:0be5d5d64782
Parent:
101:b67d33e56b66
Child:
107:579bb1ab67d9
--- a/manualMode.h	Sun Oct 18 01:33:09 2015 +0000
+++ b/manualMode.h	Sun Oct 18 11:30:42 2015 +0000
@@ -66,12 +66,6 @@
         contSwing.reset();
 //        Motor_swing = 0.0;
     }
-    /*else if(b==5){
-        sendData(1,5);
-    }
-    else if(b==6){
-        sendData(1,4);
-    }*/
     else if(b==1){  /*L down*/
         if(edge1){
             edge1=0;
@@ -100,6 +94,11 @@
             sendData(5,stateR);
         }
     }
+    if(deadflag){
+        interruptSwingSpeed.detach();
+        targSwingRadVelocity = 0.0;
+        contSwing.reset();
+    }
     if(b!=7) edge7=1;
     if(b!=1) edge1=1;
     if(b!=2) edge2=1;