2015_robocon_bteam / Mbed 2 deprecated 2015robot_main

Dependencies:   PID QEI mbed

Fork of 2015robot_main by Naoto Deguchi

Revision:
108:7eb434cfcbd7
Parent:
107:579bb1ab67d9
Child:
112:717acc7c99f9
--- a/manualMode.h	Mon Oct 19 08:29:58 2015 +0000
+++ b/manualMode.h	Mon Oct 19 11:55:00 2015 +0000
@@ -5,19 +5,19 @@
 void manualMoveIM920()
 {
     if(Y<2) {
-        Move_l(-0.4);
-        Move_r(0.4);
+        Move_l(-0.65);
+        Move_r(0.63);
     } 
     else if(Y>6) {
-        Move_l(0.4);
-        Move_r(-0.4);
+        Move_l(0.6);
+        Move_r(-0.6);
     } 
     else {
         if(X<2) {
             Move_l(0.6);
-            Move_r(0.6);
+            Move_r(0.63);
         } else if(X>6) {
-            Move_l(-0.61);
+            Move_l(-0.65);
             Move_r(-0.6);
         } else {
             Move_l(0.0);
@@ -145,18 +145,8 @@
     else if(triangle){
         if(edge_triangle){
             edge_triangle=0;
-            /*if(targSwingRadVelocity == 0.0) targSwingRadVelocity = swingspeed;
-            else {
-                targSwingRadVelocity = 0.0;
-                contSwing.reset();
-            }*/
             targSwingRadVelocity = swingspeed;
         }
-        /*for(float i=0.0;i<1.0;i+=0.01){
-            Motor_swing=i;
-            wait(0.02);
-        }
-        Motor_swing = 1.0;*/
     }
     else if(cross){
         targSwingRadVelocity = 0.0;