Merge branch 'adafruit:main' into seeduino-xiao-rp2040

Author: jpconstantineau

.readthedocs.yml

@@ -8,6 +8,11 @@
 
 version: 2
 
+build:
+  os: ubuntu-20.04
+  tools:
+    python: "3.9"
+
 submodules:
     include:
         - extmod/ulab
@@ -16,6 +21,5 @@ formats:
   - pdf
 
 python:
-    version: 3
     install:
         - requirements: docs/requirements.txt

devices/ble_hci/common-hal/_bleio/CharacteristicBuffer.c

@@ -33,6 +33,7 @@
 
 #include "shared-bindings/_bleio/__init__.h"
 #include "shared-bindings/_bleio/Connection.h"
+#include "shared-bindings/_bleio/CharacteristicBuffer.h"
 #include "supervisor/shared/tick.h"
 #include "common-hal/_bleio/CharacteristicBuffer.h"
 

devices/ble_hci/common-hal/_bleio/Connection.h

@@ -85,5 +85,6 @@ typedef struct {
 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);
+void bleio_connection_clear(bleio_connection_internal_t *self);
 
 #endif // MICROPY_INCLUDED_BLE_HCI_COMMON_HAL_CONNECTION_H

devices/ble_hci/common-hal/_bleio/att.c

@@ -1,6 +1,12 @@
 // Derived from ArduinoBLE.
 // Copyright 2020 Dan Halbert for Adafruit Industries
 
+// Some functions here are unused now, but may be used in the future.
+// Don't warn or error about this, and depend on the compiler & linker to
+// eliminate the associated code.
+#pragma GCC diagnostic ignored "-Wunused"
+#pragma GCC diagnostic ignored "-Wunused-function"
+
 /*
   This file is part of the ArduinoBLE library.
   Copyright (c) 2018 Arduino SA. All rights reserved.
@@ -26,6 +32,7 @@
 // Zephyr include files to define HCI communication values and structs.
 // #include "hci_include/hci.h"
 // #include "hci_include/hci_err.h"
+#include "hci_include/att_internal.h"
 #include "hci_include/l2cap_internal.h"
 
 #include "py/obj.h"
@@ -856,7 +863,7 @@ STATIC void process_find_info_req(uint16_t conn_handle, uint16_t mtu, uint8_t dl
     }
 }
 
-int att_find_info_req(uint16_t conn_handle, uint16_t start_handle, uint16_t end_handle, uint8_t response_buffer[]) {
+static int att_find_info_req(uint16_t conn_handle, uint16_t start_handle, uint16_t end_handle, uint8_t response_buffer[]) {
     struct __packed req {
         struct bt_att_hdr h;
         struct bt_att_find_info_req r;
@@ -924,7 +931,7 @@ STATIC void process_find_type_req(uint16_t conn_handle, uint16_t mtu, uint8_t dl
     }
 }
 
-void process_read_group_req(uint16_t conn_handle, uint16_t mtu, uint8_t dlen, uint8_t data[]) {
+static void process_read_group_req(uint16_t conn_handle, uint16_t mtu, uint8_t dlen, uint8_t data[]) {
     struct bt_att_read_group_req *req = (struct bt_att_read_group_req *)data;
     uint16_t type_uuid = req->uuid[0] | (req->uuid[1] << 8);
 
@@ -1008,7 +1015,7 @@ void process_read_group_req(uint16_t conn_handle, uint16_t mtu, uint8_t dlen, ui
     }
 }
 
-int att_read_group_req(uint16_t conn_handle, uint16_t start_handle, uint16_t end_handle, uint16_t uuid, uint8_t response_buffer[]) {
+static int att_read_group_req(uint16_t conn_handle, uint16_t start_handle, uint16_t end_handle, uint16_t uuid, uint8_t response_buffer[]) {
 
     typedef struct __packed {
         struct bt_att_hdr h;
@@ -1304,7 +1311,7 @@ STATIC void process_read_type_req(uint16_t conn_handle, uint16_t mtu, uint8_t dl
     }
 }
 
-int att_read_type_req(uint16_t conn_handle, uint16_t start_handle, uint16_t end_handle, uint16_t type, uint8_t response_buffer[]) {
+static int att_read_type_req(uint16_t conn_handle, uint16_t start_handle, uint16_t end_handle, uint16_t type, uint8_t response_buffer[]) {
     typedef struct __packed {
         struct bt_att_hdr h;
         struct bt_att_read_type_req r;
@@ -1714,7 +1721,7 @@ void att_process_data(uint16_t conn_handle, uint8_t dlen, uint8_t data[]) {
 }
 
 // FIX Do we need all of these?
-void check_att_err(uint8_t err) {
+static void check_att_err(uint8_t err) {
     const compressed_string_t *msg = NULL;
     switch (err) {
         case 0:

devices/ble_hci/common-hal/_bleio/hci_include/att_internal.h

@@ -8,6 +8,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+#pragma once
 
 #include <stdbool.h>
 // for __packed

extmod/moduselect.c

@@ -150,7 +150,7 @@ STATIC mp_obj_t select_select(size_t n_args, const mp_obj_t *args) {
             mp_map_deinit(&poll_map);
             return mp_obj_new_tuple(3, list_array);
         }
-        MICROPY_EVENT_POLL_HOOK
+        RUN_BACKGROUND_TASKS;
     }
 }
 MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mp_select_select_obj, 3, 4, select_select);
@@ -229,7 +229,7 @@ STATIC mp_uint_t poll_poll_internal(uint n_args, const mp_obj_t *args) {
         if (n_ready > 0 || (timeout != (mp_uint_t)-1 && mp_hal_ticks_ms() - start_tick >= timeout)) {
             break;
         }
-        MICROPY_EVENT_POLL_HOOK
+        RUN_BACKGROUND_TASKS;
     }
 
     return n_ready;
@@ -318,10 +318,13 @@ STATIC MP_DEFINE_CONST_DICT(poll_locals_dict, poll_locals_dict_table);
 
 STATIC const mp_obj_type_t mp_type_poll = {
     { &mp_type_type },
+    .flags = MP_TYPE_FLAG_EXTENDED,
     .name = MP_QSTR_poll,
-    .getiter = mp_identity_getiter,
-    .iternext = poll_iternext,
     .locals_dict = (void *)&poll_locals_dict,
+    MP_TYPE_EXTENDED_FIELDS(
+        .getiter = mp_identity_getiter,
+        .iternext = poll_iternext,
+        ),
 };
 
 // poll()
@@ -354,4 +357,6 @@ const mp_obj_module_t mp_module_uselect = {
     .globals = (mp_obj_dict_t *)&mp_module_select_globals,
 };
 
+MP_REGISTER_MODULE(MP_QSTR_select, mp_module_uselect, MICROPY_PY_USELECT);
+
 #endif // MICROPY_PY_USELECT