Skip to content

Commit b9eeeb3

Browse files
committed
Remove btstack Segger RTT from pico-btstack
We now have this in the SDK so adding it again in pico-btstack leads to link errors. But it's possible to use the btstack RTT functionality by defining ENABLE_SEGGER_RTT=1, and if we're not using pico_stio_rtt we still need to add the btstack RTT source.
1 parent 3708588 commit b9eeeb3

File tree

1 file changed

+7
-1
lines changed

1 file changed

+7
-1
lines changed

src/rp2_common/pico_btstack/CMakeLists.txt

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ if (EXISTS ${PICO_BTSTACK_PATH}/${BTSTACK_TEST_PATH})
2828
target_sources(pico_btstack_base INTERFACE
2929
${PICO_BTSTACK_PATH}/3rd-party/micro-ecc/uECC.c
3030
${PICO_BTSTACK_PATH}/3rd-party/rijndael/rijndael.c
31-
${PICO_BTSTACK_PATH}/3rd-party/segger-rtt/SEGGER_RTT.c
3231
${PICO_BTSTACK_PATH}/3rd-party/segger-rtt/SEGGER_RTT_printf.c
3332
${PICO_BTSTACK_PATH}/platform/embedded/btstack_tlv_flash_bank.c
3433
${PICO_BTSTACK_PATH}/platform/embedded/hci_dump_embedded_stdout.c
@@ -62,6 +61,13 @@ if (EXISTS ${PICO_BTSTACK_PATH}/${BTSTACK_TEST_PATH})
6261
${PICO_BTSTACK_PATH}/3rd-party/yxml/yxml.c
6362
${CMAKE_CURRENT_LIST_DIR}/btstack_stdin_pico.c
6463
)
64+
# pico-sdk now supports RTT using pico_enable_stdio_rtt in your cmake file or -DPICO_STDIO_RTT=1 on the command line
65+
# Then the output of printf goes to RTT. But if you define ENABLE_SEGGER_RTT=1 it will use the btstack functionality to use RTT
66+
# and we'll have to add the source file it requires.
67+
target_sources(pico_btstack_base INTERFACE
68+
$<IF:$<BOOL:$<IF:$<STREQUAL:$<TARGET_PROPERTY:PICO_TARGET_STDIO_RTT>,>,${PICO_STDIO_RTT},$<TARGET_PROPERTY:PICO_TARGET_STDIO_RTT>>>,,${PICO_BTSTACK_PATH}/3rd-party/segger-rtt/SEGGER_RTT.c>
69+
)
70+
6571
target_include_directories(pico_btstack_base_headers SYSTEM INTERFACE
6672
${PICO_BTSTACK_PATH}/
6773
${PICO_BTSTACK_PATH}/3rd-party/md5

0 commit comments

Comments
 (0)