drv/bluetooth/btstack: update to develop branch

This pulls in some changes so that we can detect when notifications
of the Nordic UART service are disabled. This is needed to work around
a Chromium Linux bug where we have to disable and enable notifications
more than once while the device is connected.

There were also some changes in logging that had to be fixed.

Author: dlech

.editorconfig

@@ -14,3 +14,10 @@ tab_width = 4
 [{Makefile,*.mk}]
 indent_style = tab
 tab_width = 8
+
+[/lib/btstack/**]
+end_of_line = unset
+insert_final_newline = unset
+trim_trailing_whitespace = unset
+indent_style = unset
+indent_size = unset

.vscode/c_cpp_properties.json

@@ -296,6 +296,7 @@
             "includePath": [
                 "${workspaceFolder}/micropython/lib/tinytest",
                 "${workspaceFolder}/lib/btstack/chipset/cc256x",
+                "${workspaceFolder}/lib/btstack/platform/posix",
                 "${workspaceFolder}/lib/btstack/src",
                 "${workspaceFolder}/lib/contiki-core",
                 "${workspaceFolder}/lib/lego",

bricks/stm32/stm32.mk

@@ -300,7 +300,6 @@ BTSTACK_SRC_C = $(addprefix lib/btstack/src/,\
 
 BTSTACK_SRC_C += $(addprefix lib/btstack/src/ble/,\
 	gatt-service/nordic_spp_service_server.c \
-	ancs_client.c \
 	att_db_util.c \
 	att_db.c \
 	att_dispatch.c \

lib/btstack

@@ -77,14 +77,32 @@ static void nordic_can_send(void *context) {
     tx->done(tx);
 }
 
-static void nordic_data_received(hci_con_handle_t tx_con_handle, const uint8_t *data, uint16_t size) {
-    // TODO: need upstream change to be able to detect when notifications are disabled
-    if (size == 0 && uart_con_handle == HCI_CON_HANDLE_INVALID) {
-        uart_con_handle = tx_con_handle;
-    } else {
-        if (handle_rx) {
-            handle_rx(PBDRV_BLUETOOTH_CONNECTION_UART, data, size);
-        }
+static void nordic_spp_packet_handler(uint8_t packet_type, uint16_t channel, uint8_t *packet, uint16_t size) {
+    switch (packet_type) {
+        case HCI_EVENT_PACKET:
+            if (hci_event_packet_get_type(packet) != HCI_EVENT_GATTSERVICE_META) {
+                break;
+            }
+
+            switch (hci_event_gattservice_meta_get_subevent_code(packet)) {
+                case GATTSERVICE_SUBEVENT_SPP_SERVICE_CONNECTED:
+                    uart_con_handle = gattservice_subevent_spp_service_connected_get_con_handle(packet);
+                    break;
+                case GATTSERVICE_SUBEVENT_SPP_SERVICE_DISCONNECTED:
+                    uart_con_handle = HCI_CON_HANDLE_INVALID;
+                    break;
+                default:
+                    break;
+            }
+
+            break;
+        case RFCOMM_DATA_PACKET:
+            if (handle_rx) {
+                handle_rx(PBDRV_BLUETOOTH_CONNECTION_UART, packet, size);
+            }
+            break;
+        default:
+            break;
     }
 }
 
@@ -139,7 +157,7 @@ void pbdrv_bluetooth_init(void) {
     att_server_init(profile_data, NULL, NULL);
 
     pybricks_service_server_init(pybricks_data_received, pybricks_configured);
-    nordic_spp_service_server_init(nordic_data_received);
+    nordic_spp_service_server_init(nordic_spp_packet_handler);
 }
 
 void pbdrv_bluetooth_power_on(bool on) {

lib/pbio/drv/bluetooth/bluetooth_btstack.c

@@ -68,7 +68,7 @@ LWRB_SRC = $(shell find $(LWRB_DIR)/lwrb -name "*.c")
 
 # pbio depedency
 BTSTACK_DIR = ../../btstack
-BTSTACK_INC = -I$(BTSTACK_DIR)/src -I$(BTSTACK_DIR)/chipset/cc256x
+BTSTACK_INC = -I$(BTSTACK_DIR)/src -I$(BTSTACK_DIR)/chipset/cc256x -I$(BTSTACK_DIR)/platform/posix
 BTSTACK_SRC = $(addprefix $(BTSTACK_DIR)/src/,\
 	btstack_linked_list.c \
 	btstack_run_loop.c \
@@ -101,7 +101,6 @@ BTSTACK_SRC += $(addprefix $(BTSTACK_DIR)/src/,\
 
 BTSTACK_SRC += $(addprefix $(BTSTACK_DIR)/src/ble/,\
 	gatt-service/nordic_spp_service_server.c \
-	ancs_client.c \
 	att_db_util.c \
 	att_db.c \
 	att_dispatch.c \
@@ -115,6 +114,10 @@ BTSTACK_SRC += $(addprefix $(BTSTACK_DIR)/chipset/cc256x/,\
 	btstack_chipset_cc256x.c \
 	)
 
+BTSTACK_SRC += $(addprefix $(BTSTACK_DIR)/platform/posix/,\
+	hci_dump_posix_stdout.c \
+	)
+
 # pbio library
 PBIO_DIR = ..
 PBIO_INC = -I$(PBIO_DIR)/include -I$(PBIO_DIR)

lib/pbio/test/Makefile

@@ -7,6 +7,7 @@
 #include <unistd.h>
 
 #include <btstack.h>
+#include <hci_dump_posix_stdout.h>
 #include <tinytest.h>
 #include <tinytest_macros.h>
 
@@ -37,7 +38,7 @@ void pbio_test_run_thread(void *env) {
     }
 
     if (debug) {
-        hci_dump_open(NULL, HCI_DUMP_STDOUT);
+        hci_dump_init(hci_dump_posix_stdout_get_instance());
     }
     hci_dump_enable_log_level(HCI_DUMP_LOG_LEVEL_DEBUG, debug);
     hci_dump_enable_log_level(HCI_DUMP_LOG_LEVEL_INFO, debug);