search

fictionlab / ros_aruco_opencv

ROS wrapper for ArUco Opencv module
MIT License
16 stars 16 forks source link

Add board detection (ROS2) (backport #16) #17

Closed mergify[bot] closed 1 year ago

mergify[bot] commented 1 year ago

This is an automatic backport of pull request #16 done by Mergify. Cherry-pick of 7ed77e7e89b4d51662e16915f42e1cb3d5265a73 has failed:

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

You are currently cherry-picking commit 7ed77e7.
  (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:    aruco_opencv/config/single_marker_tracker.yaml -> aruco_opencv/config/aruco_tracker.yaml
    new file:   aruco_opencv/config/board_descriptions.yaml
    new file:   aruco_opencv/launch/aruco_tracker.launch.xml
    deleted:    aruco_opencv/launch/single_marker_tracker.launch.xml
    modified:   aruco_opencv/package.xml
    deleted:    aruco_opencv/src/single_marker_tracker.cpp
    modified:   aruco_opencv_msgs/CMakeLists.txt
    renamed:    aruco_opencv_msgs/msg/MarkerDetection.msg -> aruco_opencv_msgs/msg/ArucoDetection.msg
    new file:   aruco_opencv_msgs/msg/BoardPose.msg

Unmerged paths:
  (use "git add <file>..." to mark resolution)
    both modified:   aruco_opencv/CMakeLists.txt
    both modified:   aruco_opencv/src/aruco_tracker.cpp

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

Mergify commands and options
More conditions and actions can be found in the [documentation](https://docs.mergify.com/). You can also trigger Mergify actions by commenting on this pull request: - `@Mergifyio refresh` will re-evaluate the rules - `@Mergifyio rebase` will rebase this PR on its base branch - `@Mergifyio update` will merge the base branch into this PR - `@Mergifyio backport ` will backport this PR on `` branch Additionally, on Mergify [dashboard](https://dashboard.mergify.com/) you can: - look at your merge queues - generate the Mergify configuration with the config editor. Finally, you can contact us on https://mergify.com