Skip to content

Wio Terminal Support (backport #1284) #1288

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

Merged
merged 1 commit into from
Feb 6, 2023
Merged

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Feb 6, 2023

This is an automatic backport of pull request #1284 done by Mergify.
Cherry-pick of 8bf2f20 has failed:

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

You are currently cherry-picking commit 8bf2f20.
  (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:   README.md
	modified:   examples/micro-ros_publisher_wifi/micro-ros_publisher_wifi.ino
	modified:   src/micro_ros_arduino.h
	modified:   src/wifi_transport.cpp

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

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.com

@mergify mergify bot added the conflicts label Feb 6, 2023
@mergify mergify bot mentioned this pull request Feb 6, 2023
* Include appropriate headers when target is Wio Terminal.

Signed-off-by: maehara-keisuke <[email protected]>

* Enable to compile publisher_wifi example when target is Wio Terminal.

Signed-off-by: maehara-keisuke <[email protected]>

* Follow CI.

Signed-off-by: maehara-keisuke <[email protected]>

* Add Wio Terminal to Community contributed board list.

Signed-off-by: maehara-keisuke <[email protected]>

---------

Signed-off-by: maehara-keisuke <[email protected]>
(cherry picked from commit 8bf2f20)

# Conflicts:
#	.github/workflows/ci.yml
@pablogs9 pablogs9 force-pushed the mergify/bp/humble/pr-1284 branch from 3fa65b1 to 0308eaa Compare February 6, 2023 07:19
@Acuadros95 Acuadros95 merged commit 1f0a8b7 into humble Feb 6, 2023
@Acuadros95 Acuadros95 deleted the mergify/bp/humble/pr-1284 branch February 6, 2023 08:03
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.

2 participants