Skip to content

Commit 26368b1

Browse files
MrGreensWorkshoppeterharperuk
MrGreensWorkshop
and
peterharperuk
authored
Splitting BLE and BT Classic dependencies (#332)
 Co-authored-by: Peter Harper <[email protected]>
1 parent 3f6e1a4 commit 26368b1

File tree

7 files changed

+23
-21
lines changed

7 files changed

+23
-21
lines changed

‎pico_w/bt/CMakeLists.txt‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,6 @@ target_sources(picow_bt_example_common INTERFACE
4242
)
4343
target_link_libraries(picow_bt_example_common INTERFACE
4444
pico_stdlib
45-
pico_btstack_ble
46-
pico_btstack_classic
4745
pico_btstack_cyw43
4846
)
4947
target_include_directories(picow_bt_example_common INTERFACE
@@ -301,9 +299,9 @@ endfunction()
301299
# Extra parameters indicate extra libraries to link to
302300
function(picow_bt_example NAME)
303301
picow_bt_example_target_name(${NAME} TARGET_NAME)
304-
picow_bt_example_poll(${NAME} ${TARGET_NAME} picow_bt_example_no_cyw43_lwip_poll ${ARGN})
305-
picow_bt_example_background(${NAME} ${TARGET_NAME} picow_bt_example_no_cyw43_lwip_background ${ARGN})
306-
picow_bt_example_freertos(${NAME} ${TARGET_NAME} picow_bt_example_no_cyw43_lwip_freertos ${ARGN})
302+
picow_bt_example_poll(${NAME} ${TARGET_NAME} picow_bt_example_no_cyw43_lwip_poll pico_btstack_ble pico_btstack_classic ${ARGN})
303+
picow_bt_example_background(${NAME} ${TARGET_NAME} picow_bt_example_no_cyw43_lwip_background pico_btstack_ble pico_btstack_classic ${ARGN})
304+
picow_bt_example_freertos(${NAME} ${TARGET_NAME} picow_bt_example_no_cyw43_lwip_freertos pico_btstack_ble pico_btstack_classic ${ARGN})
307305
endfunction()
308306

309307
# List of examples from btstack

‎pico_w/bt/config/btstack_config.h‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,11 @@
22
#define _PICO_BTSTACK_BTSTACK_CONFIG_H
33

44
// BTstack features that can be enabled
5+
#ifdef ENABLE_BLE
56
#define ENABLE_LE_PERIPHERAL
67
#define ENABLE_LE_CENTRAL
78
#define ENABLE_L2CAP_LE_CREDIT_BASED_FLOW_CONTROL_MODE
9+
#endif
810
#define ENABLE_LOG_INFO
911
#define ENABLE_LOG_ERROR
1012
#define ENABLE_PRINTF_HEXDUMP
@@ -67,11 +69,11 @@
6769

6870
#define HAVE_BTSTACK_STDIN
6971

70-
// To get the audio demos working even with HCI dump at 115200, this truncates long ACL packetws
72+
// To get the audio demos working even with HCI dump at 115200, this truncates long ACL packets
7173
//#define HCI_DUMP_STDOUT_MAX_SIZE_ACL 100
7274

7375
#ifdef ENABLE_CLASSIC
7476
#define ENABLE_L2CAP_ENHANCED_RETRANSMISSION_MODE
7577
#endif
7678

77-
#endif // MICROPY_INCLUDED_EXTMOD_BTSTACK_BTSTACK_CONFIG_H
79+
#endif // _PICO_BTSTACK_BTSTACK_CONFIG_H

‎pico_w/bt/gatt_counter_with_wifi/CMakeLists.txt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
set(NAME gatt_counter)
22
picow_bt_example_target_name(${NAME}_with_wifi TARGET_NAME)
33

4-
picow_bt_example_poll(${NAME} ${TARGET_NAME} picow_bt_example_cyw43_lwip_poll)
5-
picow_bt_example_background(${NAME} ${TARGET_NAME} picow_bt_example_cyw43_lwip_background)
6-
picow_bt_example_freertos(${NAME} ${TARGET_NAME} picow_bt_example_cyw43_lwip_freertos)
4+
picow_bt_example_poll(${NAME} ${TARGET_NAME} picow_bt_example_cyw43_lwip_poll pico_btstack_ble)
5+
picow_bt_example_background(${NAME} ${TARGET_NAME} picow_bt_example_cyw43_lwip_background pico_btstack_ble)
6+
picow_bt_example_freertos(${NAME} ${TARGET_NAME} picow_bt_example_cyw43_lwip_freertos pico_btstack_ble)

‎pico_w/bt/gatt_streamer_server_with_wifi/CMakeLists.txt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
set(NAME gatt_streamer_server)
22
picow_bt_example_target_name(${NAME}_with_wifi TARGET_NAME)
33

4-
picow_bt_example_poll(${NAME} ${TARGET_NAME} picow_bt_example_cyw43_lwip_poll)
5-
picow_bt_example_background(${NAME} ${TARGET_NAME} picow_bt_example_cyw43_lwip_background)
6-
picow_bt_example_freertos(${NAME} ${TARGET_NAME} picow_bt_example_cyw43_lwip_freertos)
4+
picow_bt_example_poll(${NAME} ${TARGET_NAME} picow_bt_example_cyw43_lwip_poll pico_btstack_ble)
5+
picow_bt_example_background(${NAME} ${TARGET_NAME} picow_bt_example_cyw43_lwip_background pico_btstack_ble)
6+
picow_bt_example_freertos(${NAME} ${TARGET_NAME} picow_bt_example_cyw43_lwip_freertos pico_btstack_ble)

‎pico_w/bt/pan_lwip_http_server/CMakeLists.txt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@ target_include_directories(pan_lwip_dhserver INTERFACE
88

99
picow_bt_example_target_name(pan_lwip_http_server TARGET_NAME)
1010

11-
picow_bt_example_poll(pan_lwip_http_server ${TARGET_NAME} picow_bt_example_btstack_lwip_poll pan_lwip_dhserver pico_lwip_http)
12-
picow_bt_example_background(pan_lwip_http_server ${TARGET_NAME} picow_bt_example_btstack_lwip_background pan_lwip_dhserver pico_lwip_http)
13-
picow_bt_example_freertos(pan_lwip_http_server ${TARGET_NAME} picow_bt_example_btstack_lwip_freertos pan_lwip_dhserver pico_lwip_http)
11+
picow_bt_example_poll(pan_lwip_http_server ${TARGET_NAME} picow_bt_example_btstack_lwip_poll pan_lwip_dhserver pico_lwip_http pico_btstack_classic)
12+
picow_bt_example_background(pan_lwip_http_server ${TARGET_NAME} picow_bt_example_btstack_lwip_background pan_lwip_dhserver pico_lwip_http pico_btstack_classic)
13+
picow_bt_example_freertos(pan_lwip_http_server ${TARGET_NAME} picow_bt_example_btstack_lwip_freertos pan_lwip_dhserver pico_lwip_http pico_btstack_classic)

‎pico_w/bt/picow_bt_example_common.c‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,14 @@
44
* SPDX-License-Identifier: BSD-3-Clause
55
*/
66

7+
#if TEST_AUDIO
78
#include "btstack_audio.h"
9+
#endif
810
#include "btstack_event.h"
911
#include "hal_led.h"
1012
#include "pico/cyw43_arch.h"
1113
#include "pico/stdlib.h"
14+
#include "btstack.h"
1215

1316
#if defined(WIFI_SSID) && defined(WIFI_PASSWORD)
1417
#define TEST_BTWIFI 1
@@ -27,15 +30,14 @@ const btstack_audio_sink_t * btstack_audio_pico_sink_get_instance(void);
2730
#endif
2831

2932
static btstack_packet_callback_registration_t hci_event_callback_registration;
30-
3133
static int led_state = 0;
3234

3335
void hal_led_toggle(void){
3436
led_state = 1 - led_state;
3537
cyw43_arch_gpio_put(CYW43_WL_GPIO_LED_PIN, led_state);
3638
}
3739

38-
static void packet_handler (uint8_t packet_type, uint16_t channel, uint8_t *packet, uint16_t size){
40+
static void packet_handler(uint8_t packet_type, uint16_t channel, uint8_t *packet, uint16_t size){
3941
UNUSED(size);
4042
UNUSED(channel);
4143
bd_addr_t local_addr;

‎pico_w/bt/spp_streamer_with_wifi/CMakeLists.txt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
set(NAME spp_streamer)
22
picow_bt_example_target_name(${NAME}_with_wifi TARGET_NAME)
33

4-
picow_bt_example_poll(${NAME} ${TARGET_NAME} picow_bt_example_cyw43_lwip_poll)
5-
picow_bt_example_background(${NAME} ${TARGET_NAME} picow_bt_example_cyw43_lwip_background)
6-
picow_bt_example_freertos(${NAME} ${TARGET_NAME} picow_bt_example_cyw43_lwip_freertos)
4+
picow_bt_example_poll(${NAME} ${TARGET_NAME} picow_bt_example_cyw43_lwip_poll pico_btstack_classic)
5+
picow_bt_example_background(${NAME} ${TARGET_NAME} picow_bt_example_cyw43_lwip_background pico_btstack_classic)
6+
picow_bt_example_freertos(${NAME} ${TARGET_NAME} picow_bt_example_cyw43_lwip_freertos pico_btstack_classic)

0 commit comments

Comments
 (0)