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

Spline merge #151

Merged
merged 5 commits into from
Jul 3, 2023
Merged

Spline merge #151

merged 5 commits into from
Jul 3, 2023

Conversation

urrsk
Copy link
Member

@urrsk urrsk commented Jun 30, 2023

Added Forward Spline interpolation to make the robot handle spline by it self
An attempt to merge #103

@codecov
Copy link

codecov bot commented Jun 30, 2023

Codecov Report

Patch coverage: 88.46% and project coverage change: +1.28 🎉

Comparison is base (d5ac71a) 69.54% compared to head (ac8f9c2) 70.83%.

❗ Current head ac8f9c2 differs from pull request most recent head d9cba8b. Consider uploading reports for the commit d9cba8b to get more accurate results

Additional details and impacted files
@@            Coverage Diff             @@
##           master     #151      +/-   ##
==========================================
+ Coverage   69.54%   70.83%   +1.28%     
==========================================
  Files          69       69              
  Lines        2476     2527      +51     
  Branches      314      322       +8     
==========================================
+ Hits         1722     1790      +68     
+ Misses        576      558      -18     
- Partials      178      179       +1     
Impacted Files Coverage Δ
...lient_library/control/trajectory_point_interface.h 100.00% <ø> (ø)
include/ur_client_library/ur/ur_driver.h 71.42% <ø> (+11.42%) ⬆️
src/ur/ur_driver.cpp 51.80% <75.00%> (+2.83%) ⬆️
src/control/trajectory_point_interface.cpp 81.25% <90.90%> (+9.45%) ⬆️

... and 4 files with indirect coverage changes

☔ View full report in Codecov by Sentry.
📢 Do you have feedback about the report comment? Let us know in this issue.

@urrsk urrsk requested a review from fmauch June 30, 2023 19:25
@urrsk urrsk force-pushed the splineMasterMerge branch 2 times, most recently from 21d38e2 to 35a5476 Compare July 1, 2023 08:07
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 @urrsk for cleaning this up. There are a couple of comments left I've done in #103. I've added them to this PR.

.github/workflows/ci.yml Show resolved Hide resolved
examples/full_driver.cpp Outdated Show resolved Hide resolved
examples/spline_example.cpp Outdated Show resolved Hide resolved
examples/tool_contact_example.cpp Outdated Show resolved Hide resolved
examples/spline_example.cpp Show resolved Hide resolved
examples/spline_example.cpp Outdated Show resolved Hide resolved
src/control/trajectory_point_interface.cpp Outdated Show resolved Hide resolved
@fmauch
Copy link
Collaborator

fmauch commented Jul 2, 2023

Note to myself: @urmahp should be noted as coauthor in the merge.

Co-authored-by: Mads Holm Peters <urmahp@universal-robots.com>

urrsk and others added 3 commits July 2, 2023 18:27
This enables the robot controller to interpolate the splines
in joint space
Change the version to support urscript scalar operations
Comments the keepalive in the examples

Co-authored-by: Felix Exner (fexner) <felix_mauch@web.de>
@urrsk urrsk force-pushed the splineMasterMerge branch 2 times, most recently from 48b043f to d3940c9 Compare July 2, 2023 16:31
To avoid sudden jump in velocity
Also updated the spline example
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.

This is looking good and I tested it with the example and the ROS1 driver PR.

@fmauch fmauch merged commit 57c1a6a into UniversalRobots:master Jul 3, 2023
15 checks passed
@urrsk urrsk deleted the splineMasterMerge branch July 3, 2023 21:26
@urrsk urrsk self-assigned this Aug 4, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants