Skip to content

Support esp-idf v6.0 (backport #334)#366

Merged
EugenioCollado merged 1 commit into
humblefrom
mergify/bp/humble/pr-334
Jul 14, 2026
Merged

Support esp-idf v6.0 (backport #334)#366
EugenioCollado merged 1 commit into
humblefrom
mergify/bp/humble/pr-334

Conversation

@mergify

@mergify mergify Bot commented Jul 13, 2026

Copy link
Copy Markdown
Contributor

Added support for ESP-IDF v6.0.

Handled the new default libc (Picolibc). There may be a cleaner approach for handling the CMake-related changes, though.

Also made several version-specific compatibility adjustments and updated the CI configuration.


This is an automatic backport of pull request #334 done by Mergify.

@mergify mergify Bot added the conflicts label Jul 13, 2026
@mergify

mergify Bot commented Jul 13, 2026

Copy link
Copy Markdown
Contributor Author

Cherry-pick of 04f3cca has failed:

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

You are currently cherry-picking commit 04f3cca.
  (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:   esp32_toolchain.cmake.in
	modified:   examples/int32_publisher_custom_transport_usbcdc/components/esp_usbcdc_logging/idf_component.yml
	modified:   examples/int32_publisher_custom_transport_usbcdc/components/esp_usbcdc_transport/idf_component.yml
	modified:   network_interfaces/uros_wlan_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

@mergify

mergify Bot commented Jul 13, 2026

Copy link
Copy Markdown
Contributor Author

Tick the box to add this pull request to the merge queue (same as @mergifyio queue).

  • Queue this pull request

(cherry picked from commit 04f3cca)
@Narukara Narukara force-pushed the mergify/bp/humble/pr-334 branch from 6d28727 to 80a27df Compare July 14, 2026 04:09

@EugenioCollado EugenioCollado left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@EugenioCollado EugenioCollado merged commit 6e33f19 into humble Jul 14, 2026
31 checks passed
@EugenioCollado EugenioCollado deleted the mergify/bp/humble/pr-334 branch July 14, 2026 05:51
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