From acde40fcdb9015993875fb52abe43bfc48fd6167 Mon Sep 17 00:00:00 2001 From: _Luc_ Date: Wed, 27 May 2015 20:55:04 +0200 Subject: [PATCH] =?UTF-8?q?Transmet=20theta=20=C3=A0=20cmd=5Fvel?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/commande-abs.cpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/commande-abs.cpp b/src/commande-abs.cpp index 291e3ef..85b2cd1 100644 --- a/src/commande-abs.cpp +++ b/src/commande-abs.cpp @@ -20,6 +20,7 @@ class Run { private: float xx, yy, zz, theta; + float DEMI_PI; // xx < 0 : forward // xx > 0 : backward @@ -62,7 +63,7 @@ class Run } if (fabs(theta) > th_dev_min) { - mvt->angular.z * angle_vel; + mvt->angular.z = theta * angle_vel; } assert(mvt->linear.x == 0. || mvt->linear.y == 0.); @@ -73,7 +74,9 @@ class Run public: Run(const ros::Publisher& cmd_publisher) : pub(cmd_publisher) - {} + { + DEMI_PI = 2*atan(1.); + } void callback(const hand_control::Plan::ConstPtr& msg) { @@ -94,7 +97,7 @@ class Run zz = msg->altitude - neutral_z; - theta = msg->angle; + theta = msg->angle - DEMI_PI; if (first_msg) {