Browse Source
Previously the interaction between the different layers of the Bluetooth stack was different on each port and each stack. This commit defines common interfaces between them and implements them for cyw43, btstack, nimble, stm32, unix.pull/6405/head
Jim Mussared
4 years ago
committed by
Damien George
Damien George
32 changed files with 849 additions and 341 deletions
@ -0,0 +1,38 @@ |
|||
/*
|
|||
* This file is part of the MicroPython project, http://micropython.org/
|
|||
* |
|||
* The MIT License (MIT) |
|||
* |
|||
* Copyright (c) 2020 Jim Mussared |
|||
* |
|||
* Permission is hereby granted, free of charge, to any person obtaining a copy |
|||
* of this software and associated documentation files (the "Software"), to deal |
|||
* in the Software without restriction, including without limitation the rights |
|||
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell |
|||
* copies of the Software, and to permit persons to whom the Software is |
|||
* furnished to do so, subject to the following conditions: |
|||
* |
|||
* The above copyright notice and this permission notice shall be included in |
|||
* all copies or substantial portions of the Software. |
|||
* |
|||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR |
|||
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, |
|||
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE |
|||
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER |
|||
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, |
|||
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN |
|||
* THE SOFTWARE. |
|||
*/ |
|||
|
|||
// Default definitions in case a controller doesn't implement this.
|
|||
|
|||
#include "py/mphal.h" |
|||
|
|||
#if MICROPY_PY_BLUETOOTH |
|||
|
|||
#define DEBUG_printf(...) // printf(__VA_ARGS__)
|
|||
|
|||
#include "extmod/mpbthci.h" |
|||
|
|||
|
|||
#endif // MICROPY_PY_BLUETOOTH
|
|||
@ -0,0 +1,45 @@ |
|||
/**
|
|||
* This file was generated by Apache newt version: 1.8.0-dev |
|||
*/ |
|||
|
|||
#ifndef MICROPY_INCLUDED_EXTMOD_NIMBLE_LOGCFG_LOGCFG_H |
|||
#define MICROPY_INCLUDED_EXTMOD_NIMBLE_LOGCFG_LOGCFG_H |
|||
|
|||
#include "py/mphal.h" |
|||
#include "modlog/modlog.h" |
|||
#include "log_common/log_common.h" |
|||
|
|||
#define MICROPY_PY_BLUETOOTH_DIAGNOSTIC_LOGGING (1) |
|||
|
|||
#if MICROPY_PY_BLUETOOTH_DIAGNOSTIC_LOGGING |
|||
#define DFLT_LOG_DEBUG(...) MODLOG_DEBUG(4, __VA_ARGS__) |
|||
#else |
|||
#define DFLT_LOG_DEBUG(...) IGNORE(__VA_ARGS__) |
|||
#endif |
|||
|
|||
#if MICROPY_PY_BLUETOOTH_DIAGNOSTIC_LOGGING > 1 |
|||
#define BLE_HS_LOG_DEBUG(...) MODLOG_DEBUG(4, __VA_ARGS__) |
|||
#else |
|||
#define BLE_HS_LOG_DEBUG(...) IGNORE(__VA_ARGS__) |
|||
#endif |
|||
|
|||
#define BLE_HS_LOG_INFO(...) MODLOG_INFO(4, __VA_ARGS__) |
|||
#define BLE_HS_LOG_WARN(...) MODLOG_WARN(4, __VA_ARGS__) |
|||
#define BLE_HS_LOG_ERROR(...) MODLOG_ERROR(4, __VA_ARGS__) |
|||
#define BLE_HS_LOG_CRITICAL(...) MODLOG_CRITICAL(4, __VA_ARGS__) |
|||
#define BLE_HS_LOG_DISABLED(...) MODLOG_DISABLED(4, __VA_ARGS__) |
|||
|
|||
#define DFLT_LOG_INFO(...) MODLOG_INFO(0, __VA_ARGS__) |
|||
#define DFLT_LOG_WARN(...) MODLOG_WARN(0, __VA_ARGS__) |
|||
#define DFLT_LOG_ERROR(...) MODLOG_ERROR(0, __VA_ARGS__) |
|||
#define DFLT_LOG_CRITICAL(...) MODLOG_CRITICAL(0, __VA_ARGS__) |
|||
#define DFLT_LOG_DISABLED(...) MODLOG_DISABLED(0, __VA_ARGS__) |
|||
|
|||
#define MFG_LOG_DEBUG(...) IGNORE(__VA_ARGS__) |
|||
#define MFG_LOG_INFO(...) IGNORE(__VA_ARGS__) |
|||
#define MFG_LOG_WARN(...) IGNORE(__VA_ARGS__) |
|||
#define MFG_LOG_ERROR(...) IGNORE(__VA_ARGS__) |
|||
#define MFG_LOG_CRITICAL(...) IGNORE(__VA_ARGS__) |
|||
#define MFG_LOG_DISABLED(...) MODLOG_DISABLED(128, __VA_ARGS__) |
|||
|
|||
#endif // MICROPY_INCLUDED_EXTMOD_NIMBLE_LOGCFG_LOGCFG_H
|
|||
@ -0,0 +1,107 @@ |
|||
/*
|
|||
* This file is part of the MicroPython project, http://micropython.org/
|
|||
* |
|||
* The MIT License (MIT) |
|||
* |
|||
* Copyright (c) 2020 Damien P. George |
|||
* |
|||
* Permission is hereby granted, free of charge, to any person obtaining a copy |
|||
* of this software and associated documentation files (the "Software"), to deal |
|||
* in the Software without restriction, including without limitation the rights |
|||
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell |
|||
* copies of the Software, and to permit persons to whom the Software is |
|||
* furnished to do so, subject to the following conditions: |
|||
* |
|||
* The above copyright notice and this permission notice shall be included in |
|||
* all copies or substantial portions of the Software. |
|||
* |
|||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR |
|||
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, |
|||
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE |
|||
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER |
|||
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, |
|||
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN |
|||
* THE SOFTWARE. |
|||
*/ |
|||
|
|||
#include "py/runtime.h" |
|||
#include "py/mperrno.h" |
|||
#include "py/mphal.h" |
|||
|
|||
#if MICROPY_PY_BLUETOOTH && MICROPY_BLUETOOTH_BTSTACK |
|||
|
|||
#include "lib/btstack/src/btstack.h" |
|||
#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 "extmod/mpbthci.h" |
|||
#include "extmod/btstack/btstack_hci_uart.h" |
|||
#include "extmod/btstack/modbluetooth_btstack.h" |
|||
|
|||
// The IRQ functionality in btstack_run_loop_embedded.c is not used, so the
|
|||
// following three functions are empty.
|
|||
|
|||
void hal_cpu_disable_irqs(void) { |
|||
} |
|||
|
|||
void hal_cpu_enable_irqs(void) { |
|||
} |
|||
|
|||
void hal_cpu_enable_irqs_and_sleep(void) { |
|||
} |
|||
|
|||
uint32_t hal_time_ms(void) { |
|||
return mp_hal_ticks_ms(); |
|||
} |
|||
|
|||
STATIC const hci_transport_config_uart_t hci_transport_config_uart = { |
|||
HCI_TRANSPORT_CONFIG_UART, |
|||
MICROPY_HW_BLE_UART_BAUDRATE, |
|||
3000000, |
|||
0, |
|||
NULL, |
|||
}; |
|||
|
|||
void mp_bluetooth_hci_poll(void) { |
|||
if (mp_bluetooth_btstack_state == MP_BLUETOOTH_BTSTACK_STATE_OFF) { |
|||
return; |
|||
} |
|||
|
|||
// Process uart data.
|
|||
if (mp_bluetooth_btstack_state != MP_BLUETOOTH_BTSTACK_STATE_HALTING) { |
|||
mp_bluetooth_btstack_hci_uart_process(); |
|||
} |
|||
|
|||
// Call the BTstack run loop.
|
|||
btstack_run_loop_embedded_execute_once(); |
|||
} |
|||
|
|||
void mp_bluetooth_btstack_port_init(void) { |
|||
static bool run_loop_init = false; |
|||
if (!run_loop_init) { |
|||
run_loop_init = true; |
|||
btstack_run_loop_init(btstack_run_loop_embedded_get_instance()); |
|||
} else { |
|||
btstack_run_loop_embedded_get_instance()->init(); |
|||
} |
|||
|
|||
// hci_dump_open(NULL, HCI_DUMP_STDOUT);
|
|||
const hci_transport_t *transport = hci_transport_h4_instance(&mp_bluetooth_btstack_hci_uart_block); |
|||
hci_init(transport, &hci_transport_config_uart); |
|||
|
|||
// TODO: Probably not necessary for BCM (we have our own firmware loader in the cyw43 driver),
|
|||
// but might be worth investigating for other controllers in the future.
|
|||
// hci_set_chipset(btstack_chipset_bcm_instance());
|
|||
} |
|||
|
|||
void mp_bluetooth_btstack_port_deinit(void) { |
|||
hci_power_control(HCI_POWER_OFF); |
|||
hci_close(); |
|||
} |
|||
|
|||
void mp_bluetooth_btstack_port_start(void) { |
|||
hci_power_control(HCI_POWER_ON); |
|||
} |
|||
|
|||
#endif // MICROPY_PY_BLUETOOTH && MICROPY_BLUETOOTH_BTSTACK
|
|||
@ -0,0 +1,34 @@ |
|||
/*
|
|||
* This file is part of the MicroPython project, http://micropython.org/
|
|||
* |
|||
* The MIT License (MIT) |
|||
* |
|||
* Copyright (c) 2020 Jim Mussared |
|||
* |
|||
* Permission is hereby granted, free of charge, to any person obtaining a copy |
|||
* of this software and associated documentation files (the "Software"), to deal |
|||
* in the Software without restriction, including without limitation the rights |
|||
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell |
|||
* copies of the Software, and to permit persons to whom the Software is |
|||
* furnished to do so, subject to the following conditions: |
|||
* |
|||
* The above copyright notice and this permission notice shall be included in |
|||
* all copies or substantial portions of the Software. |
|||
* |
|||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR |
|||
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, |
|||
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE |
|||
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER |
|||
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, |
|||
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN |
|||
* THE SOFTWARE. |
|||
*/ |
|||
|
|||
#ifndef MICROPY_INCLUDED_STM32_BTSTACK_PORT_H |
|||
#define MICROPY_INCLUDED_STM32_BTSTACK_PORT_H |
|||
|
|||
// To allow MICROPY_HW_BLE_UART_ID to be resolved.
|
|||
|
|||
#include "uart.h" |
|||
|
|||
#endif // MICROPY_INCLUDED_STM32_BTSTACK_PORT_H
|
|||
@ -0,0 +1,34 @@ |
|||
/*
|
|||
* This file is part of the MicroPython project, http://micropython.org/
|
|||
* |
|||
* The MIT License (MIT) |
|||
* |
|||
* Copyright (c) 2020 Jim Mussared |
|||
* |
|||
* Permission is hereby granted, free of charge, to any person obtaining a copy |
|||
* of this software and associated documentation files (the "Software"), to deal |
|||
* in the Software without restriction, including without limitation the rights |
|||
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell |
|||
* copies of the Software, and to permit persons to whom the Software is |
|||
* furnished to do so, subject to the following conditions: |
|||
* |
|||
* The above copyright notice and this permission notice shall be included in |
|||
* all copies or substantial portions of the Software. |
|||
* |
|||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR |
|||
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, |
|||
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE |
|||
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER |
|||
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, |
|||
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN |
|||
* THE SOFTWARE. |
|||
*/ |
|||
|
|||
#ifndef MICROPY_INCLUDED_STM32_NIMBLE_PORT_H |
|||
#define MICROPY_INCLUDED_STM32_NIMBLE_PORT_H |
|||
|
|||
// To allow MICROPY_HW_BLE_UART_ID to be resolved.
|
|||
|
|||
#include "uart.h" |
|||
|
|||
#endif // MICROPY_INCLUDED_STM32_NIMBLE_PORT_H
|
|||
@ -0,0 +1,39 @@ |
|||
/*
|
|||
* This file is part of the MicroPython project, http://micropython.org/
|
|||
* |
|||
* The MIT License (MIT) |
|||
* |
|||
* Copyright (c) 2020 Jim Mussared |
|||
* |
|||
* Permission is hereby granted, free of charge, to any person obtaining a copy |
|||
* of this software and associated documentation files (the "Software"), to deal |
|||
* in the Software without restriction, including without limitation the rights |
|||
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell |
|||
* copies of the Software, and to permit persons to whom the Software is |
|||
* furnished to do so, subject to the following conditions: |
|||
* |
|||
* The above copyright notice and this permission notice shall be included in |
|||
* all copies or substantial portions of the Software. |
|||
* |
|||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR |
|||
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, |
|||
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE |
|||
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER |
|||
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, |
|||
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN |
|||
* THE SOFTWARE. |
|||
*/ |
|||
|
|||
#ifndef MICROPY_INCLUDED_UNIX_BTSTACK_PORT_H |
|||
#define MICROPY_INCLUDED_UNIX_BTSTACK_PORT_H |
|||
|
|||
#define MICROPY_HW_BLE_UART_ID (0) |
|||
#define MICROPY_HW_BLE_UART_BAUDRATE (1000000) |
|||
|
|||
bool mp_bluetooth_hci_poll(void); |
|||
|
|||
#if MICROPY_BLUETOOTH_BTSTACK_USB |
|||
void mp_bluetooth_btstack_port_init_usb(void); |
|||
#endif |
|||
|
|||
#endif // MICROPY_INCLUDED_UNIX_BTSTACK_PORT_H
|
|||
@ -0,0 +1,92 @@ |
|||
/*
|
|||
* This file is part of the MicroPython project, http://micropython.org/
|
|||
* |
|||
* The MIT License (MIT) |
|||
* |
|||
* Copyright (c) 2020 Jim Mussared |
|||
* |
|||
* Permission is hereby granted, free of charge, to any person obtaining a copy |
|||
* of this software and associated documentation files (the "Software"), to deal |
|||
* in the Software without restriction, including without limitation the rights |
|||
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell |
|||
* copies of the Software, and to permit persons to whom the Software is |
|||
* furnished to do so, subject to the following conditions: |
|||
* |
|||
* The above copyright notice and this permission notice shall be included in |
|||
* all copies or substantial portions of the Software. |
|||
* |
|||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR |
|||
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, |
|||
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE |
|||
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER |
|||
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, |
|||
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN |
|||
* THE SOFTWARE. |
|||
*/ |
|||
|
|||
#include "py/runtime.h" |
|||
#include "py/mperrno.h" |
|||
#include "py/mphal.h" |
|||
|
|||
#if MICROPY_PY_BLUETOOTH && MICROPY_BLUETOOTH_BTSTACK |
|||
|
|||
#include "lib/btstack/src/btstack.h" |
|||
|
|||
#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 "extmod/btstack/modbluetooth_btstack.h" |
|||
|
|||
#include "mpbtstackport.h" |
|||
|
|||
// Called by the UART polling thread in mpbthciport.c, or by the USB polling thread in mpbtstackport_usb.c.
|
|||
bool mp_bluetooth_hci_poll(void) { |
|||
if (mp_bluetooth_btstack_state == MP_BLUETOOTH_BTSTACK_STATE_STARTING || mp_bluetooth_btstack_state == MP_BLUETOOTH_BTSTACK_STATE_ACTIVE || mp_bluetooth_btstack_state == MP_BLUETOOTH_BTSTACK_STATE_HALTING) { |
|||
// Pretend like we're running in IRQ context (i.e. other things can't be running at the same time).
|
|||
mp_uint_t atomic_state = MICROPY_BEGIN_ATOMIC_SECTION(); |
|||
btstack_run_loop_embedded_execute_once(); |
|||
MICROPY_END_ATOMIC_SECTION(atomic_state); |
|||
|
|||
return true; |
|||
} |
|||
|
|||
return false; |
|||
} |
|||
|
|||
// The IRQ functionality in btstack_run_loop_embedded.c is not used, so the
|
|||
// following three functions are empty.
|
|||
|
|||
void hal_cpu_disable_irqs(void) { |
|||
} |
|||
|
|||
void hal_cpu_enable_irqs(void) { |
|||
} |
|||
|
|||
void hal_cpu_enable_irqs_and_sleep(void) { |
|||
} |
|||
|
|||
uint32_t hal_time_ms(void) { |
|||
return mp_hal_ticks_ms(); |
|||
} |
|||
|
|||
void mp_bluetooth_btstack_port_init(void) { |
|||
static bool run_loop_init = false; |
|||
if (!run_loop_init) { |
|||
run_loop_init = true; |
|||
btstack_run_loop_init(btstack_run_loop_embedded_get_instance()); |
|||
} else { |
|||
btstack_run_loop_embedded_get_instance()->init(); |
|||
} |
|||
|
|||
// hci_dump_open(NULL, HCI_DUMP_STDOUT);
|
|||
|
|||
#if MICROPY_BLUETOOTH_BTSTACK_USB |
|||
mp_bluetooth_btstack_port_init_usb(); |
|||
#endif |
|||
} |
|||
|
|||
void mp_hal_get_mac(int idx, uint8_t buf[6]) { |
|||
} |
|||
|
|||
#endif // MICROPY_PY_BLUETOOTH && MICROPY_BLUETOOTH_BTSTACK
|
|||
Loading…
Reference in new issue