Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add jerk to the robot model #683

Merged
merged 3 commits into from
Jan 2, 2022
Merged

Conversation

AndyZe
Copy link
Member

@AndyZe AndyZe commented Sep 17, 2021

Now that we have some MoveIt capabilities that can process jerk limits, I think we should add jerk limits to the robot model. This simply adds the jerk parameters to joint_limits.yaml and adds the parsing code to robot_model_loader.cpp.

Fixes #574

Copy link
Contributor

@nbbrooks nbbrooks left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm

Copy link
Contributor

@JafarAbdi JafarAbdi left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we should also update computeVariableBoundsMsg and operator<<(std::ostream& out, const VariableBounds& b) to include the new fields

I released moveit_msgs an hour ago but we need to add it to the .repos file until it gets synced to the Debians

@henningkayser
Copy link
Member

Changes look good to me. Let's hold off on merging this until the MoveIt release is done.

Copy link
Member

@henningkayser henningkayser left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you add jerk to the RobotTrajectory::print() function (#715) right below efforts? LGTM after that

@codecov
Copy link

codecov bot commented Oct 14, 2021

Codecov Report

Merging #683 (f7289dd) into main (6141e3a) will decrease coverage by 3.78%.
The diff coverage is 25.00%.

❗ Current head f7289dd differs from pull request most recent head 65b2dad. Consider uploading reports for the commit 65b2dad to get more accurate results
Impacted file tree graph

@@            Coverage Diff             @@
##             main     #683      +/-   ##
==========================================
- Coverage   57.92%   54.15%   -3.77%     
==========================================
  Files         310      195     -115     
  Lines       26091    20343    -5748     
==========================================
- Hits        15111    11015    -4096     
+ Misses      10980     9328    -1652     
Impacted Files Coverage Δ
moveit_core/robot_state/src/robot_state.cpp 32.72% <0.00%> (-14.65%) ⬇️
...eit_core/robot_trajectory/src/robot_trajectory.cpp 23.16% <20.00%> (-41.29%) ⬇️
moveit_core/robot_model/src/joint_model.cpp 51.24% <36.37%> (-7.58%) ⬇️
...bot_state/include/moveit/robot_state/robot_state.h 89.12% <50.00%> (-1.15%) ⬇️
...ning/robot_model_loader/src/robot_model_loader.cpp 75.00% <50.00%> (-5.62%) ⬇️
...bot_model/include/moveit/robot_model/joint_model.h 82.86% <100.00%> (+0.92%) ⬆️
...rajectory_processing/src/ruckig_traj_smoothing.cpp 0.00% <0.00%> (-80.61%) ⬇️
...ace/include/moveit/ompl_interface/ompl_interface.h 0.00% <0.00%> (-66.66%) ⬇️
.../planning_scene_monitor/src/trajectory_monitor.cpp 0.00% <0.00%> (-66.07%) ⬇️
...or/src/occupancy_map_monitor_middleware_handle.cpp 0.00% <0.00%> (-48.97%) ⬇️
... and 268 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 6141e3a...65b2dad. Read the comment docs.

@v4hn
Copy link
Contributor

v4hn commented Oct 17, 2021 via email

v4hn added a commit to v4hn/moveit that referenced this pull request Oct 17, 2021
Not an actual bug because both arrays share the same memory.

As mentioned in moveit/moveit2#683 (review)
AndyZe pushed a commit to moveit/moveit that referenced this pull request Oct 18, 2021
Not an actual bug because both arrays share the same memory.

As mentioned in moveit/moveit2#683 (review)
@AndyZe
Copy link
Member Author

AndyZe commented Oct 25, 2021

I see that has_acceleration_ and has_effort_ were mutually exclusive before. I'm not sure why -- I guess it was a hacky way to ensure joints were only controlled in one mode at a time. (torque directly causes acceleration)

I'll plan to leave it as it was.

@v4hn
Copy link
Contributor

v4hn commented Oct 26, 2021 via email

@AndyZe
Copy link
Member Author

AndyZe commented Oct 26, 2021

@v4hn thanks for a critical review that looks at the bigger picture.

I only modified the RobotState so I could add jerk to RobotTrajectory::print() that Henning asked for. Well, that seems like not a very good reason to add so much overhead, like you said. I'll go ahead and revert the commit that modified RobotState.

@AndyZe AndyZe force-pushed the andyz/add_jerk_limits branch 3 times, most recently from 6afab4a to 3a4e174 Compare October 27, 2021 14:56
@mergify
Copy link

mergify bot commented Dec 6, 2021

This pull request is in conflict. Could you fix it @AndyZe?

1 similar comment
@mergify
Copy link

mergify bot commented Jan 1, 2022

This pull request is in conflict. Could you fix it @AndyZe?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Parse jerk limits from joint_limits.yaml and add jerk limits to Joint Model
5 participants