2015_robocon_bteam / Mbed 2 deprecated 2015robot_main

Dependencies:   PID QEI mbed

Fork of 2015robot_main by Naoto Deguchi

Revision:
111:846ea36dc1dc
Parent:
110:2ecb2f8aff81
Child:
112:717acc7c99f9
--- a/main_ps3.cpp	Tue Oct 20 08:05:07 2015 +0000
+++ b/main_ps3.cpp	Tue Oct 20 09:05:43 2015 +0000
@@ -178,13 +178,11 @@
                 targ_sita=0.025;
                 step=16;
             }
-//            if((step==16)&&(x>3200.0)){
             if((step==16)&&(x>2850.0+deff)){
                 targ_velocity=0.0;
                 step=17;
             }
             if((step==17)&&((velocity<5000.0)&&(velocity>-5000.0))){
-//            if((step==17)&&((velocity<10.0)&&(velocity>-10.0))){
                 flagf=0;
                 spcount=0.0;
                 targ_sita=0.035;
@@ -334,7 +332,6 @@
                 step=17;
             }
             if((step==17)&&((velocity<5000.0)&&(velocity>-5000.0))){
-//            if((step==17)&&((velocity<10.0)&&(velocity>-10.0))){
                 flagf=0;
                 spcount=0.0;
                 targ_sita=-0.035;