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: main_ps3.cpp

Revision:
10:8a2255451513
Parent:
6:ca3a74a93ae2
Child:
12:ffea2f8c861f
Child:
13:57d8e360e9aa
diff -r f9a0c7ca640f -r 8a2255451513 main_ps3.cpp
--- a/main_ps3.cpp	Mon Nov 02 08:44:37 2015 +0000
+++ b/main_ps3.cpp	Mon Nov 02 08:48:04 2015 +0000
@@ -184,15 +184,11 @@
                 step=114;
             }
             
-//            if((x>1200.0+deff)&&(CStep==15)){
-//            if((x>1000.0+deff)&&(CStep==15)){
             if((x>1050.0+deff)&&(CStep==15)){
                 sendData(1,5);
                 CStep=16;
             }
             if((x>2505.0+deff)&&(CStep==16)){
-//            if((x>2455.0+deff)&&(CStep==16)){
-//            if((x>2630.0)&&(CStep==16)){
                 sendData(1,4);
                 CStep=17;
             }
@@ -221,7 +217,6 @@
                 flagf=0;
                 targ_sita=0.0;
             }
-//            if((step==3)&&(x<2000.0)) {
             if((step==3)&&(x<1850.0)) {
                 targ_sita=-PI/4;
                 step=4;
@@ -231,7 +226,6 @@
                 step=114;
             }
             /***Cylinder***/
-//            if((x>3030.0+deff)&&(CStep==1)) { 
             if((x>3100.0+deff)&&(CStep==1)) { 
                 if(!skip) sendData(1,1);
                 CStep=2;