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

[JTC] Update trajectory documentation (backport #714) #723

Closed
wants to merge 3 commits into from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jul 31, 2023

This is an automatic backport of pull request #714 done by Mergify.
Cherry-pick of fa72170 has failed:

On branch mergify/bp/humble/pr-714
Your branch is up to date with 'origin/humble'.

You are currently cherry-picking commit fa72170.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	new file:   joint_trajectory_controller/doc/new_trajectory.png
	new file:   joint_trajectory_controller/doc/parameters.rst
	new file:   joint_trajectory_controller/doc/spline_acceleration.png
	new file:   joint_trajectory_controller/doc/spline_position.png
	new file:   joint_trajectory_controller/doc/spline_position_velocity.png
	new file:   joint_trajectory_controller/doc/spline_position_velocity_acceleration.png
	new file:   joint_trajectory_controller/doc/spline_position_velocity_acceleration_initialpoint.png
	new file:   joint_trajectory_controller/doc/spline_position_velocity_acceleration_initialpoint_notime.png
	new file:   joint_trajectory_controller/doc/spline_velocity.png
	new file:   joint_trajectory_controller/doc/spline_wrong_points.png
	new file:   joint_trajectory_controller/doc/trajectory.rst
	new file:   joint_trajectory_controller/doc/trajectory_replacement_future.png
	new file:   joint_trajectory_controller/doc/trajectory_replacement_now.png
	new file:   joint_trajectory_controller/doc/trajectory_replacement_past.png

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   joint_trajectory_controller/doc/userdoc.rst

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

(cherry picked from commit fa72170)

# Conflicts:
#	joint_trajectory_controller/doc/userdoc.rst
@christophfroehlich
Copy link
Contributor

Needs merging of #706 before.

@mergify
Copy link
Contributor Author

mergify bot commented Aug 5, 2023

This pull request is in conflict. Could you fix it @mergify[bot]?

* Small improvement in remapping (#393) (#724)

* Fix file name for include guard (backport #681)

(cherry picked from commit c619aac)

Co-authored-by: Christoph Fröhlich <christophfroehlich@users.noreply.github.com>

* Activate AdmittanceControllerTestParameterizedInvalidParameters (#711) (#733)

* [JTC] Re-enabling test, bugfixing and hardening. Adding a parameter to define when trajectories with non-zero velocity at the end are used. (backport #705) (#706)

* Add state_publish_rate parameter

---------

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant