Fix Pilz blending times... the right way #2961
Merged
Conversation
This file contains 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
sea-bass
commented
Aug 10, 2024
moveit_planners/pilz_industrial_motion_planner/src/trajectory_blender_transition_window.cpp
Show resolved
Hide resolved
|
@ct2034 want to give this a sanity check? (or maybe it's been too long...) |
stephanie-eng
approved these changes
Aug 10, 2024
Oh, it for sure resolves this issue. It's how I've been testing it. In fact, the previous PR squashed duplicate time points, but this one actually handles it correctly and ensures the two points are spaced accordingly. |
rhaschke
approved these changes
Aug 11, 2024
github-merge-queue
bot
removed this pull request from the merge queue due to failed status checks
sea-bass
added
backport-humble
sea-bass
added
backport-humble
mergify bot
pushed a commit
that referenced
this pull request
Sep 14, 2024
* Fix Pilz blending times... the right way * Remove more debugs * Format (cherry picked from commit 4fad0d0) # Conflicts: # moveit_planners/pilz_industrial_motion_planner/src/command_list_manager.cpp # moveit_planners/pilz_industrial_motion_planner/src/trajectory_blender_transition_window.cpp
mergify bot
pushed a commit
that referenced
this pull request
Sep 14, 2024
* Fix Pilz blending times... the right way * Remove more debugs * Format (cherry picked from commit 4fad0d0) # Conflicts: # moveit_planners/pilz_industrial_motion_planner/src/command_list_manager.cpp # moveit_planners/pilz_industrial_motion_planner/src/trajectory_blender_transition_window.cpp
This was referenced Sep 14, 2024
sea-bass
pushed a commit
that referenced
this pull request
Sep 15, 2024
sjahr
pushed a commit
that referenced
this pull request
Oct 29, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Description
Found the issue!
Turns out that Pilz's
appendWithStrictTimeIncrease()function had a single if-statement that encompassed two conditions:In both cases, the whole trajectory segment was appended with a
dt=0.The problem is that in case 1, it's appropriate to add a
dt=0(as the trajectory is empty, the first point should be att=0). In case 2, we needed to apply a non-zero sample time offset dictated by the actualdtof that trajectory's first waypoint.Closes #2945
Checklist