search

micro-ROS / micro_ros_zephyr_module

micro-ROS Zephyr module and sample code
Apache License 2.0
46 stars 22 forks source link

Fix of unknown Ringbuffer and not found USB-Serial Device (backport #125) #129

Closed mergify[bot] closed 8 months ago

mergify[bot] commented 8 months ago

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

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

You are currently cherry-picking commit 7c5edcd.
  (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:
    new file:   app.overlay
    modified:   modules/libmicroros/Kconfig

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

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