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: autoMode.h

Revision:
75:4cdcd50ee666
Parent:
73:86b7b82ba997
Child:
77:7dd154b5ace3
--- a/autoMode.h	Sat Oct 10 02:04:14 2015 +0000
+++ b/autoMode.h	Sat Oct 10 02:40:41 2015 +0000
@@ -77,6 +77,12 @@
             sendData(5,stateR);
         }
     }
+    if(a2){
+        skip = 1;
+    }
+    else if(!a2){
+        skip = 0;
+    }
     if(b!=7) edge7=1;
     if(b!=1) edge1=1;
     if(b!=2) edge2=1;
@@ -116,13 +122,6 @@
     else if(square){ /*reset*/
         sendData(7,31);
     }
-    else if(triangle){
-//        sendData(7,defoR);
-        skip = 1;
-    }
-    else if(!triangle){
-        skip = 0;
-    }
     else if(cross){  /*stop*/
         Motor_swing=0;
 //        sita=PI/4.0,x=0.0,y=0.0;
@@ -159,6 +158,12 @@
             sendData(5,stateR);
         }
     }
+    if(triangle){
+        skip = 1;
+    }
+    else if(!triangle){
+        skip = 0;
+    }
 }
 #endif
 /***The function is PID controller initialize.***/