lib/btstack: update to v1.5.5

Author: dlech

CHANGELOG.md

@@ -7,6 +7,9 @@
 ### Added
 - Enabled builtin `set` type (except on BOOST Move hub) ([support#402]).
 
+### Changed
+- Updated BTStack to v1.5.5.
+
 ### Fixed
 - Fixed BLE broadcast not working on City hub.
 

lib/btstack

@@ -22,6 +22,7 @@
 #include "bluetooth_btstack_run_loop_contiki.h"
 #include "bluetooth_btstack.h"
 #include "genhdr/pybricks_service.h"
+#include "hci_transport_h4.h"
 #include "pybricks_service_server.h"
 
 #ifdef PBDRV_CONFIG_BLUETOOTH_BTSTACK_HUB_KIND
@@ -252,10 +253,8 @@ static void handle_gatt_client_event(uint8_t packet_type, uint16_t channel, uint
 
         case GATT_EVENT_QUERY_COMPLETE:
             if (handset.con_state == CON_STATE_WAIT_DISCOVER_SERVICES) {
-                // TODO: remove cast on lwp3_characteristic_uuid after
-                // https://github.com/bluekitchen/btstack/pull/359
                 handset.btstack_error = gatt_client_discover_characteristics_for_service_by_uuid128(
-                    handle_gatt_client_event, handset.con_handle, &handset.lwp3_service, (uint8_t *)pbio_lwp3_hub_char_uuid);
+                    handle_gatt_client_event, handset.con_handle, &handset.lwp3_service, pbio_lwp3_hub_char_uuid);
                 if (handset.btstack_error == ERROR_CODE_SUCCESS) {
                     handset.con_state = CON_STATE_WAIT_DISCOVER_CHARACTERISTICS;
                 } else {
@@ -463,7 +462,7 @@ void pbdrv_bluetooth_init(void) {
     btstack_memory_init();
     btstack_run_loop_init(pbdrv_bluetooth_btstack_run_loop_contiki_get_instance());
 
-    hci_init(hci_transport_h4_instance(pdata->uart_block_instance()), &config);
+    hci_init(hci_transport_h4_instance_for_uart(pdata->uart_block_instance()), &config);
     hci_set_chipset(pdata->chipset_instance());
     hci_set_control(pdata->control_instance());
 

lib/pbio/drv/bluetooth/bluetooth_btstack.c

@@ -129,7 +129,7 @@ void pybricks_service_server_init(
     // get service handle range
     uint16_t start_handle = 0;
     uint16_t end_handle = 0xffff;
-    int service_found = gatt_server_get_get_handle_range_for_service_with_uuid128(pbio_pybricks_service_uuid, &start_handle, &end_handle);
+    int service_found = gatt_server_get_handle_range_for_service_with_uuid128(pbio_pybricks_service_uuid, &start_handle, &end_handle);
     btstack_assert(service_found != 0);
     UNUSED(service_found);
 

lib/pbio/drv/bluetooth/pybricks_service_server.c

@@ -336,6 +336,37 @@ static void handle_send(const uint8_t *buffer, uint16_t length) {
                 case 0x200f: // LE Read White List Size
                     queue_command_complete(opcode, 0x00, 0x01);
                     break;
+                case 0x2016: { // LE Read Remote Features
+                    uint16_t connection_handle = little_endian_read_16(buffer, 4);
+
+                    {
+                        uint8_t buffer[7];
+
+                        buffer[0] = 0x04; // packet type = Event
+                        buffer[1] = 0x0f; // HCI command status event
+                        buffer[2] = sizeof(buffer) - 3; // length
+                        buffer[3] = 0x00; // status
+                        buffer[4] = 1; // number of packets
+                        little_endian_store_16(buffer, 5, opcode);
+
+                        queue_packet(buffer, sizeof(buffer));
+                    }
+                    {
+                        uint8_t buffer[15];
+
+                        buffer[0] = 0x04; // packet type = Event
+                        buffer[1] = 0x3e; // LE Read Remote Features Complete event
+                        buffer[2] = sizeof(buffer) - 3; // length
+                        buffer[3] = 0x04; // Subevent code
+                        buffer[4] = 0x00; // Status
+                        little_endian_store_16(buffer, 5, connection_handle); // connection handle
+                        little_endian_store_32(buffer, 7, 0x00000000); // LE Features (low)
+                        little_endian_store_32(buffer, 11, 0x00000000); // LE Features (high)
+
+                        queue_packet(buffer, sizeof(buffer));
+                    }
+                }
+                break;
                 case 0x2017: // LE Encrypt - key 16, data 16
                     queue_command_complete(opcode, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
                         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00);