2015_robocon_bteam / Mbed 2 deprecated 2015robot_main

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

Fork of 2015robot_main by Naoto Deguchi

Diff: manualMode.h

Revision:
49:9276fda93084
Parent:
48:64d005c70df2
Child:
50:8ea4714316ce
diff -r 64d005c70df2 -r 9276fda93084 manualMode.h
--- a/manualMode.h	Sat Sep 26 00:52:38 2015 +0000
+++ b/manualMode.h	Sat Sep 26 01:37:01 2015 +0000
@@ -34,8 +34,17 @@
             edge_square=0;
             sendData(1,6);
         }
-    } 
-    else if(cross) targSwingRadVelocity = 0.0;
+    }
+    /*else if(up){
+        if(edge_up){
+            edge_up=0;
+            sendData(1,4);
+        }
+    }*/
+    else if(cross){
+        targSwingRadVelocity = 0.0;
+        contSwing.reset();
+    }
     else if(r1) sendData(1,4);
     else if(l1) sendData(1,5);
 }