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.

Sign up for GitHub

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

Jump to bottom

Action bridge #2

Merged
merged 27 commits into from
Sep 20, 2022
Merged

Action bridge #2

merged 27 commits into from
Sep 20, 2022

Conversation

LoyVanBeek
Copy link
Member

@LoyVanBeek LoyVanBeek commented Nov 9, 2021 •
edited by fmessmer
Loading

This is ros2#256 rebased on mojin-devel.

@fmessmer
Copy link
Member

ref https://github.com/schiller-de/amr_platform_orga/issues/60
ref https://github.com/mojin-robotics/cob4/issues/2000

@fmessmer
Copy link
Member

fmessmer commented Jul 1, 2022

I updated mojin-robotics/ros1_bridge#master branch to be synced with latest ros2/ros1_bridge#master updates
now this branch has a merge conflict

@LoyVanBeek

@LoyVanBeek
Copy link
Member Author

Rebasing is not so easy anymore due to reformatting which makes things harder to see. I tried to re-rebase that didn't work out in the end.

@benmaidel benmaidel changed the base branch from master to mojin-devel September 8, 2022 15:45
@fmessmer
Copy link
Member

fmessmer commented Sep 9, 2022

@LoyVanBeek
we changed the target branch to mojin-devel
as #3 is merged now, this PR has a merge conflict
could you rebase and resolve the conflict and then test the action support another test - see https://github.com/4am-robotics/orga/issues/2503

@benmaidel
Copy link

I've rebased the action_bridge on top of mojin-devel. I've added a new branch with the rebased version here https://github.com/benmaidel/ros1_bridge/tree/action_bridge.
When tests are successful I'll force-push onto this branch

@LoyVanBeek
Copy link
Member Author

Tested successfully & OK in https://github.com/4am-robotics/orga/issues/2503#issuecomment-1252013415 so good to force-push and merge IMO

AndrejOrsula and others added 21 commits September 20, 2022 13:32
@AndrejOrsula @benmaidel
Fix typo (services_1_or_2 -> services_1_to_2) (ros2#379)
ee7d258 
Signed-off-by: Andrej Orsula <orsula.andrej@gmail.com>

Signed-off-by: Andrej Orsula <orsula.andrej@gmail.com>
@hsd-dev @benmaidel
added action templates
518d104 
Signed-off-by: Harsh Deshpande <harshavardhan.deshpande@ipa.fraunhofer.de>
@hsd-dev @benmaidel
generate action interface mappings
1a2710a 
Signed-off-by: Harsh Deshpande <harshavardhan.deshpande@ipa.fraunhofer.de>
@hsd-dev @benmaidel
added action factories
281c4ed 
Signed-off-by: Harsh Deshpande <harshavardhan.deshpande@ipa.fraunhofer.de>
@hsd-dev @benmaidel
added action_bridge executable
076317d 
Signed-off-by: Harsh Deshpande <harshavardhan.deshpande@ipa.fraunhofer.de>
@hsd-dev @benmaidel
fix template
4288410 
Signed-off-by: Harsh Deshpande <harshavardhan.deshpande@ipa.fraunhofer.de>
@hsd-dev @benmaidel
hack for GripperCommand
cf9e425 
Signed-off-by: Harsh Deshpande <harshavardhan.deshpande@ipa.fraunhofer.de>
@hsd-dev @fujitatomoya @benmaidel
Update include/ros1_bridge/action_factory.hpp
5992551 
Co-authored-by: tomoya <Tomoya.Fujita@sony.com>
Signed-off-by: Harsh Deshpande <harshavardhan.deshpande@ipa.fraunhofer.de>
@benmaidel
Fix python script errors in action generation
91358e6 
Signed-off-by: Victor Lopez <victor.lopez@pal-robotics.com>
Signed-off-by: Harsh Deshpande <harshavardhan.deshpande@ipa.fraunhofer.de>
@benmaidel
Foxy and later action compatibility
dc36c20 
Signed-off-by: Victor Lopez <victor.lopez@pal-robotics.com>
Signed-off-by: Harsh Deshpande <harshavardhan.deshpande@ipa.fraunhofer.de>
@benmaidel
Reorder ros node initialization to allow renaming of bridge
3443014 
Signed-off-by: Harsh Deshpande <harshavardhan.deshpande@ipa.fraunhofer.de>
@hsd-dev @benmaidel
fix error during rebase
0e2f7e3 
Signed-off-by: Harsh Deshpande <harshavardhan.deshpande@ipa.fraunhofer.de>
@hsd-dev @benmaidel
updated deprecated GoalResponseCallback signature
b82a76c 
https://github.com/ros2/rclcpp/blob/master/rclcpp_action/include/rclcpp_action/client.hpp#L289-L299

Signed-off-by: Harsh Deshpande <harshavardhan.deshpande@ipa.fraunhofer.de>
@hsd-dev @v-lopez @benmaidel
Update resource/interface_factories.cpp.em
4b31517 
Co-authored-by: Victor Lopez <3469405+v-lopez@users.noreply.github.com>
Signed-off-by: Harsh Deshpande <harshavardhan.deshpande@ipa.fraunhofer.de>
@hsd-dev @benmaidel
applied uncrustify patches
136628a 
Signed-off-by: Harsh Deshpande <harshavardhan.deshpande@ipa.fraunhofer.de>
@hsd-dev @benmaidel
fix action mapping rules
d2c6550 
Signed-off-by: Harsh Deshpande <harshavardhan.deshpande@ipa.fraunhofer.de>
@hsd-dev @benmaidel
print available action pairs
2a82e8c 
Signed-off-by: Harsh Deshpande <harshavardhan.deshpande@ipa.fraunhofer.de>
@hsd-dev @benmaidel
get active ROS1 action servers and clients
0e54354 
Signed-off-by: Harsh Deshpande <harshavardhan.deshpande@ipa.fraunhofer.de>
@hsd-dev @benmaidel
fix mapping rules for services
234016b 
Signed-off-by: Harsh Deshpande <harshavardhan.deshpande@ipa.fraunhofer.de>
@hsd-dev @benmaidel
reformatted with uncrustify
875705c 
Signed-off-by: Harsh Deshpande <harshavardhan.deshpande@ipa.fraunhofer.de>
@hsd-dev @benmaidel
map actions in dynamic_bridge
7567668 
Signed-off-by: Harsh Deshpande <harshavardhan.deshpande@ipa.fraunhofer.de>
@hsd-dev @benmaidel
shutdown internal server before removing the bridge
6ca008b 
Signed-off-by: Harsh Deshpande <harshavardhan.deshpande@ipa.fraunhofer.de>
@hsd-dev @benmaidel
updated GoalResponseCallback signature
bd8b703 
Signed-off-by: Harsh Deshpande <harshavardhan.deshpande@ipa.fraunhofer.de>
@hsd-dev @benmaidel
updated README
828280a 
Signed-off-by: Harsh Deshpande <harshavardhan.deshpande@ipa.fraunhofer.de>
@hsd-dev @benmaidel
fix formatting
91b7730 
added NOLINT whenever both cpplint and uncrustify cannot be satisfied
ament/ament_lint#158

Signed-off-by: Harsh Deshpande <harshavardhan.deshpande@ipa.fraunhofer.de>
@hsd-dev @benmaidel
add actionlib dependency with condition
2fc402d 
Signed-off-by: Harsh Deshpande <harshavardhan.deshpande@ipa.fraunhofer.de>
@hsd-dev @benmaidel
added dependency on rclcpp_action
f31c7d0 
Signed-off-by: Harsh Deshpande <harshavardhan.deshpande@ipa.fraunhofer.de>
@fmessmer fmessmer merged commit ec11ae5 into mojin-devel Sep 20, 2022
@fmessmer fmessmer deleted the action_bridge branch September 20, 2022 15:18
@fmessmer fmessmer mentioned this pull request Oct 21, 2022
Closed
@fmessmer fmessmer mentioned this pull request Jul 10, 2023
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@LoyVanBeek @fmessmer @benmaidel @AndrejOrsula @hsd-dev