summaryrefslogtreecommitdiff
path: root/devices
diff options
context:
space:
mode:
authorDan Halbert <halbert@halwitz.org>2020-06-26 12:42:54 -0400
committerDan Halbert <halbert@halwitz.org>2020-06-26 12:42:54 -0400
commit57bac9a1fce15135ba35cdc8e3ca8c63eb2be7c3 (patch)
treebea1fe5809810a393114c2b266818a7a556d4ea4 /devices
parent3e616ccead60030a04e237d28cd1034527818509 (diff)
update submodules
Diffstat (limited to 'devices')
-rw-r--r--devices/ble_hci/common-hal/_bleio/Adapter.h6
-rw-r--r--devices/ble_hci/common-hal/_bleio/Connection.h6
-rw-r--r--devices/ble_hci/supervisor/bluetooth.c19
3 files changed, 8 insertions, 23 deletions
diff --git a/devices/ble_hci/common-hal/_bleio/Adapter.h b/devices/ble_hci/common-hal/_bleio/Adapter.h
index c12e9105c..9d4d5abf8 100644
--- a/devices/ble_hci/common-hal/_bleio/Adapter.h
+++ b/devices/ble_hci/common-hal/_bleio/Adapter.h
@@ -34,8 +34,14 @@
#include "shared-bindings/_bleio/Connection.h"
#include "shared-bindings/_bleio/ScanResults.h"
+#include "shared-bindings/busio/UART.h"
+#include "shared-bindings/digitalio/DigitalInOut.h"
#include "shared-bindings/microcontroller/Pin.h"
+#ifndef BLEIO_TOTAL_CONNECTION_COUNT
+#define BLEIO_TOTAL_CONNECTION_COUNT 5
+#endif
+
extern bleio_connection_internal_t bleio_connections[BLEIO_TOTAL_CONNECTION_COUNT];
typedef struct {
diff --git a/devices/ble_hci/common-hal/_bleio/Connection.h b/devices/ble_hci/common-hal/_bleio/Connection.h
index 1b6616ab1..7ad91aa5c 100644
--- a/devices/ble_hci/common-hal/_bleio/Connection.h
+++ b/devices/ble_hci/common-hal/_bleio/Connection.h
@@ -61,8 +61,8 @@ typedef struct {
volatile pair_status_t pair_status;
uint8_t sec_status; // Internal security status.
mp_obj_t connection_obj;
- ble_drv_evt_handler_entry_t handler_entry;
- ble_gap_conn_params_t conn_params;
+ //REMOVE ble_drv_evt_handler_entry_t handler_entry;
+ //REMOVE ble_gap_conn_params_t conn_params;
volatile bool conn_params_updating;
uint16_t mtu;
// Request that CCCD values for this conenction be saved, using sys_attr values.
@@ -81,8 +81,6 @@ typedef struct {
uint8_t disconnect_reason;
} bleio_connection_obj_t;
-bool connection_on_ble_evt(ble_evt_t *ble_evt, void *self_in);
-
uint16_t bleio_connection_get_conn_handle(bleio_connection_obj_t *self);
mp_obj_t bleio_connection_new_from_internal(bleio_connection_internal_t* connection);
bleio_connection_internal_t *bleio_conn_handle_to_connection(uint16_t conn_handle);
diff --git a/devices/ble_hci/supervisor/bluetooth.c b/devices/ble_hci/supervisor/bluetooth.c
index 7a0b77564..83a46728e 100644
--- a/devices/ble_hci/supervisor/bluetooth.c
+++ b/devices/ble_hci/supervisor/bluetooth.c
@@ -27,22 +27,3 @@
#if CIRCUITPY_BLE_FILE_SERVICE
#error CIRCUITPY_BLE_FILE_SERVICE not implemented for CIRCUITPY_BLEIO_HCI
#endif
-
-void supervisor_bluetooth_start_advertising(void) {
-}
-
-void supervisor_start_bluetooth(void) {
-}
-
-FIL active_file;
-volatile bool new_filename;
-volatile bool run_ble_background;
-bool was_connected;
-
-void supervisor_bluetooth_background(void) {
-}
-
-// This happens in an interrupt so we need to be quick.
-bool supervisor_bluetooth_hook(ble_evt_t *ble_evt) {
- return false;
-}