Merge pull request #4578 from tannewt/packetbuffer_lengths

Improve PacketBuffer lengths and remove packet_size

Author: dhalbert

ports/nrf/common-hal/_bleio/PacketBuffer.c

@@ -252,6 +252,9 @@ void common_hal_bleio_packet_buffer_construct(
 }
 
 mp_int_t common_hal_bleio_packet_buffer_readinto(bleio_packet_buffer_obj_t *self, uint8_t *data, size_t len) {
+    if (self->conn_handle == BLE_CONN_HANDLE_INVALID) {
+        mp_raise_ConnectionError(translate("Not connected"));
+    }
     if (ringbuf_num_filled(&self->ringbuf) < 2) {
         return 0;
     }
@@ -357,8 +360,7 @@ mp_int_t common_hal_bleio_packet_buffer_get_incoming_packet_length(bleio_packet_
         if (self->conn_handle != BLE_CONN_HANDLE_INVALID) {
             bleio_connection_internal_t *connection = bleio_conn_handle_to_connection(self->conn_handle);
             if (connection) {
-                return MIN(common_hal_bleio_connection_get_max_packet_length(connection),
-                    self->characteristic->max_length);
+                return common_hal_bleio_connection_get_max_packet_length(connection);
             }
         }
         // There's no current connection, so we don't know the MTU, and
@@ -396,6 +398,18 @@ mp_int_t common_hal_bleio_packet_buffer_get_outgoing_packet_length(bleio_packet_
         // we can't tell what the largest outgoing packet length would be.
         return -1;
     }
+    // If we are talking to a remote service, we'll be bound by the MTU. (We don't actually
+    // know the max size of the remote characteristic.)
+    if (self->characteristic->service != NULL &&
+        self->characteristic->service->is_remote) {
+        // We are talking to a remote service so we're writing.
+        if (self->conn_handle != BLE_CONN_HANDLE_INVALID) {
+            bleio_connection_internal_t *connection = bleio_conn_handle_to_connection(self->conn_handle);
+            if (connection) {
+                return common_hal_bleio_connection_get_max_packet_length(connection);
+            }
+        }
+    }
     return self->characteristic->max_length;
 }
 

shared-bindings/_bleio/PacketBuffer.c

@@ -95,7 +95,7 @@ STATIC void check_for_deinit(bleio_packet_buffer_obj_t *self) {
 
 //|     def readinto(self, buf: WriteableBuffer) -> int:
 //|         """Reads a single BLE packet into the ``buf``. Raises an exception if the next packet is longer
-//|         than the given buffer. Use `packet_size` to read the maximum length of a single packet.
+//|         than the given buffer. Use `incoming_packet_length` to read the maximum length of a single packet.
 //|
 //|         :return: number of bytes read and stored into ``buf``
 //|         :rtype: int"""
@@ -179,11 +179,6 @@ STATIC mp_obj_t bleio_packet_buffer_deinit(mp_obj_t self_in) {
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_1(bleio_packet_buffer_deinit_obj, bleio_packet_buffer_deinit);
 
-//|     packet_size: int
-//|     """`packet_size` is the same as `incoming_packet_length`.
-//|     The name `packet_size` is deprecated and
-//|     will be removed in CircuitPython 6.0.0."""
-//|
 //|     incoming_packet_length: int
 //|     """Maximum length in bytes of a packet we are reading."""
 //|
@@ -233,9 +228,6 @@ STATIC const mp_rom_map_elem_t bleio_packet_buffer_locals_dict_table[] = {
     { MP_OBJ_NEW_QSTR(MP_QSTR_readinto),               MP_ROM_PTR(&bleio_packet_buffer_readinto_obj) },
     { MP_OBJ_NEW_QSTR(MP_QSTR_write),                  MP_ROM_PTR(&bleio_packet_buffer_write_obj) },
 
-    // .packet_size is now an alias for .incoming_packet_length
-    // TODO: Remove in 6.0.0.
-    { MP_OBJ_NEW_QSTR(MP_QSTR_packet_size),            MP_ROM_PTR(&bleio_packet_buffer_incoming_packet_length_obj) },
     { MP_OBJ_NEW_QSTR(MP_QSTR_incoming_packet_length), MP_ROM_PTR(&bleio_packet_buffer_incoming_packet_length_obj) },
     { MP_OBJ_NEW_QSTR(MP_QSTR_outgoing_packet_length), MP_ROM_PTR(&bleio_packet_buffer_outgoing_packet_length_obj) },
 };