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

Updates to support ROS 2 Rolling (backport #41) #43

Closed
wants to merge 1 commit into from

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Sep 23, 2024

Changes Made

Several changes are made in the scope of this PR to bring support for ROS 2 Rolling (and eventually Jazzy)

Associated Issues

Testing

Testing was done using both demos


This is an automatic backport of pull request #41 done by [Mergify](https://mergify.com).

* Updated dockerfile and devcontainer

* Cleanup controllers for latest version of ros2_control

* Removed dll_export stuff

* Cleanup devcontainer

* Updated to use latest version of hydrodynamics

* Fix clang tidy errors

* Resolve final error in CI

* Fixed dev container name

(cherry picked from commit ad612dc)

# Conflicts:
#	.devcontainer/Dockerfile
#	.devcontainer/nouveau/Dockerfile
#	.devcontainer/nvidia/Dockerfile
#	.github/workflows/ci.yml
#	.github/workflows/docker.yml
#	.vscode/c_cpp_properties.json
#	.vscode/settings.json
#	thruster_allocation_matrix_controller/include/thruster_allocation_matrix_controller/thruster_allocation_matrix_controller.hpp
#	thruster_allocation_matrix_controller/src/thruster_allocation_matrix_controller.cpp
#	thruster_controllers/include/thruster_controllers/polynomial_thrust_curve_controller.hpp
#	thruster_controllers/src/polynomial_thrust_curve_controller.cpp
#	velocity_controllers/include/velocity_controllers/integral_sliding_mode_controller.hpp
#	velocity_controllers/src/integral_sliding_mode_controller.cpp
Copy link
Author

mergify bot commented Sep 23, 2024

Cherry-pick of ad612dc has failed:

On branch mergify/bp/humble/pr-41
Your branch is up to date with 'origin/humble'.

You are currently cherry-picking commit ad612dc.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   .clang-format
	modified:   .clang-tidy
	new file:   .devcontainer/devcontainer.json
	deleted:    .devcontainer/nouveau/devcontainer.json
	deleted:    .devcontainer/nvidia/devcontainer.json
	deleted:    .docker/Dockerfile
	modified:   .dockerignore
	modified:   .gitignore
	modified:   .pre-commit-config.yaml
	modified:   auv_control_demos/CMakeLists.txt
	modified:   auv_control_demos/chained_controllers/xacro/chained_config.xacro
	modified:   auv_control_demos/chained_controllers/xacro/chained_ros2_control.xacro
	modified:   auv_control_demos/chained_controllers/xacro/chained_urdf.xacro
	modified:   auv_control_demos/individual_controller/xacro/individual_config.xacro
	modified:   auv_control_demos/individual_controller/xacro/individual_ros2_control.xacro
	modified:   auv_control_demos/individual_controller/xacro/individual_urdf.xacro
	deleted:    requirements-dev.txt
	modified:   thruster_allocation_matrix_controller/CMakeLists.txt
	deleted:    thruster_allocation_matrix_controller/include/thruster_allocation_matrix_controller/visibility_control.h
	modified:   thruster_allocation_matrix_controller/package.xml
	modified:   thruster_allocation_matrix_controller/src/thruster_allocation_matrix_controller_parameters.yaml
	modified:   thruster_allocation_matrix_controller/thruster_allocation_matrix_controller.xml
	modified:   thruster_controllers/CMakeLists.txt
	deleted:    thruster_controllers/include/thruster_controllers/visibility_control.h
	modified:   thruster_controllers/src/polynomial_thrust_curve_controller_parameters.yaml
	modified:   velocity_controllers/CMakeLists.txt
	deleted:    velocity_controllers/include/velocity_controllers/visibility_control.h
	modified:   velocity_controllers/package.xml
	modified:   velocity_controllers/src/integral_sliding_mode_controller_parameters.yaml

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   .devcontainer/Dockerfile
	deleted by them: .devcontainer/nouveau/Dockerfile
	deleted by them: .devcontainer/nvidia/Dockerfile
	both modified:   .github/workflows/ci.yml
	deleted by them: .github/workflows/docker.yml
	both modified:   .vscode/c_cpp_properties.json
	both modified:   .vscode/settings.json
	both modified:   thruster_allocation_matrix_controller/include/thruster_allocation_matrix_controller/thruster_allocation_matrix_controller.hpp
	both modified:   thruster_allocation_matrix_controller/src/thruster_allocation_matrix_controller.cpp
	both modified:   thruster_controllers/include/thruster_controllers/polynomial_thrust_curve_controller.hpp
	both modified:   thruster_controllers/src/polynomial_thrust_curve_controller.cpp
	both modified:   velocity_controllers/include/velocity_controllers/integral_sliding_mode_controller.hpp
	both modified:   velocity_controllers/src/integral_sliding_mode_controller.cpp

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@mergify mergify bot added the conflicts label Sep 23, 2024
@evan-palmer evan-palmer deleted the mergify/bp/humble/pr-41 branch September 23, 2024 23:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant