Add BLE serial service

Author: tannewt

locale/circuitpython.pot

@@ -147,11 +147,6 @@ msgstr ""
 msgid "%q must of type %q"
 msgstr ""
 
-#: shared-bindings/keypad/KeyMatrix.c shared-bindings/keypad/Keys.c
-#: shared-bindings/keypad/ShiftRegisterKeys.c
-msgid "%q must store bytes"
-msgstr ""
-
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 #: shared-bindings/canio/Match.c
 msgid "%q out of range"

main.c

@@ -71,7 +71,7 @@
 
 #if CIRCUITPY_BLEIO
 #include "shared-bindings/_bleio/__init__.h"
-#include "supervisor/shared/bluetooth.h"
+#include "supervisor/shared/bluetooth/bluetooth.h"
 #endif
 
 #if CIRCUITPY_BOARD

ports/nrf/background.c

@@ -41,11 +41,6 @@
 #include "common-hal/audiopwmio/PWMAudioOut.h"
 #endif
 
-#if CIRCUITPY_BLEIO
-#include "supervisor/shared/bluetooth.h"
-#include "common-hal/_bleio/bonding.h"
-#endif
-
 void port_start_background_task(void) {
 }
 void port_finish_background_task(void) {

ports/nrf/bluetooth/ble_drv.c

@@ -38,7 +38,7 @@
 #include "py/misc.h"
 #include "py/mpstate.h"
 
-#include "supervisor/shared/bluetooth.h"
+// #include "supervisor/shared/bluetooth.h"
 
 nrf_nvic_state_t nrf_nvic_state = { 0 };
 

ports/nrf/bluetooth/ble_uart.c

@@ -40,7 +40,7 @@
 #include "py/gc.h"
 #include "py/objstr.h"
 #include "py/runtime.h"
-#include "supervisor/shared/bluetooth.h"
+#include "supervisor/shared/bluetooth/bluetooth.h"
 #include "supervisor/shared/safe_mode.h"
 #include "supervisor/shared/tick.h"
 #include "supervisor/usb.h"

ports/nrf/bluetooth/ringbuffer.h

@@ -86,7 +86,8 @@ STATIC void characteristic_gatts_notify_indicate(uint16_t handle, uint16_t conn_
 void common_hal_bleio_characteristic_construct(bleio_characteristic_obj_t *self, bleio_service_obj_t *service,
     uint16_t handle, bleio_uuid_obj_t *uuid, bleio_characteristic_properties_t props,
     bleio_attribute_security_mode_t read_perm, bleio_attribute_security_mode_t write_perm,
-    mp_int_t max_length, bool fixed_length, mp_buffer_info_t *initial_value_bufinfo) {
+    mp_int_t max_length, bool fixed_length, mp_buffer_info_t *initial_value_bufinfo,
+    const char *user_description) {
     self->service = service;
     self->uuid = uuid;
     self->handle = BLE_GATT_HANDLE_INVALID;
@@ -125,7 +126,7 @@ void common_hal_bleio_characteristic_construct(bleio_characteristic_obj_t *self,
     if (service->is_remote) {
         self->handle = handle;
     } else {
-        common_hal_bleio_service_add_characteristic(self->service, self, initial_value_bufinfo);
+        common_hal_bleio_service_add_characteristic(self->service, self, initial_value_bufinfo, user_description);
     }
 }