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

Update btstack v1.6.1 #1736

Merged
merged 2 commits into from
Jun 21, 2024

Conversation

peterharperuk
Copy link
Contributor

No description provided.

@peterharperuk peterharperuk requested a review from kilograham June 19, 2024 16:15
@peterharperuk
Copy link
Contributor Author

fyi @mringwal This seems to work for develop as well

@kilograham kilograham added this to the 1.6.0 milestone Jun 21, 2024
@@ -3,6 +3,10 @@ if (DEFINED ENV{PICO_BTSTACK_PATH} AND (NOT PICO_BTSTACK_PATH))
message("Using PICO_BTSTACK_PATH from environment ('${PICO_BTSTACK_PATH}')")
endif ()

if (NOT PICO_BTSTACK_VERSION)
Copy link
Contributor

Choose a reason for hiding this comment

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

How is the user supposed to use this; I assume they are supposed to set it if they are using a different version of btstack? It needs have PICO_CMAKE_CONFIG in that case, however it feels a bit odd that we expect them to set it, if it doesn't actual cause anything to happen e.g. choosing a version (if we just care about what version we have, can we determine it?)

Copy link
Contributor Author

@peterharperuk peterharperuk Jun 21, 2024

Choose a reason for hiding this comment

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

Yes, they'd define this if they want to use this cmake file to build an older version of btstack than the version in the sdk.

it feels a bit odd that we expect them to set it, if it doesn't actual cause anything to happen

Sorry, I don't follow this comment. It would cause the build to not fail.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

can we determine it?

Yes, maybe that's better. We can infer it's an older version by seeing if the file is there. I'll try that out.

Copy link
Contributor

Choose a reason for hiding this comment

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

Ideally, all information about BTstack could/should be contained in the BTstack repo and Pico SDK would only refer to it. I'm not too familiar with your build system, but you may make some suggestions on how this could look like. E.g. we could stash Pico related files under port/pico-sdk, or just have CMakeLists.txt files that contains source files and include paths.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I've pushed a version that just checks if the file exists.

Ideally, all information about BTstack could/should be contained in the BTstack repo

The ideal is to just include a file in the btstack repo. But arguably, it's too late now?

Copy link
Contributor

Choose a reason for hiding this comment

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

It's never too late :) but the support for the initial version probably must stay. If this single file would exist, I could create a branch of v1.6.1 plus that file and you could already use it.

We've started using CMake, but not consistently. A colleague did a rewrite of the build files for the desktop targets, but I'm somehow not happy with it without a clear argument against it.

@peterharperuk peterharperuk force-pushed the update_btstack_v1.6.1 branch from 6c98262 to a2dd851 Compare June 21, 2024 17:49
@kilograham kilograham merged commit a567349 into raspberrypi:develop Jun 21, 2024
1 check passed
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.

3 participants