pbio/drv/bluetooth: Split out connection checks.

We had already split off the peripheral since it has more than one instance. The same will now apply to the host. The check for LE connections without Pybricks was never used, and NUS is not supported, so this function can go.

Author: laurensvalk

lib/pbio/drv/bluetooth/bluetooth.c

@@ -94,7 +94,7 @@ void pbdrv_bluetooth_host_connection_changed(void) {
 pbio_error_t pbdrv_bluetooth_tx(const uint8_t *data, uint32_t *size) {
 
     // make sure we have a Bluetooth connection
-    if (!pbdrv_bluetooth_is_connected(PBDRV_BLUETOOTH_CONNECTION_PYBRICKS)) {
+    if (!pbdrv_bluetooth_host_is_connected()) {
         return PBIO_ERROR_INVALID_OP;
     }
 
@@ -112,15 +112,15 @@ pbio_error_t pbdrv_bluetooth_tx(const uint8_t *data, uint32_t *size) {
 }
 
 uint32_t pbdrv_bluetooth_tx_available(void) {
-    if (!pbdrv_bluetooth_is_connected(PBDRV_BLUETOOTH_CONNECTION_PYBRICKS)) {
+    if (!pbdrv_bluetooth_host_is_connected()) {
         return UINT32_MAX;
     }
 
     return lwrb_get_free(&stdout_ring_buf);
 }
 
 bool pbdrv_bluetooth_tx_is_idle(void) {
-    if (!pbdrv_bluetooth_is_connected(PBDRV_BLUETOOTH_CONNECTION_PYBRICKS)) {
+    if (!pbdrv_bluetooth_host_is_connected()) {
         return true;
     }
 
@@ -130,7 +130,7 @@ bool pbdrv_bluetooth_tx_is_idle(void) {
 pbio_error_t pbdrv_bluetooth_send_event_notification(pbio_os_state_t *state, pbio_pybricks_event_t event_type, const uint8_t *data, size_t size) {
     PBIO_OS_ASYNC_BEGIN(state);
 
-    if (!pbdrv_bluetooth_is_connected(PBDRV_BLUETOOTH_CONNECTION_PYBRICKS)) {
+    if (!pbdrv_bluetooth_host_is_connected()) {
         return PBIO_ERROR_INVALID_OP;
     }
 
@@ -194,7 +194,7 @@ const char *pbdrv_bluetooth_peripheral_get_name(pbdrv_bluetooth_peripheral_t *pe
 
 pbio_error_t pbdrv_bluetooth_peripheral_scan_and_connect(pbdrv_bluetooth_peripheral_t *peri, pbdrv_bluetooth_peripheral_connect_config_t *config) {
 
-    if (!pbdrv_bluetooth_is_connected(PBDRV_BLUETOOTH_CONNECTION_HCI)) {
+    if (!pbdrv_bluetooth_hci_is_enabled()) {
         return PBIO_ERROR_INVALID_OP;
     }
 
@@ -332,7 +332,7 @@ pbdrv_bluetooth_advertising_state_t pbdrv_bluetooth_advertising_state;
 
 pbio_error_t pbdrv_bluetooth_start_advertising(bool start) {
 
-    if (!pbdrv_bluetooth_is_connected(PBDRV_BLUETOOTH_CONNECTION_HCI)) {
+    if (!pbdrv_bluetooth_hci_is_enabled()) {
         return PBIO_ERROR_INVALID_OP;
     }
 
@@ -367,7 +367,7 @@ uint8_t pbdrv_bluetooth_broadcast_data_size;
 
 pbio_error_t pbdrv_bluetooth_start_broadcasting(const uint8_t *data, size_t size) {
 
-    if (!pbdrv_bluetooth_is_connected(PBDRV_BLUETOOTH_CONNECTION_HCI)) {
+    if (!pbdrv_bluetooth_hci_is_enabled()) {
         return PBIO_ERROR_INVALID_OP;
     }
 
@@ -417,7 +417,7 @@ pbdrv_bluetooth_start_observing_callback_t pbdrv_bluetooth_observe_callback;
 
 pbio_error_t pbdrv_bluetooth_start_observing(pbdrv_bluetooth_start_observing_callback_t callback) {
 
-    if (!pbdrv_bluetooth_is_connected(PBDRV_BLUETOOTH_CONNECTION_HCI)) {
+    if (!pbdrv_bluetooth_hci_is_enabled()) {
         return PBIO_ERROR_INVALID_OP;
     }
 
@@ -514,7 +514,7 @@ static pbdrv_bluetooth_classic_task_context_t pbdrv_bluetooth_classic_task_conte
 
 pbio_error_t pbdrv_bluetooth_start_inquiry_scan(pbdrv_bluetooth_inquiry_result_t *results, uint32_t *results_count, uint32_t *results_count_max, uint32_t duration_ms) {
 
-    if (!pbdrv_bluetooth_is_connected(PBDRV_BLUETOOTH_CONNECTION_HCI)) {
+    if (!pbdrv_bluetooth_hci_is_enabled()) {
         return PBIO_ERROR_INVALID_OP;
     }
 
@@ -582,7 +582,7 @@ pbio_error_t pbdrv_bluetooth_process_thread(pbio_os_state_t *state, void *contex
     pbio_error_t err;
 
     // Shorthand notation accessible throughout.
-    bool can_send = pbdrv_bluetooth_is_connected(PBDRV_BLUETOOTH_CONNECTION_PYBRICKS);
+    bool can_send = pbdrv_bluetooth_host_is_connected();
 
     // For looping over peripherals.
     static uint8_t peri_index;
@@ -724,7 +724,7 @@ pbio_error_t pbdrv_bluetooth_close_user_tasks(pbio_os_state_t *state, pbio_os_ti
 void pbdrv_bluetooth_deinit(void) {
 
     // If Bluetooth is not even initialized, nothing to do.
-    if (!pbdrv_bluetooth_is_connected(PBDRV_BLUETOOTH_CONNECTION_HCI)) {
+    if (!pbdrv_bluetooth_hci_is_enabled()) {
         return;
     }
 

lib/pbio/drv/bluetooth/bluetooth_btstack.c

@@ -185,12 +185,6 @@ static void pbdrv_bluetooth_peripheral_disconnect_now(pbdrv_bluetooth_peripheral
     gap_disconnect(peri->con_handle);
 }
 
-/**
- * Checks if the given peripheral is connected.
- */
-bool pbdrv_bluetooth_peripheral_is_connected(pbdrv_bluetooth_peripheral_t *peri) {
-    return peri->con_handle != HCI_CON_HANDLE_INVALID;
-}
 
 static pbio_os_state_t bluetooth_thread_state;
 static pbio_os_state_t bluetooth_thread_err;
@@ -214,30 +208,16 @@ static void propagate_event(uint8_t *packet) {
     event_packet = NULL;
 }
 
-bool pbdrv_bluetooth_is_connected(pbdrv_bluetooth_connection_t connection) {
-
-    // Nothing connected if HCI is not running.
-    if (bluetooth_thread_err != PBIO_ERROR_AGAIN) {
-        return false;
-    }
-
-    if (connection == PBDRV_BLUETOOTH_CONNECTION_HCI) {
-        return true;
-    }
-
-    if (connection == PBDRV_BLUETOOTH_CONNECTION_LE && le_con_handle != HCI_CON_HANDLE_INVALID) {
-        return true;
-    }
-
-    if (connection == PBDRV_BLUETOOTH_CONNECTION_PYBRICKS && pybricks_con_handle != HCI_CON_HANDLE_INVALID) {
-        return true;
-    }
+bool pbdrv_bluetooth_peripheral_is_connected(pbdrv_bluetooth_peripheral_t *peri) {
+    return peri->con_handle != HCI_CON_HANDLE_INVALID;
+}
 
-    if (connection == PBDRV_BLUETOOTH_CONNECTION_UART && uart_con_handle != HCI_CON_HANDLE_INVALID) {
-        return true;
-    }
+bool pbdrv_bluetooth_host_is_connected(void) {
+    return pybricks_con_handle != HCI_CON_HANDLE_INVALID;
+}
 
-    return false;
+bool pbdrv_bluetooth_hci_is_enabled(void) {
+    return bluetooth_thread_err == PBIO_ERROR_AGAIN;
 }
 
 static void nordic_spp_packet_handler(uint8_t packet_type, uint16_t channel, uint8_t *packet, uint16_t size) {
@@ -1203,7 +1183,7 @@ static pbio_error_t bluetooth_btstack_handle_power_control(pbio_os_state_t *stat
 
 pbio_error_t pbdrv_bluetooth_controller_reset(pbio_os_state_t *state, pbio_os_timer_t *timer) {
 
-    if (pbdrv_bluetooth_is_connected(PBDRV_BLUETOOTH_CONNECTION_HCI)) {
+    if (pbdrv_bluetooth_hci_is_enabled()) {
         return PBIO_ERROR_INVALID_OP;
     }
 

lib/pbio/drv/bluetooth/bluetooth_stm32_bluenrg.c

@@ -137,6 +137,14 @@ bool pbdrv_bluetooth_peripheral_is_connected(pbdrv_bluetooth_peripheral_t *peri)
     return peri == &peripheral_singleton && peri->con_handle != 0;
 }
 
+bool pbdrv_bluetooth_host_is_connected(void) {
+    return pybricks_notify_en;
+}
+
+bool pbdrv_bluetooth_hci_is_enabled(void) {
+    return true;
+}
+
 /**
  * Converts a BlueNRG-MS error code to a PBIO error code.
  * @param [in]  status  The BlueNRG-MS error code.
@@ -301,28 +309,6 @@ pbio_error_t pbdrv_bluetooth_stop_advertising_func(pbio_os_state_t *state, void
     PBIO_OS_ASYNC_END(PBIO_SUCCESS);
 }
 
-
-bool pbdrv_bluetooth_is_connected(pbdrv_bluetooth_connection_t connection) {
-
-    if (connection == PBDRV_BLUETOOTH_CONNECTION_HCI) {
-        return true;
-    }
-
-    if (connection == PBDRV_BLUETOOTH_CONNECTION_LE && conn_handle) {
-        return true;
-    }
-
-    if (connection == PBDRV_BLUETOOTH_CONNECTION_PYBRICKS && pybricks_notify_en) {
-        return true;
-    }
-
-    if (connection == PBDRV_BLUETOOTH_CONNECTION_UART && uart_tx_notify_en) {
-        return true;
-    }
-
-    return false;
-}
-
 pbio_error_t pbdrv_bluetooth_send_pybricks_value_notification(pbio_os_state_t *state, const uint8_t *data, uint16_t size) {
 
     PBIO_OS_ASYNC_BEGIN(state);

lib/pbio/drv/bluetooth/bluetooth_stm32_cc2640.c

@@ -156,6 +156,14 @@ bool pbdrv_bluetooth_peripheral_is_connected(pbdrv_bluetooth_peripheral_t *peri)
     return peri == &peripheral_singleton && peri->con_handle != NO_CONNECTION;
 }
 
+bool pbdrv_bluetooth_host_is_connected(void) {
+    return pybricks_notify_en && !busy_disconnecting;
+}
+
+bool pbdrv_bluetooth_hci_is_enabled(void) {
+    return true;
+}
+
 /**
  * Converts a ble error code to the most appropriate pbio error code.
  * @param [in]  status      The ble error code.
@@ -343,27 +351,6 @@ pbio_error_t pbdrv_bluetooth_stop_advertising_func(pbio_os_state_t *state, void
     PBIO_OS_ASYNC_END(PBIO_SUCCESS);
 }
 
-bool pbdrv_bluetooth_is_connected(pbdrv_bluetooth_connection_t connection) {
-
-    if (connection == PBDRV_BLUETOOTH_CONNECTION_HCI) {
-        return true;
-    }
-
-    if (connection == PBDRV_BLUETOOTH_CONNECTION_LE && conn_handle != NO_CONNECTION && !busy_disconnecting) {
-        return true;
-    }
-
-    if (connection == PBDRV_BLUETOOTH_CONNECTION_PYBRICKS && pybricks_notify_en) {
-        return true;
-    }
-
-    if (connection == PBDRV_BLUETOOTH_CONNECTION_UART && uart_tx_notify_en) {
-        return true;
-    }
-
-    return false;
-}
-
 pbio_error_t pbdrv_bluetooth_send_pybricks_value_notification(pbio_os_state_t *state, const uint8_t *data, uint16_t size) {
 
     static attHandleValueNoti_t notification;
@@ -403,8 +390,8 @@ pbio_error_t pbdrv_bluetooth_peripheral_scan_and_connect_func(pbio_os_state_t *s
     if (conn_handle != NO_CONNECTION &&
         (peri->config->options & PBDRV_BLUETOOTH_PERIPHERAL_OPTIONS_DISCONNECT_HOST)) {
         DEBUG_PRINT("Disconnect from Pybricks code (%d).\n", conn_handle);
-        // Guard used in pbdrv_bluetooth_is_connected so higher level processes
-        // won't try to send anything while we are disconnecting.
+        // Guard used in pbdrv_bluetooth_host_is_connected so higher level
+        // processes won't try to send anything while we are disconnecting.
         busy_disconnecting = true;
         PBIO_OS_AWAIT_WHILE(state, write_xfer_size);
         GAP_TerminateLinkReq(conn_handle, 0x13);

lib/pbio/include/pbdrv/bluetooth.h

@@ -22,20 +22,6 @@
 #define PBDRV_BLUETOOTH_MAX_CHAR_SIZE 20
 #define PBDRV_BLUETOOTH_MAX_ADV_SIZE 31
 
-/**
- * BLE characteristic connection identifiers.
- */
-typedef enum {
-    /* Whether Bluetooth is present and enabled on this platform. */
-    PBDRV_BLUETOOTH_CONNECTION_HCI,
-    /* A low energy device connection. */
-    PBDRV_BLUETOOTH_CONNECTION_LE,
-    /** The Pybricks service. */
-    PBDRV_BLUETOOTH_CONNECTION_PYBRICKS,
-    /** The Nordic UART service. */
-    PBDRV_BLUETOOTH_CONNECTION_UART,
-} pbdrv_bluetooth_connection_t;
-
 /** Data structure that holds context needed for sending BLE notifications. */
 typedef struct _pbdrv_bluetooth_send_context_t pbdrv_bluetooth_send_context_t;
 
@@ -85,8 +71,6 @@ struct _pbdrv_bluetooth_send_context_t {
     const uint8_t *data;
     /** The size of @p data. */
     uint8_t size;
-    /** The connection to use. Only characteristics with notify capability are allowed. */
-    pbdrv_bluetooth_connection_t connection;
 };
 
 /**
@@ -301,12 +285,21 @@ const char *pbdrv_bluetooth_get_hub_name(void);
 const char *pbdrv_bluetooth_get_fw_version(void);
 
 /**
- * Tests if a central is connected to the Bluetooth chip.
+ * Tests if a central is connected to the Bluetooth chip and subscribed to
+ * Pybricks events.
+ *
  * @param [in]  connection  The type of connection of interest.
- * @return                  True if the requested connection type is present,
+ * @return                  True if Pybricks host connected, otherwise false.
+ */
+bool pbdrv_bluetooth_host_is_connected(void);
+
+/**
+ * Tests if the Bluetooth controller is up and running.
+ *
+ * @return                  True if running,
  *                          otherwise false.
  */
-bool pbdrv_bluetooth_is_connected(pbdrv_bluetooth_connection_t connection);
+bool pbdrv_bluetooth_hci_is_enabled(void);
 
 /**
  * Sets a callback to be called when a Bluetooth host is connected or disconnected.
@@ -638,7 +631,11 @@ static inline const char *pbdrv_bluetooth_get_fw_version(void) {
     return "";
 }
 
-static inline bool pbdrv_bluetooth_is_connected(pbdrv_bluetooth_connection_t connection) {
+static inline bool pbdrv_bluetooth_host_is_connected(void) {
+    return false;
+}
+
+static inline bool pbdrv_bluetooth_hci_is_enabled(void) {
     return false;
 }
 

lib/pbio/sys/hmi_pup.c

@@ -143,7 +143,7 @@ static void pbsys_hmi_host_update_indications(void) {
     }
 
     // Update BLE light indication.
-    if (pbdrv_bluetooth_is_connected(PBDRV_BLUETOOTH_CONNECTION_PYBRICKS)) {
+    if (pbdrv_bluetooth_host_is_connected()) {
         pbsys_status_set(PBIO_PYBRICKS_STATUS_BLE_HOST_CONNECTED);
     } else {
         pbsys_status_clear(PBIO_PYBRICKS_STATUS_BLE_HOST_CONNECTED);

lib/pbio/sys/host.c

@@ -47,7 +47,7 @@ void pbsys_host_schedule_status_update(const uint8_t *buf) {
  * @return              @c true if connection is active, else @c false.
  */
 bool pbsys_host_is_connected(void) {
-    return pbdrv_bluetooth_is_connected(PBDRV_BLUETOOTH_CONNECTION_PYBRICKS) ||
+    return pbdrv_bluetooth_host_is_connected() ||
            pbdrv_usb_connection_is_active();
 }
 

pybricks/iodevices/pb_type_iodevices_xbox_controller.c

@@ -453,7 +453,7 @@ static mp_obj_t pb_type_xbox_make_new(const mp_obj_type_t *type, size_t n_args,
     // By default, disconnect Technic Hub from host, as this is required for
     // most hosts. Stay connected only if the user explicitly requests it.
     #if PYBRICKS_HUB_TECHNICHUB
-    if (!mp_obj_is_true(stay_connected_in) && pbdrv_bluetooth_is_connected(PBDRV_BLUETOOTH_CONNECTION_PYBRICKS)) {
+    if (!mp_obj_is_true(stay_connected_in) && pbdrv_bluetooth_host_is_connected()) {
         scan_config.options |= PBDRV_BLUETOOTH_PERIPHERAL_OPTIONS_DISCONNECT_HOST;
         mp_printf(&mp_plat_print, "The hub may disconnect from the computer for better connectivity with the controller.\n");
         mp_hal_delay_ms(500);