Skip to content

Fix uses of PICO_RP2040 and PICO_RP2350 - #11014

Merged
tannewt merged 2 commits into
adafruit:mainfrom
dhalbert:fix-defines
May 19, 2026
Merged

Fix uses of PICO_RP2040 and PICO_RP2350#11014
tannewt merged 2 commits into
adafruit:mainfrom
dhalbert:fix-defines

Conversation

@dhalbert

Copy link
Copy Markdown
Collaborator

Code taken from https://github.com/eightycc/circuitpython/tree/fix-defines.

  • Define PICO_RP2040 and PICO_RP2350 properly for all builds, as 0 or 1.
  • Use #if instead of the incorrect #ifdef for these cpp macros.
  • Use a fork of Pico-PIO-USB that also corrects the use of the macro.

@dhalbert dhalbert changed the title Fix defines Fix uses of PICO_RP2040 and PICO_RP2350 May 19, 2026

@tannewt tannewt left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Let's try to upstream these changes for PIO USB too.

@tannewt
tannewt merged commit 53b191a into adafruit:main May 19, 2026
668 checks passed
@dhalbert
dhalbert deleted the fix-defines branch May 19, 2026 16:31
@dhalbert

dhalbert commented May 19, 2026

Copy link
Copy Markdown
Collaborator Author

Let's try to upstream these changes for PIO USB too.

I made an identical PR to https://github.com/sekigon-gonnoc/Pico-PIO-USB.git and Thach merged it already. I didn't realize he had commit privs on that repo. I'll change the .gitmodules back..

EDIT: I was wrong. Thach review it and sekigon-gonnoc merged it.

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.

CP build fails when including Pico SDK XIP cache maintenance header

2 participants