Skip to content

Implemented initial version of DVL API (backport #1) #2

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

Closed
wants to merge 37 commits into from

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Sep 9, 2024

Changes Made

This PR introduces the v0.0.1 implementation of the Water Linked DVL API, including the libwaterlinked library and the waterlinked_dvl_driver package.

Testing

Unit tests were implemented and hardware testing was performed using a DVL-A50.


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

(cherry picked from commit 2141b28)

# Conflicts:
#	.vscode/c_cpp_properties.json
(cherry picked from commit db1fbdb)

# Conflicts:
#	.docker/Dockerfile
#	.github/workflows/docker.yml
(cherry picked from commit 7327cf7)
(cherry picked from commit 2dfdec2)

# Conflicts:
#	.vscode/c_cpp_properties.json
(cherry picked from commit 13a6fa1)

# Conflicts:
#	example_pkg/package.xml
(cherry picked from commit cc84fbc)

# Conflicts:
#	.devcontainer/nouveau/Dockerfile
#	.devcontainer/nouveau/devcontainer.json
#	.devcontainer/nvidia/Dockerfile
#	.devcontainer/nvidia/devcontainer.json
#	.docker/Dockerfile
#	.github/workflows/ci.yml
#	.github/workflows/docker.yml
#	.vscode/settings.json
#	README.md
(cherry picked from commit 6fcd518)
(cherry picked from commit 779d126)
(cherry picked from commit e633970)
(cherry picked from commit 2d5736b)

# Conflicts:
#	README.md
(cherry picked from commit 42bd6a0)
(cherry picked from commit 8823870)
(cherry picked from commit 05df972)
(cherry picked from commit acebd1e)

# Conflicts:
#	.vscode/c_cpp_properties.json
(cherry picked from commit b4ac968)

# Conflicts:
#	.devcontainer/nouveau/Dockerfile
#	.devcontainer/nouveau/devcontainer.json
#	.devcontainer/nvidia/Dockerfile
#	.devcontainer/nvidia/devcontainer.json
#	.docker/Dockerfile
#	.github/workflows/ci.yml
#	.github/workflows/docker.yml
#	.vscode/settings.json
#	README.md
(cherry picked from commit 1d8bc3c)
(cherry picked from commit 7ce605e)
(cherry picked from commit f765049)
(cherry picked from commit b9461b6)
(cherry picked from commit bea8201)
(cherry picked from commit 8cedc34)

# Conflicts:
#	.github/workflows/ci.yml
(cherry picked from commit a70ec26)
(cherry picked from commit d71daa4)
(cherry picked from commit 86340ac)
(cherry picked from commit 8b91c5c)
(cherry picked from commit eef43e4)
(cherry picked from commit c19e114)
@mergify mergify bot added the conflicts label Sep 9, 2024
Copy link
Author

mergify bot commented Sep 9, 2024

Cherry-pick of 2141b28 has failed:

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

You are currently cherry-picking commit 2141b28.
  (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:   .codespellrc
	modified:   .vscode/settings.json
	new file:   libdvla50/CMakeLists.txt
	new file:   libdvla50/LICENSE
	new file:   libdvla50/include/libdvla50/reports.hpp
	new file:   libdvla50/src/reports.cpp
	modified:   ros2.repos

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   .vscode/c_cpp_properties.json

Cherry-pick of db1fbdb has failed:

On branch mergify/bp/jazzy/pr-1
Your branch is ahead of 'origin/jazzy' by 1 commit.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit db1fbdb.
  (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)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   .docker/Dockerfile
	both modified:   .github/workflows/docker.yml

no changes added to commit (use "git add" and/or "git commit -a")

Cherry-pick of 2dfdec2 has failed:

On branch mergify/bp/jazzy/pr-1
Your branch is ahead of 'origin/jazzy' by 3 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 2dfdec2.
  (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:   .vscode/settings.json
	modified:   libdvla50/CMakeLists.txt
	renamed:    libdvla50/src/reports.cpp -> libdvla50/include/libdvla50/dvl.hpp
	renamed:    libdvla50/include/libdvla50/reports.hpp -> libdvla50/include/libdvla50/protocol.hpp
	new file:   libdvla50/package.xml
	new file:   libdvla50/src/dvl.cpp

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   .vscode/c_cpp_properties.json

Cherry-pick of 13a6fa1 has failed:

On branch mergify/bp/jazzy/pr-1
Your branch is ahead of 'origin/jazzy' by 5 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 13a6fa1.
  (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-tidy
	deleted:    example_pkg/CMakeLists.txt
	deleted:    example_pkg/LICENSE
	modified:   libdvla50/include/libdvla50/dvl.hpp
	modified:   libdvla50/include/libdvla50/protocol.hpp
	modified:   libdvla50/src/dvl.cpp
	new file:   libdvla50/src/protocol.cpp

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by them: example_pkg/package.xml

Cherry-pick of cc84fbc has failed:

On branch mergify/bp/jazzy/pr-1
Your branch is ahead of 'origin/jazzy' by 6 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit cc84fbc.
  (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:
	renamed:    libdvla50/CMakeLists.txt -> libwaterlinked/CMakeLists.txt
	renamed:    libdvla50/LICENSE -> libwaterlinked/LICENSE
	renamed:    libdvla50/include/libdvla50/dvl.hpp -> libwaterlinked/include/libwaterlinked/client.hpp
	renamed:    libdvla50/include/libdvla50/protocol.hpp -> libwaterlinked/include/libwaterlinked/protocol.hpp
	renamed:    libdvla50/package.xml -> libwaterlinked/package.xml
	renamed:    libdvla50/src/dvl.cpp -> libwaterlinked/src/client.cpp
	renamed:    libdvla50/src/protocol.cpp -> libwaterlinked/src/protocol.cpp

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   .devcontainer/nouveau/Dockerfile
	both modified:   .devcontainer/nouveau/devcontainer.json
	both modified:   .devcontainer/nvidia/Dockerfile
	both modified:   .devcontainer/nvidia/devcontainer.json
	both modified:   .docker/Dockerfile
	both modified:   .github/workflows/ci.yml
	both modified:   .github/workflows/docker.yml
	both modified:   .vscode/settings.json
	both modified:   README.md

Cherry-pick of 2d5736b has failed:

On branch mergify/bp/jazzy/pr-1
Your branch is ahead of 'origin/jazzy' by 11 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 2d5736b.
  (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)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   README.md

no changes added to commit (use "git add" and/or "git commit -a")

Cherry-pick of acebd1e has failed:

On branch mergify/bp/jazzy/pr-1
Your branch is ahead of 'origin/jazzy' by 18 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit acebd1e.
  (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:   .gitignore
	modified:   .pre-commit-config.yaml
	modified:   libwaterlinked/src/client.cpp
	modified:   waterlinked_driver/CMakeLists.txt
	modified:   waterlinked_driver/config/dvl.yaml
	modified:   waterlinked_driver/launch/dvl.launch.py

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   .vscode/c_cpp_properties.json

Cherry-pick of b4ac968 has failed:

On branch mergify/bp/jazzy/pr-1
Your branch is ahead of 'origin/jazzy' by 19 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit b4ac968.
  (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:   .dockerignore
	modified:   libwaterlinked/examples/send_command.cpp
	modified:   libwaterlinked/examples/subscribe_to_reports.cpp
	modified:   libwaterlinked/include/libwaterlinked/client.hpp
	modified:   libwaterlinked/src/client.cpp
	deleted:    waterlinked_driver/CMakeLists.txt
	new file:   waterlinked_dvl_driver/CMakeLists.txt
	renamed:    waterlinked_driver/LICENSE -> waterlinked_dvl_driver/LICENSE
	renamed:    waterlinked_driver/config/dvl.yaml -> waterlinked_dvl_driver/config/dvl.yaml
	renamed:    waterlinked_driver/launch/dvl.launch.py -> waterlinked_dvl_driver/launch/dvl.launch.py
	renamed:    waterlinked_driver/package.xml -> waterlinked_dvl_driver/package.xml
	renamed:    waterlinked_driver/src/waterlinked_driver.cpp -> waterlinked_dvl_driver/src/waterlinked_dvl_driver.cpp
	renamed:    waterlinked_driver/src/waterlinked_driver.hpp -> waterlinked_dvl_driver/src/waterlinked_dvl_driver.hpp
	renamed:    waterlinked_driver/src/waterlinked_driver_parameters.yaml -> waterlinked_dvl_driver/src/waterlinked_dvl_driver_parameters.yaml

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   .devcontainer/nouveau/Dockerfile
	both modified:   .devcontainer/nouveau/devcontainer.json
	both modified:   .devcontainer/nvidia/Dockerfile
	both modified:   .devcontainer/nvidia/devcontainer.json
	both modified:   .docker/Dockerfile
	both modified:   .github/workflows/ci.yml
	both modified:   .github/workflows/docker.yml
	both modified:   .vscode/settings.json
	both modified:   README.md

Cherry-pick of 8cedc34 has failed:

On branch mergify/bp/jazzy/pr-1
Your branch is ahead of 'origin/jazzy' by 25 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 8cedc34.
  (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)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   .github/workflows/ci.yml

no changes added to commit (use "git add" and/or "git commit -a")

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

@evan-palmer evan-palmer deleted the branch jazzy September 17, 2024 22:19
@mergify mergify bot deleted the mergify/bp/jazzy/pr-1 branch September 17, 2024 22:20
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