search

linorobot / linorobot2

Autonomous mobile robots (2WD, 4WD, Mecanum Drive)
Apache License 2.0
436 stars 148 forks source link

Add OAK-D Camera Support (backport #80) #83

Closed mergify[bot] closed 9 months ago

mergify[bot] commented 9 months ago

This is an automatic backport of pull request #80 done by Mergify. Cherry-pick of e15228397c383697500ffdd9724848f964034cf9 has failed:

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

You are currently cherry-picking commit e152283.
  (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:   linorobot2_bringup/launch/depth.launch.py

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

Cherry-pick of 6602a7ad3d2221a5c206a6e84106d49f8b6fe835 has failed:

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

You are currently cherry-picking commit 6602a7a.
  (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:   linorobot2_bringup/launch/depth.launch.py

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

Cherry-pick of 1437ebe3993b44bfc16ffe9a3c1c9d6d9dba0444 has failed:

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

You are currently cherry-picking commit 1437ebe.
  (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:   linorobot2_navigation/config/navigation.yaml

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

Cherry-pick of e6bed8cec50f8331c145b907a1daa1b1e75db474 has failed:

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

You are currently cherry-picking commit e6bed8c.
  (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:   linorobot2_navigation/config/navigation.yaml

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

Cherry-pick of c54880d85cfa35c4572b01fc2efcb3efc1ab24cb has failed:

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

You are currently cherry-picking commit c54880d.
  (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 a4705397f55a586cd4afebc6476b20f877d604f1 has failed:

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

You are currently cherry-picking commit a470539.
  (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:   linorobot2_bringup/launch/depth.launch.py

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

Cherry-pick of c4b9e26271dc8f982f4402ba841839e841c1ea8f has failed:

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

You are currently cherry-picking commit c4b9e26.
  (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 f4389f23972ccbe3574bbc8a5ebe0dcb95547cdf has failed:

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

You are currently cherry-picking commit f4389f2.
  (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 7189ad5b7d6e1e2c48edeb0f29ebc904264b4411 has failed:

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

You are currently cherry-picking commit 7189ad5.
  (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:   linorobot2_navigation/config/navigation.yaml

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

Cherry-pick of 0b263f04fa5be9927ab1ff4ae1b3d699f6649360 has failed:

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

You are currently cherry-picking commit 0b263f0.
  (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:   linorobot2_bringup/launch/depth.launch.py

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/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