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 motion duration to gui_camera.proto #408

Merged
merged 2 commits into from
Nov 21, 2023
Merged

Conversation

jrutgeer
Copy link
Contributor

@jrutgeer jrutgeer commented Nov 9, 2023

🎉 New feature

Summary

Added 'duration' field to the proto, to allow to set the duration for the 'move to pose' service of the camera tracking plugin.

@github-actions github-actions bot added the 🎵 harmonic Gazebo Harmonic label Nov 9, 2023
@azeey
Copy link
Contributor

azeey commented Nov 10, 2023

This would be a good feature to add, but unfortunately, adding a field to an existing message breaks ABI, therefore this needs to target main.

@azeey azeey self-requested a review November 10, 2023 20:42
@jrutgeer jrutgeer changed the base branch from gz-msgs10 to main November 13, 2023 13:44
@jrutgeer jrutgeer changed the base branch from main to gz-msgs10 November 13, 2023 13:45
@jrutgeer
Copy link
Contributor Author

therefore this needs to target main.

Bummer. :-)

I tried to change this, but I did not succeed. Is there some way to retarget just this change, or should I rather close this and make a new PR?

@mjcarroll mjcarroll changed the base branch from gz-msgs10 to main November 13, 2023 15:48
@azeey
Copy link
Contributor

azeey commented Nov 13, 2023

Looks like @mjcarroll has changed the base branch on the PR, but you'll need to run git rebase to rebase the changes onto main

@ahcorde
Copy link
Contributor

ahcorde commented Nov 15, 2023

You can try something like this:

git checkout main
git checkout -b jrutgeer/duration/gui_camera
git cherry-pick d5e497e365b6b585f08b896acef4a0a5d2739834
git branch -D gz-msgs10
git checkout -b gz-msgs10
git push -f origin gz-msgs10

Anyhow is a bad idea to use the branch that you are trying to modify (in this case gz-msgs10), You should use something like jrutgeer/duration/gui_camera.

@ahcorde
Copy link
Contributor

ahcorde commented Nov 20, 2023

friendly ping @jrutgeer

Copy link

codecov bot commented Nov 20, 2023

Codecov Report

All modified and coverable lines are covered by tests ✅

Comparison is base (875c054) 97.26% compared to head (86ede3b) 97.26%.

Additional details and impacted files
@@           Coverage Diff           @@
##             main     #408   +/-   ##
=======================================
  Coverage   97.26%   97.26%           
=======================================
  Files          27       27           
  Lines        1170     1170           
=======================================
  Hits         1138     1138           
  Misses         32       32           

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@ahcorde
Copy link
Contributor

ahcorde commented Nov 20, 2023

@osrf-jenkins run tests please!

@ahcorde ahcorde enabled auto-merge (squash) November 21, 2023 09:31
@ahcorde ahcorde merged commit 171e1bd into gazebosim:main Nov 21, 2023
9 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
🎵 harmonic Gazebo Harmonic
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

3 participants