From: Jérémie D. <Ba...@us...> - 2010-02-20 18:27:00
|
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 e3602ee46fe8c73cd28897123824e17c6e3aff69 (commit) via 5196fc4b5d9de11ad4a319b1b060796361efa92f (commit) from 2cfb7162690b09e27ef50cd5b8da74b83b98a4ce (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 e3602ee46fe8c73cd28897123824e17c6e3aff69 Author: Jérémie Dimino <je...@di...> Date: Sat Feb 20 19:26:36 2010 +0100 [controller] fix default value for goto mode commit 5196fc4b5d9de11ad4a319b1b060796361efa92f Author: Jérémie Dimino <je...@di...> Date: Sat Feb 20 19:26:09 2010 +0100 [commands] fix forward/backward ----------------------------------------------------------------------- Changes: diff --git a/PC_Mainboard/clients/script.ml b/PC_Mainboard/clients/script.ml index 0591871..2453320 100644 --- a/PC_Mainboard/clients/script.ml +++ b/PC_Mainboard/clients/script.ml @@ -139,7 +139,7 @@ let exec krobot line = | "goto" -> move (Krobot.goto krobot ~x:(arg_int "x" 0) ~y:(arg_int "y" 0) ~speed:(arg_int "speed" 400) ?acc:(arg_int "acc" 800) - ~mode:(match arg_string "mode" "" with + ~mode:(match arg_string "mode" "straight" with | "straight" -> `Straight | "curve-left" -> `Curve_left | "curve-right" -> `Curve_right diff --git a/PC_Mainboard/driver/commands.ml b/PC_Mainboard/driver/commands.ml index 81a2ab8..49b16c9 100644 --- a/PC_Mainboard/driver/commands.ml +++ b/PC_Mainboard/driver/commands.ml @@ -110,9 +110,9 @@ struct let move card ~dist ~speed ~acc = if dist < 0 then - backend Protocol.traj_forward card (-dist) speed acc + backend Protocol.traj_backward card (-dist) speed acc else - backend Protocol.traj_backward card dist speed acc + backend Protocol.traj_forward card dist speed acc let turn card ~angle ~speed ~acc = if angle < 0 then hooks/post-receive -- krobot |