djsundog/circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

extmod/btstack: Switch to use hci_dump_init instead of hci_dump_open.

Browse Source 
The latter is no longer available in the version of BTstack now in use by
this repository.

Signed-off-by: Damien George <damien@micropython.org>
This commit is contained in:
Damien George 2023-04-22 00:39:31 +10:00
parent ec1eeccab4
commit 9e6885ad82
4 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
extmod/btstack/btstack.mk
View File

@ -35,6 +35,7 @@ INC += -I$(BTSTACK_DIR)/3rd-party/yxml
SRC_BTSTACK_C = \
$(addprefix lib/btstack/src/, $(SRC_FILES)) \
$(addprefix lib/btstack/src/ble/, $(filter-out %_tlv.c, $(SRC_BLE_FILES))) \
lib/btstack/platform/embedded/hci_dump_embedded_stdout.c \
ifeq ($(MICROPY_BLUETOOTH_BTSTACK_USB),1)
ifeq ($(MICROPY_BLUETOOTH_BTSTACK_H4),1)

1
extmod/btstack/btstack_config_common.h
View File

@ -7,6 +7,7 @@
#define ENABLE_LE_CENTRAL
// #define ENABLE_CLASSIC
#define ENABLE_L2CAP_LE_CREDIT_BASED_FLOW_CONTROL_MODE
#define ENABLE_PRINTF_HEXDUMP
// #define ENABLE_LOG_INFO
// #define ENABLE_LOG_DEBUG
#define ENABLE_LOG_ERROR

3
ports/stm32/mpbtstackport.c
View File

@ -32,6 +32,7 @@
#include "lib/btstack/src/btstack.h"
#include "lib/btstack/src/hci_transport_h4.h"
#include "lib/btstack/platform/embedded/hci_dump_embedded_stdout.h"
#include "extmod/mpbthci.h"
#include "extmod/btstack/btstack_hci_uart.h"
#include "extmod/btstack/modbluetooth_btstack.h"
@ -140,7 +141,7 @@ void mp_bluetooth_hci_poll(void) {
void mp_bluetooth_btstack_port_init(void) {
btstack_run_loop_init(&mp_btstack_runloop_stm32);
// hci_dump_open(NULL, HCI_DUMP_STDOUT);
// hci_dump_init(hci_dump_embedded_stdout_get_instance());
const hci_transport_t *transport = hci_transport_h4_instance_for_uart(&mp_bluetooth_btstack_hci_uart_block);
hci_init(transport, &hci_transport_config_uart);

3
ports/unix/mpbtstackport_common.c
View File

@ -35,6 +35,7 @@
#include "lib/btstack/platform/embedded/btstack_run_loop_embedded.h"
#include "lib/btstack/platform/embedded/hal_cpu.h"
#include "lib/btstack/platform/embedded/hal_time_ms.h"
#include "lib/btstack/platform/embedded/hci_dump_embedded_stdout.h"
#include "extmod/btstack/modbluetooth_btstack.h"
@ -81,7 +82,7 @@ uint32_t hal_time_ms(void) {
void mp_bluetooth_btstack_port_init(void) {
btstack_run_loop_init(btstack_run_loop_embedded_get_instance());
// hci_dump_open(NULL, HCI_DUMP_STDOUT);
// hci_dump_init(hci_dump_embedded_stdout_get_instance());
#if MICROPY_BLUETOOTH_BTSTACK_H4
mp_bluetooth_btstack_port_init_h4();