Skip to content

Add embeddedRTPS as experimental middleware (backport #95)#97

Merged
pablogs9 merged 3 commits intomainfrom
mergify/bp/main/pr-95
Oct 18, 2021
Merged

Add embeddedRTPS as experimental middleware (backport #95)#97
pablogs9 merged 3 commits intomainfrom
mergify/bp/main/pr-95

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify Bot commented Oct 15, 2021

This is an automatic backport of pull request #95 done by Mergify.
Cherry-pick of 2179f0b has failed:

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

You are currently cherry-picking commit 2179f0b.
  (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:   .github/workflows/ci.yml
	modified:   .github/workflows/nightly.yml
	modified:   CMakeLists.txt
	modified:   Kconfig.projbuild
	modified:   README.md
	modified:   colcon.meta
	modified:   esp32_toolchain.cmake.in
	new file:   examples/addtwoints_server/.gitignore
	new file:   examples/addtwoints_server/CMakeLists.txt
	new file:   examples/addtwoints_server/main/CMakeLists.txt
	new file:   examples/addtwoints_server/main/Kconfig.projbuild
	new file:   examples/addtwoints_server/main/component.mk
	new file:   examples/addtwoints_server/main/main.c
	new file:   examples/addtwoints_server/sdkconfig.defaults
	modified:   examples/handle_static_types/main/main.c
	modified:   examples/int32_publisher/main/main.c
	modified:   examples/int32_publisher_custom_transport/main/main.c
	modified:   examples/int32_publisher_custom_transport/sdkconfig.defaults
	new file:   examples/int32_publisher_embeddedrtps/.gitignore
	new file:   examples/int32_publisher_embeddedrtps/CMakeLists.txt
	new file:   examples/int32_publisher_embeddedrtps/main/CMakeLists.txt
	new file:   examples/int32_publisher_embeddedrtps/main/Kconfig.projbuild
	new file:   examples/int32_publisher_embeddedrtps/main/component.mk
	new file:   examples/int32_publisher_embeddedrtps/main/main.c
	new file:   examples/int32_publisher_embeddedrtps/sdkconfig.defaults
	modified:   examples/int32_sub_pub/main/main.c
	modified:   examples/low_consumption/main/main.c
	modified:   examples/multithread_publisher/main/main.c
	modified:   examples/ping_pong/main/main.c
	modified:   network_interfaces/uros_ethernet_netif.c
	modified:   network_interfaces/uros_wlan_netif.c

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

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.

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 <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.io/

* Add embeddedRTPS as experimental middleware

* Set default middleware

* Update examples

* Update toolchain

* Fix uart config

* Update toolchain

* Update CI

* Update

* Fix

* Update samples

* Update

* Add rmw_rtps options to .meta

* Update colcon.meta and add service msg repo

* Add service example

Co-authored-by: Antonio cuadros <acuadros1995@gmail.com>
(cherry picked from commit 2179f0b)

# Conflicts:
#	libmicroros.mk
@pablogs9 pablogs9 merged commit 26e8456 into main Oct 18, 2021
@pablogs9 pablogs9 deleted the mergify/bp/main/pr-95 branch October 18, 2021 07:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant