2015_robocon_bteam / Mbed 2 deprecated 2015robot_main_zenkoku

Dependencies:   PID QEI mbed

Revision:
1:3ac2087996f3
Parent:
0:b613dc16f27d
Child:
3:8d8c25c556ae
--- a/manualMode.h	Wed Oct 28 09:03:19 2015 +0000
+++ b/manualMode.h	Wed Oct 28 09:26:31 2015 +0000
@@ -79,26 +79,6 @@
             sendData(1,5);
         }
     }
-    /*else if(b==5){
-        if(edge5){
-            edge5=0;
-            resetSwingSpeed = 1;
-            interruptSwingSpeed.attach(&countSwingSpeed, 0.05);
-            swingf=1;
-        }
-    }*/
-    else if(b==8){
-        if(edge8){
-            edge8=0;
-            enableShoot=1;
-        }
-    }
-    else if(b==9){
-        interruptSwingSpeed.detach();
-        targSwingRadVelocity = 0.0;
-        contSwing.reset();
-        Motor_swing = 0.0;
-    }
     else if(b==1){  /*L down*/
         if(edge1){
             edge1=0;
@@ -199,27 +179,6 @@
             spcount=speed;
         }
     }
-    else if(triangle){
-        if(edge_triangle){
-            edge_triangle=0;
-            resetSwingSpeed = 1;
-            interruptSwingSpeed.attach(&countSwingSpeed, 0.05);
-            swingf=1;
-        }
-    }
-    else if(cross){
-        interruptSwingSpeed.detach();
-        targSwingRadVelocity = 0.0;
-        contSwing.reset();
-        swingf=0;
-        Motor_swing = 0.0;
-    }
-    else if(square){
-        if(edge_square){
-            edge_square=0;
-            enableShoot=1;
-        }
-    }
     else if(left){
         sendData(1,5);
     }