2015_robocon_bteam / Mbed 2 deprecated 2015robot_main

Dependencies:   PID QEI mbed

Fork of 2015robot_main by Naoto Deguchi

Revision:
48:64d005c70df2
Parent:
47:46db7f076cea
Child:
49:9276fda93084
diff -r 46db7f076cea -r 64d005c70df2 manualMode.h
--- a/manualMode.h	Fri Sep 25 01:25:22 2015 +0000
+++ b/manualMode.h	Sat Sep 26 00:52:38 2015 +0000
@@ -27,14 +27,15 @@
 {
     if(circle) {
         if(edge_circle) edge_circle=0,autoflag=1,Indicator4=1,IndicatorAuto=0;
-    } else if(triangle) Motor_swing=1;
+    } 
+    else if(triangle) targSwingRadVelocity = swingspeed;
     else if(square) {
         if(edge_square) {
             edge_square=0;
-            shootEsaka();
-            /*sendData(1,6);*/
+            sendData(1,6);
         }
-    } else if(cross) Motor_swing=0;
+    } 
+    else if(cross) targSwingRadVelocity = 0.0;
     else if(r1) sendData(1,4);
     else if(l1) sendData(1,5);
 }