2015_robocon_bteam / Mbed 2 deprecated 2015robot_main_zenkoku

Dependencies:   PID QEI mbed

Revision:
7:4aa57a35ec0b
Parent:
6:ca3a74a93ae2
Child:
8:02ed55a576e0
diff -r ca3a74a93ae2 -r 4aa57a35ec0b manualMode.h
--- a/manualMode.h	Sun Nov 01 02:31:30 2015 +0000
+++ b/manualMode.h	Sun Nov 01 09:50:46 2015 +0000
@@ -88,14 +88,14 @@
     else if(b==5){
         if(edge5){
             edge5=0;
-            resetSwingSpeed = 1;
-            interruptSwingSpeed.attach(&countSwingSpeed, 0.05);
+            /*resetSwingSpeed = 1;
+            interruptSwingSpeed.attach(&countSwingSpeed, 0.05);*/
 //            targSwingRadVelocity = swingspeed;
-            /*for(float i=0.0;i<0.6;i+=0.01){
+            for(float i=0.0;i<0.5;i+=0.01){
                 Motor_swing=i;
                 wait(0.05);
             }
-            Motor_swing = 0.6;*/
+            Motor_swing = 0.5;
         }
     }
     else if(b==8){
@@ -108,6 +108,7 @@
         interruptSwingSpeed.detach();
         targSwingRadVelocity = 0.0;
         contSwing.reset();
+        sendData(2,8);
         Motor_swing = 0.0;
     }
     /*else if(b==5){