[JTC] Allow integration of states in goal trajectories#190
Merged
bmagyar merged 8 commits intoros-controls:masterfrom Apr 20, 2022
Merged
Conversation
Member
Author
|
I have here issue where uncrustify and cpplint are fighting... |
v-lopez
reviewed
May 28, 2021
joint_trajectory_controller/include/joint_trajectory_controller/trajectory.hpp
Outdated
Show resolved
Hide resolved
c260f0c to
bf8f81a
Compare
bf8f81a to
83de425
Compare
83de425 to
52f1617
Compare
Member
|
can you please rebase this? |
livanov93
suggested changes
Apr 11, 2022
| EXPECT_NEAR(point_before_msg.positions[0], expected_state.positions[0], EPS); | ||
| EXPECT_NEAR(point_before_msg.velocities[0], expected_state.velocities[0], EPS); | ||
| // is 0 because point_before_msg does not have velocity defined | ||
| EXPECT_NEAR(1.0, expected_state.accelerations[0], EPS); |
Contributor
There was a problem hiding this comment.
Could you document in a comment why you expect 1.0 for the sake of future test extensions?
harderthan
approved these changes
Apr 11, 2022
destogl
commented
Apr 11, 2022
destogl
commented
Apr 11, 2022
destogl
commented
Apr 11, 2022
destogl
commented
Apr 11, 2022
destogl
commented
Apr 11, 2022
destogl
commented
Apr 11, 2022
destogl
commented
Apr 11, 2022
destogl
commented
Apr 11, 2022
bmagyar
requested changes
Apr 12, 2022
joint_trajectory_controller/src/joint_trajectory_controller.cpp
Outdated
Show resolved
Hide resolved
joint_trajectory_controller/src/joint_trajectory_controller.cpp
Outdated
Show resolved
Hide resolved
joint_trajectory_controller/src/joint_trajectory_controller.cpp
Outdated
Show resolved
Hide resolved
Co-authored-by: Victor Lopez <3469405+v-lopez@users.noreply.github.com>
2de56e6 to
86e3a9f
Compare
destogl
commented
Apr 20, 2022
Member
Author
destogl
left a comment
There was a problem hiding this comment.
I have added all the changes and commented to the rest.
The relevant tests are passing:
- "test_trajectory" - set of tests
- "missing_positions_message_accepted" test in "test_trajectory_controller" set (newly added test)
bmagyar
approved these changes
Apr 20, 2022
destogl
added a commit
to b-robotized-forks/ros2_controllers
that referenced
this pull request
Apr 26, 2022
) * Add allow_integration flag * Added position and velocity deduction to trajectory. * Added support for deduction of states from their derivatives. * Apply suggestions from code review Co-authored-by: Victor Lopez <3469405+v-lopez@users.noreply.github.com> * Correct warnings and formating. * Update test to use more human-readable values. * Apply reviewers comments. * Last test fixes. Co-authored-by: Denis Štogl <destogl@users.noreply.github.com> Co-authored-by: Victor Lopez <3469405+v-lopez@users.noreply.github.com>
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.
Second part of #161,
Enabling integration of states in goal trajectories. This means that goal trajectories may have only velocity of acceleration defined. Then posiitions and/or velocities will be integrated from inputs.