Add Support for ESP-IDF v5.5 #325
+16
−15
Merged
Mergify / Rule: Backport to jazzy at the reviewer's discretion (backport)
succeeded
May 27, 2026 in 0s
Backports have been created
- #345 Add Support for ESP-IDF v5.5 (backport #325) has been created for branch
jazzybut encountered conflicts
Cherry-pick of 56d5afc has failed:
On branch mergify/bp/jazzy/pr-325
Your branch is up to date with 'origin/jazzy'.
You are currently cherry-picking commit 56d5afc.
(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: CMakeLists.txt
modified: libmicroros.mk
modified: network_interfaces/uros_ethernet_netif.c
Unmerged paths:
(use "git add <file>..." to mark resolution)
both modified: .github/workflows/ci.yml
both modified: README.md
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
Loading