Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -181,6 +181,7 @@ class Controller : public controller_interface::MultiInterfaceController<rm_cont
double publish_rate_{};
bool state_changed_{};
int loop_count_{};
double last_pos_des_[3]{ 0. };

// Transform
geometry_msgs::TransformStamped odom2gimbal_des_, odom2gimbal_, odom2base_, last_odom2base_;
Expand Down
3 changes: 2 additions & 1 deletion rm_gimbal_controllers/src/gimbal_base.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -452,7 +452,8 @@ void Controller::moveJoint(const ros::Time& time, const ros::Duration& period)
tf2::doTransform(target_vel, target_vel, transform);
tf2::fromMsg(target_pos, target_pos_tf);
tf2::fromMsg(target_vel, target_vel_tf);
vel_des[2] = target_pos_tf.cross(target_vel_tf).z() / std::pow((target_pos_tf.length()), 2);
vel_des[2] = angles::shortest_angular_distance(last_pos_des_[2], pos_des[2]) / period.toSec();
last_pos_des_[2] = pos_des[2];
}
if (joint_urdfs_.find(1) != joint_urdfs_.end())
{
Expand Down
Loading