Enable mdof trajectory execution#2740
Merged
EzraBrooks merged 14 commits intoApr 30, 2024
Merged
Conversation
This was referenced Mar 18, 2024
henningkayser
commented
Mar 18, 2024
henningkayser
commented
Mar 18, 2024
sjahr
reviewed
Mar 18, 2024
sjahr
left a comment
sjahr
left a comment
Contributor
There was a problem hiding this comment.
Overall, I like this change, nice work!
| } | ||
| } | ||
| // clear velocities if we have an incomplete specification | ||
| if (joint_trajectory.points[i].velocities.size() != onedof.size()) |
Contributor
There was a problem hiding this comment.
Maybe print and error message here, since this probably indicates a bug somewhere
…nterfaces" This reverts commit 885ee27.
henningkayser
changed the title
Member
Author
|
I've put some of the open requests into #2773, since they seem out of scope of the new free function to me. I'm happy to provide API cleanup after mdof support has been completed. |
sjahr
reviewed
Mar 27, 2024
Comment on lines
+748
to
+753
| if (!joint_trajectory.joint_names.empty()) | ||
| { | ||
| joint_trajectory.header.frame_id = robot_model->getModelFrame(); | ||
| joint_trajectory.header.stamp = rclcpp::Time(0, 0, RCL_ROS_TIME); | ||
| joint_trajectory.points.resize(trajectory.getWayPointCount()); | ||
| } |
Contributor
There was a problem hiding this comment.
Suggested change
| if (!joint_trajectory.joint_names.empty()) | |
| { | |
| joint_trajectory.header.frame_id = robot_model->getModelFrame(); | |
| joint_trajectory.header.stamp = rclcpp::Time(0, 0, RCL_ROS_TIME); | |
| joint_trajectory.points.resize(trajectory.getWayPointCount()); | |
| } | |
| if (joint_trajectory.joint_names.empty()) | |
| { | |
| return std::nullopt; | |
| } | |
| joint_trajectory.header.frame_id = robot_model->getModelFrame(); | |
| joint_trajectory.header.stamp = rclcpp::Time(0, 0, RCL_ROS_TIME); | |
| joint_trajectory.points.resize(trajectory.getWayPointCount()); |
Contributor
There was a problem hiding this comment.
Shouldn't we just exit the function here if joint_names is empty?
Member
Author
There was a problem hiding this comment.
with the updated logic, I would just keep it the way it is probably
Signed-off-by: Paul Gesel <paulgesel@gmail.com>
Abishalini
approved these changes
Apr 24, 2024
EzraBrooks
approved these changes
Apr 30, 2024
EzraBrooks
left a comment
EzraBrooks
left a comment
Member
There was a problem hiding this comment.
This is working in Pro and the CI failure appears to be a flaky test.
I will re-run the CI here a few times to see if it passes, but otherwise I propose we open another PR to temporarily disable the flaky test.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This implements preparative steps to enable mobile base trajectory execution using ros2_control JTC.
In particular, these changes convert mdof trajectories into joint trajectories using the local variables which in turn can be supported by ros2_control already.
An example for a functioning setup with the Stretch robot + JTC + chained DiffDrive is provided in PickNikRobotics/stretch_ros#48