Closed mergify[bot] closed 3 days ago
Cherry-pick of e347a4a821ccbfaa452f595a4304afd6864aedb7 has failed:
On branch mergify/bp/rolling/pr-1712
Your branch is up to date with 'origin/rolling'.
You are currently cherry-picking commit e347a4a.
(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: library.properties
modified: src/default_transport.cpp
Unmerged paths:
(use "git add/rm <file>..." as appropriate to mark resolution)
both modified: .github/workflows/ci.yml
both modified: README.md
both modified: examples/micro-ros_publisher_wifi/micro-ros_publisher_wifi.ino
deleted by us: examples/micro-ros_publisher_wifi_at/micro-ros_publisher_wifi_at.ino
both modified: src/micro_ros_arduino.h
both modified: src/wifi_transport.cpp
To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally
By importing
time.h
instead ofsys/time.h
you can build micro-ros for Arduino UNO R4.It addresses issue: https://github.com/micro-ROS/micro_ros_arduino/issues/1461
This PR was tested on following targets:
mbed
(Arduino GIGA R1)m4
(Arduino UNO R4 Minima)stm32
(STMicroelectronics Nucleo F401RE)This is an automatic backport of pull request #1712 done by Mergify.