Skip to content

Add Support for ESP-IDF v5.5 (backport #325)#345

Merged
Amronos merged 4 commits into
jazzyfrom
mergify/bp/jazzy/pr-325
May 27, 2026
Merged

Add Support for ESP-IDF v5.5 (backport #325)#345
Amronos merged 4 commits into
jazzyfrom
mergify/bp/jazzy/pr-325

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify Bot commented May 27, 2026

The changes were mostly taken from #319 / #322, but ported to rolling. I will add support for ESP32-P4 in a separate PR.


This is part 4 of 4 in a stack made with GitButler:

Changes specific to this PR: e747951


This is an automatic backport of pull request #325 done by [Mergify](https://mergify.com).

Co-authored-by: @YanKE01

Co-authored-by: Narukara <narukara17@gmail.com>
(cherry picked from commit 56d5afc)

# Conflicts:
#	.github/workflows/ci.yml
#	README.md
@mergify mergify Bot added the conflicts label May 27, 2026
@mergify
Copy link
Copy Markdown
Contributor Author

mergify Bot commented May 27, 2026

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

@Amronos Amronos merged commit fb7112d into jazzy May 27, 2026
0 of 25 checks passed
@Amronos Amronos deleted the mergify/bp/jazzy/pr-325 branch May 27, 2026 14:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant