2015_robocon_bteam / Mbed 2 deprecated 2015robot_main_zenkoku

Important changes to repositories hosted on mbed.com

Mbed hosted mercurial repositories are deprecated and are due to be permanently deleted in July 2026.

To keep a copy of this software download the repository Zip archive or clone locally using Mercurial.

It is also possible to export all your personal repositories from the account settings page.

Dependencies:   PID QEI mbed

Diff: manualMode.h

Revision:
22:4127fcf8c7d7
Parent:
8:02ed55a576e0
--- a/manualMode.h	Thu Nov 05 11:43:43 2015 +0000
+++ b/manualMode.h	Sat Nov 07 00:16:09 2015 +0000
@@ -87,15 +87,15 @@
     }
     else if(b==5){
         if(edge5){
-            edge5=0;
+            /*edge5=0;
             resetSwingSpeed = 1;
-            interruptSwingSpeed.attach(&countSwingSpeed, 0.05);
+            interruptSwingSpeed.attach(&countSwingSpeed, 0.05);*/
 //            targSwingRadVelocity = swingspeed;
-            /*for(float i=0.0;i<0.5;i+=0.01){
+            for(float i=0.0;i<0.6;i+=0.01){
                 Motor_swing=i;
-                wait(0.05);
+                wait(0.1);
             }
-            Motor_swing = 0.5;*/
+            Motor_swing = 0.6;
         }
     }
     else if(b==8){
@@ -111,6 +111,12 @@
         sendData(2,8);
         Motor_swing = 0.0;
     }
+    else if(b==6){
+        if(edge6){
+            edge6=0;
+            sendData(1,1);
+        }
+    }
     /*else if(b==5){
         if(edge5){
             edge5=0;
@@ -157,6 +163,7 @@
     if(b!=3) edge3=1;
     if(b!=4) edge4=1;
     if(b!=5) edge5=1;
+    if(b!=6) edge6=1;
     if(b!=8) edge8=1;
     if(b!=9) edge9=1;
 }