Skip to content

fix(esp32): repair C2/H2 SDK Bluetooth header layout - #1651

Merged
zackees merged 1 commit into
mainfrom
fix/4687-bt-header-layout
Oct 4, 2026
Merged

zackees merged 1 commit into
mainfrom
fix/4687-bt-header-layout

Conversation

@zackees

@zackees zackees commented Oct 4, 2026 •

Copy link
Copy Markdown
Member

Fixes FastLED/FastLED#4687. The packaged ESP32-C2 and ESP32-H2 Bluetooth headers use relative includes that expect a controller directory outside bt/. Copy the packaged configuration headers to those expected paths during SDK provisioning, including cached complete SDKs. Also drop -fuse-cxa-atexit for these MCUs so the GCC 14 SDK links without __dso_handle. Focused tests were RED before each fix and GREEN afterward. Local ESP32-C2 and ESP32-H2 Blink builds, Rust tests, formatting, Clippy, and the source-bound local CI gate pass. Bumps fbuild to 2.5.37.

Summary by CodeRabbit

  • Bug Fixes
    • Improved ESP32-C2 and ESP32-H2 compatibility with newer GCC toolchains.
    • Fixed Bluetooth controller header availability for ESP32-C2 and ESP32-H2 SDK installations, including when the SDK is reused or extracted in different layouts.

Local-Gate: v1 tree=76663fdd3fb81451114e20768085ec927a3be4f8 secs=964 lanes=linux-minimal:run,dylint:run
Ci-Attestation: {"at":1791135533,"gate":"general/all/ubuntu-ci-guards","host":"linux-x86_64","key":"8ccf73132aaa8ea5abf26f179435ebb9df5817b411f9c924869ad89d77958084","lane":"linux-minimal","parents":["6fbc0f9c586eba8687f228571dacb406e691568c"],"secs":560,"stamp":"b9f46335856c654087e744882f987d41","tree":"76663fdd3fb81451114e20768085ec927a3be4f8","v":1,"via":"run"}
Ci-Attestation: {"at":1791135533,"gate":"rust/x86_64-unknown-linux-gnu/workspace-clippy","host":"linux-x86_64","key":"8ccf73132aaa8ea5abf26f179435ebb9df5817b411f9c924869ad89d77958084","lane":"linux-minimal","parents":["6fbc0f9c586eba8687f228571dacb406e691568c"],"secs":560,"stamp":"776a2859430a5a0c1913f6f887645437","tree":"76663fdd3fb81451114e20768085ec927a3be4f8","v":1,"via":"run"}
Ci-Attestation: {"at":1791135533,"gate":"rust/x86_64-unknown-linux-gnu/workspace-test","host":"linux-x86_64","key":"8ccf73132aaa8ea5abf26f179435ebb9df5817b411f9c924869ad89d77958084","lane":"linux-minimal","parents":["6fbc0f9c586eba8687f228571dacb406e691568c"],"secs":560,"stamp":"f8180bf6b2725afa85445cec0c8cf141","tree":"76663fdd3fb81451114e20768085ec927a3be4f8","v":1,"via":"run"}
Ci-Attestation: {"at":1791135533,"gate":"rust/x86_64-unknown-linux-gnu/python-facade-test","host":"linux-x86_64","key":"8ccf73132aaa8ea5abf26f179435ebb9df5817b411f9c924869ad89d77958084","lane":"linux-minimal","parents":["6fbc0f9c586eba8687f228571dacb406e691568c"],"secs":560,"stamp":"c0bed663eefd4de1963e81547d1b14ae","tree":"76663fdd3fb81451114e20768085ec927a3be4f8","v":1,"via":"run"}
Ci-Attestation: {"at":1791135533,"gate":"general/all/dylint-policy","host":"linux-x86_64","key":"c8276689f6e05ead7a0ed3179129a822d8309e85c314bdfca864ec186968a57c","lane":"dylint","parents":["6fbc0f9c586eba8687f228571dacb406e691568c"],"secs":403,"stamp":"609dd2a21dad4b407650194ea758895f","tree":"76663fdd3fb81451114e20768085ec927a3be4f8","v":1,"via":"run"}
Ci-Attestation: {"at":1791135533,"gate":"rust/x86_64-unknown-linux-gnu/dylint-library-check","host":"linux-x86_64","key":"c8276689f6e05ead7a0ed3179129a822d8309e85c314bdfca864ec186968a57c","lane":"dylint","parents":["6fbc0f9c586eba8687f228571dacb406e691568c"],"secs":403,"stamp":"6585ebb0558e16802adc3bf8b18f1a0b","tree":"76663fdd3fb81451114e20768085ec927a3be4f8","v":1,"via":"run"}
Ci-Attestation: {"at":1791135533,"gate":"rust/x86_64-unknown-linux-gnu/workspace-dylint","host":"linux-x86_64","key":"c8276689f6e05ead7a0ed3179129a822d8309e85c314bdfca864ec186968a57c","lane":"dylint","parents":["6fbc0f9c586eba8687f228571dacb406e691568c"],"secs":403,"stamp":"29a0a94b9f81872039933a23d147b6d0","tree":"76663fdd3fb81451114e20768085ec927a3be4f8","v":1,"via":"run"}
@coderabbitai

coderabbitai Bot commented Oct 4, 2026

Copy link
Copy Markdown

Review in Change Stack →

Navigate logical layers of code changes, visualize relationships, and explore their blast radius.

Note

Currently processing new changes in this PR. This may take a few minutes, please wait...

⚙️ Run configuration
  • Configuration used: Repository: FastLED/fbuild/.coderabbit.yaml
  • Review profile: CHILL
  • Plan: Advanced
  • Run ID: e8cdc1a5-9b44-47e8-886d-bdbc5189b95f
📥 Commits

Reviewing files that changed from the base of the PR and between 6fbc0f9 and 80edd38.

⛔ Files ignored due to path filters (1)
  • Cargo.lock is excluded by !**/*.lock
📒 Files selected for processing (4)
  • Cargo.toml
  • crates/fbuild-build-esp/src/esp32/fixups.rs
  • crates/fbuild-library/src/library/esp32_framework/libs.rs
  • pyproject.toml
 _____________________________________
< CORS error? I'll cross that bridge. >
 -------------------------------------
  \
   \   (\__/)
       (•ㅅ•)
       /   づ
✨ Finishing Touches
📝 Generate docstrings
  • Commit to this branch
  • Create a new PR
🧪 Generate unit tests (beta)
  • Commit to this branch
  • Create a new PR
  • Autopilot · Keep fixing CodeRabbit findings and required CI, and resolving merge conflicts

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands.

@zackees
zackees merged commit a03aaa5 into main Oct 4, 2026
31 of 32 checks passed
@zackees
zackees deleted the fix/4687-bt-header-layout branch October 4, 2026 17:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

Status: Triage

Development

Successfully merging this pull request may close these issues.

Release blocker: fix ESP32-C2/H2 SDK header paths

1 participant