]> rtime.felk.cvut.cz Git - eurobot/public.git/commitdiff
robofsm: Increase movement speed.
authorMichal Vokac <vokac.m@gmail.com>
Fri, 5 Oct 2012 23:04:21 +0000 (01:04 +0200)
committerMichal Vokac <vokac.m@gmail.com>
Fri, 5 Oct 2012 23:04:21 +0000 (01:04 +0200)
src/robofsm/common-states.cc
src/robofsm/sick-day.cc

index 50e44f6364b0466710e185a04196139929215428..7ea261b7979e14f1e97034ffa11fa0f9a5e6e29e 100644 (file)
@@ -254,7 +254,7 @@ FSM_STATE(approach_target)
                         printf("target %d / %d\n", target_cntr, max_target);
 
                         get_approach_point(x_target, y_tatget, &x_approach, &y_approach, &phi_approach);
-                        robot_goto_notrans(x_approach, y_approach, ARRIVE_FROM(phi_approach, 0.2), &tcSlow);
+                        robot_goto_notrans(x_approach, y_approach, ARRIVE_FROM(phi_approach, 0.2), &tcFast);
                         break;
                 case EV_MOTION_DONE:
                         DBG_PRINT_EVENT("target approached");
@@ -299,7 +299,7 @@ FSM_STATE(move_around)
                                 goaly = ((rand()%PLAYGROUND_WIDTH_MM)/1000.0);
                         } while (!ShmapIsFreePoint(goalx, goaly) && close_goal(goalx, goaly));
 
-                        robot_goto_notrans(goalx, goaly, NO_TURN(), &tcSlow);
+                        robot_goto_notrans(goalx, goaly, NO_TURN(), &tcFast);
                         DBG_PRINT_EVENT("new survey point");
                         break;
                 case EV_MOTION_ERROR:
index a80206b8a02ce00cac6c519bacf2b7de0c1d740a..dddbddd6e2ed2c1e3ae7384e3c3c58a1f9211ca3 100644 (file)
@@ -51,12 +51,12 @@ FSM_STATE(init)
                        tcFast = trajectoryConstraintsDefault;
                        tcFast.maxv = 1;
                        tcFast.maxacc = 0.5;
-                        tcFast.maxomega = 0.5;
+                        tcFast.maxomega = 1;
 
                        tcSlow = trajectoryConstraintsDefault;
                        tcSlow.maxv = 0.3;
                        tcSlow.maxacc = 0.2;
-                        tcSlow.maxomega = 0.2;
+                        tcSlow.maxomega = 0.7;
 
                         tcVerySlow = trajectoryConstraintsDefault;
                         tcVerySlow.maxv = 0.05;