From: Jérémie D. <Ba...@us...> - 2011-04-19 19:05:31
|
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "krobot". The branch, master has been updated via 4f1a9587a1dba18c3bd3e3b962dacaffab58c2db (commit) from af646d8661612a1b39fe7725d6b747fcec064ab0 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 4f1a9587a1dba18c3bd3e3b962dacaffab58c2db Author: Jérémie Dimino <je...@di...> Date: Tue Apr 19 21:04:55 2011 +0200 [krobot_planner] change the motor moving condition ----------------------------------------------------------------------- Changes: diff --git a/info/control2011/src/tools/krobot_planner.ml b/info/control2011/src/tools/krobot_planner.ml index b591637..0dbe9f7 100644 --- a/info/control2011/src/tools/krobot_planner.ml +++ b/info/control2011/src/tools/krobot_planner.ml @@ -193,7 +193,7 @@ let go planner rotation_speed rotation_acceleration moving_speed moving_accelera 0.)) in - lwt () = Lwt_unix.sleep 2.0 in + lwt () = wait_done planner in (match planner.vertices with | _ :: l -> @@ -231,8 +231,10 @@ let handle_message planner (timestamp, message) = set_origin planner (planner.position, { vx = cos planner.orientation; vy = sin planner.orientation }) - | Motor_status(m1, m2, m3, m4) -> - planner.motors_moving <- m1 || m2 + + | Odometry_ghost(x, y, theta, following) -> + planner.motors_moving <- following + | _ -> () end hooks/post-receive -- krobot |