diff --git a/MODULE.bazel b/MODULE.bazel index 79419199a..9e2bb30f7 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -98,7 +98,7 @@ new_git_repository( new_git_repository( name = "btstack", build_file = "//src/rp2_common/pico_btstack:btstack.BUILD", - commit = "2b49e57bd1fae85ac32ac1f41cdb7c794de335f6", # keep-in-sync-with-submodule: lib/btstack + commit = "501e6d2b86e6c92bfb9c390bcf55709938e25ac1", # keep-in-sync-with-submodule: lib/btstack remote = "https://github.com/bluekitchen/btstack.git", ) diff --git a/lib/btstack b/lib/btstack index 2b49e57bd..501e6d2b8 160000 --- a/lib/btstack +++ b/lib/btstack @@ -1 +1 @@ -Subproject commit 2b49e57bd1fae85ac32ac1f41cdb7c794de335f6 +Subproject commit 501e6d2b86e6c92bfb9c390bcf55709938e25ac1 diff --git a/src/rp2_common/pico_btstack/CMakeLists.txt b/src/rp2_common/pico_btstack/CMakeLists.txt index c622cacf5..010cc9e39 100644 --- a/src/rp2_common/pico_btstack/CMakeLists.txt +++ b/src/rp2_common/pico_btstack/CMakeLists.txt @@ -107,6 +107,13 @@ if (EXISTS ${PICO_BTSTACK_PATH}/${BTSTACK_TEST_PATH}) ENABLE_BLE=1 ) + # Added in v1.6.2 + if (EXISTS ${PICO_BTSTACK_PATH}/src/hci_event_builder.c) + target_sources(pico_btstack_ble INTERFACE + ${PICO_BTSTACK_PATH}/src/hci_event_builder.c + ) + endif() + pico_add_library(pico_btstack_classic) target_sources(pico_btstack_classic INTERFACE ${PICO_BTSTACK_PATH}/src/classic/a2dp.c @@ -161,6 +168,13 @@ if (EXISTS ${PICO_BTSTACK_PATH}/${BTSTACK_TEST_PATH}) ENABLE_CLASSIC=1 ) + # Added in v1.6.2 + if (EXISTS ${PICO_BTSTACK_PATH}/src/classic/obex_srm_client.c) + target_sources(pico_btstack_classic INTERFACE + ${PICO_BTSTACK_PATH}/src/classic/obex_srm_client.c + ) + endif() + pico_add_library(pico_btstack_mesh) target_sources(pico_btstack_mesh INTERFACE ${PICO_BTSTACK_PATH}/src/mesh/adv_bearer.c