From: Jérémie D. <Ba...@us...> - 2011-04-03 14:46:41
|
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 fed2ad770503e3c2c71f46c3fc1b29989cf4773e (commit) from e5058912af31fe85c88da2437451c1f63c07f744 (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 fed2ad770503e3c2c71f46c3fc1b29989cf4773e Author: Jérémie Dimino <je...@di...> Date: Sun Apr 3 16:46:08 2011 +0200 [krobot_viewer] change the initial positions ----------------------------------------------------------------------- Changes: diff --git a/info/control2011/src/lib/krobot_config.ml b/info/control2011/src/lib/krobot_config.ml index 991a55d..86e1c46 100644 --- a/info/control2011/src/lib/krobot_config.ml +++ b/info/control2011/src/lib/krobot_config.ml @@ -9,7 +9,7 @@ let world_height = 2.1 let world_width = 3. -let robot_size = 0.3 +let robot_size = 0.29 let wheels_diameter = 0.098 let wheels_distance = 0.259 let wheels_position = 0.045 diff --git a/info/control2011/src/tools/krobot_viewer.ml b/info/control2011/src/tools/krobot_viewer.ml index fe95de4..6941356 100644 --- a/info/control2011/src/tools/krobot_viewer.ml +++ b/info/control2011/src/tools/krobot_viewer.ml @@ -672,7 +672,7 @@ lwt () = ignore_result ( Krobot_message.send bus (Unix.gettimeofday (), - Set_odometry(0.2, 1.9 +. Krobot_config.robot_size /. 2. -. Krobot_config.wheels_position, -0.5 *. pi)) + Set_odometry(0.215 -. Krobot_config.robot_size /. 2. +. Krobot_config.wheels_position, 1.885, 0.)) ); false)); @@ -683,7 +683,7 @@ lwt () = ignore_result ( Krobot_message.send bus (Unix.gettimeofday (), - Set_odometry(Krobot_config.world_width -. 0.2, 1.9 +. Krobot_config.robot_size /. 2. -. Krobot_config.wheels_position, -0.5 *. pi)) + Set_odometry(Krobot_config.world_width -. (0.215 -. Krobot_config.robot_size /. 2. +. Krobot_config.wheels_position), 1.885, pi)) ); false)); hooks/post-receive -- krobot |