2015_robocon_bteam / Mbed 2 deprecated 2015robot_main_zenkoku

Dependencies:   PID QEI mbed

Revision:
40:aed70f4dcd06
Parent:
39:5ba406327aa3
Child:
41:cd916d59832d
--- a/manualMode.h	Mon Nov 16 10:54:45 2015 +0000
+++ b/manualMode.h	Tue Nov 17 07:50:45 2015 +0000
@@ -69,7 +69,11 @@
             mstep   = 0;
             mCStep  = 114;
             flaga  = 1;
-            swingspeed = 17.0;
+#ifdef BLUE
+            swingspeed = 16.0;
+#else
+            swingspeed = 16.0;
+#endif
         }
     }
 #ifdef BLUE
@@ -127,7 +131,11 @@
             mstep   = 20;
             mCStep  = 114;
             flaga  = 1;
+#ifdef BLUE
+            swingspeed = 13.0; //入った
+#else
             swingspeed = 13.0;
+#endif
         }
     }
     else if((b==8)&&(swingmoved!=0)){