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

Added handling of spline interpolation with end point velocities #169

Merged
merged 2 commits into from
Sep 1, 2023

Conversation

urmahp
Copy link
Collaborator

@urmahp urmahp commented Aug 23, 2023

Added test for spline interpolation and trajectory data as test artifacts

When spline interpolation has end points with velocities, the time is scaled such that the trajectory is followed, but we end with zero velocity.

@codecov
Copy link

codecov bot commented Aug 23, 2023

Codecov Report

Patch coverage is 100.00% of modified lines.

Files Changed Coverage
include/ur_client_library/ur/ur_driver.h ø
src/ur/ur_driver.cpp 100.00%

📢 Thoughts on this report? Let us know!.

@fmauch fmauch self-requested a review August 28, 2023 07:46
@fmauch fmauch added this to the Release 1.3.3 milestone Aug 29, 2023
Copy link
Member

@urrsk urrsk left a comment

Choose a reason for hiding this comment

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

Think we forgot the local keyword a couple of places

resources/external_control.urscript Outdated Show resolved Hide resolved
resources/external_control.urscript Outdated Show resolved Hide resolved
resources/external_control.urscript Outdated Show resolved Hide resolved
resources/external_control.urscript Outdated Show resolved Hide resolved
Added test for spline interpolation and trajectory data as test artifacts

When spline interpolation has end points with velocities, the time is  scaled such that the trajectory is followed, but we end with zero velocity.
@fmauch
Copy link
Collaborator

fmauch commented Sep 1, 2023

@urmahp this is done and ready for final review? @urrsk will you review this or should I take a deeper look?

@urmahp
Copy link
Collaborator Author

urmahp commented Sep 1, 2023

It is done and ready for final review. You are more than welcome to have a look @fmauch.

@urrsk
Copy link
Member

urrsk commented Sep 1, 2023

@fmauch please look as well.

Copy link
Collaborator

@fmauch fmauch left a comment

Choose a reason for hiding this comment

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

Overall this looks great!

My comments are mainly focused on making the script code easier to understand for future maintainers (including future-us ;-))

resources/external_control.urscript Outdated Show resolved Hide resolved
resources/external_control.urscript Outdated Show resolved Hide resolved
resources/external_control.urscript Outdated Show resolved Hide resolved
resources/external_control.urscript Outdated Show resolved Hide resolved
resources/external_control.urscript Outdated Show resolved Hide resolved
resources/external_control.urscript Outdated Show resolved Hide resolved
resources/external_control.urscript Outdated Show resolved Hide resolved
@urmahp
Copy link
Collaborator Author

urmahp commented Sep 1, 2023

Thanks for the suggestions @fmauch, I have added some changes based on the comments to make the code easier to understand, so please have a look and let me know what you think :)

Copy link
Collaborator

@fmauch fmauch left a comment

Choose a reason for hiding this comment

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

Thank you for taking the time explaining things further @urmahp. This looks good!

# Maximum allowable joint speed in rad/s
local max_speed = 6.283185
# The time needed to decelerate with 15 rad/s^2 to reach zero velocity when we move at maximum velocity.
local deceleration_time = max_speed / max_deceleration
Copy link
Collaborator

Choose a reason for hiding this comment

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

ah, now it makes sense :-)

@fmauch fmauch merged commit cd0d426 into UniversalRobots:master Sep 1, 2023
18 of 19 checks passed
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.

None yet

4 participants