Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

rp2/CMakeLists.txt: Check required submodules. #8855

Closed
wants to merge 3 commits into from

Conversation

jimmo
Copy link
Member

@jimmo jimmo commented Jul 4, 2022

See https://forum.micropython.org/viewtopic.php?f=3&t=12633

This makes the cmake generation fail if the required submodules (cyw43 and nimble) are not initialised, and also makes make BOARD=... submodules find them.

I also found that the cmake output wasn't regenerated after failing, because CMakeCache.txt was present even after failure. So this PR also makes the cmake regeneration conditional on the generated Makefile instead.

jimmo added 3 commits July 4, 2022 11:14
`CMakeCache.txt` can exist even if cmake failed. Use `Makefile` instead.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
Ensure that nimble and cyw43-driver are initialised when the board
requires it. Also make these work with `make submodules`.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
This supresses a warning from pico-sdk when the board isn't using this
driver.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
@jimmo
Copy link
Member Author

jimmo commented Jul 4, 2022

Also don't override PICO_CYW43_DRIVER_PATH unless the board needs it (to avoid a spurious warning from pico-sdk).

@dpgeorge
Copy link
Member

dpgeorge commented Jul 5, 2022

Thanks, looks good. Rebased and merged in 651b370 through 11ef618

@dpgeorge dpgeorge closed this Jul 5, 2022
@@ -59,6 +62,9 @@ include(${PICO_SDK_PATH}/pico_sdk_init.cmake)
# Define the top-level project
project(${MICROPY_TARGET})

if(MICROPY_BLUETOOTH_NIMBLE)
endif()
Copy link
Member

Choose a reason for hiding this comment

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

I think this was added in error, so I removed it during rebase.

RetiredWizard pushed a commit to RetiredWizard/micropython that referenced this pull request Mar 27, 2024
…-debouncing

Add state integration based debouncing to the `keypad` module
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants