back to '.packet_size' for compatiblity

Author: dhalbert

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

@@ -285,7 +285,7 @@ void common_hal_bleio_packet_buffer_write(bleio_packet_buffer_obj_t *self, uint8
     if (self->conn_handle == BLE_CONN_HANDLE_INVALID) {
         return;
     }
-    uint16_t packet_size = common_hal_bleio_packet_buffer_get_incoming_packet_length(self);
+    uint16_t packet_size = common_hal_bleio_packet_buffer_get_packet_size(self);
     uint16_t max_size = packet_size - len;
     while (max_size < self->pending_size && self->conn_handle != BLE_CONN_HANDLE_INVALID) {
         RUN_BACKGROUND_TASKS;
@@ -313,17 +313,16 @@ void common_hal_bleio_packet_buffer_write(bleio_packet_buffer_obj_t *self, uint8
     }
 }
 
-mp_int_t common_hal_bleio_packet_buffer_get_incoming_packet_length(bleio_packet_buffer_obj_t *self) {
+mp_int_t common_hal_bleio_packet_buffer_get_packet_size(bleio_packet_buffer_obj_t *self) {
     // If this PacketBuffer is being used for NOTIFY or INDICATE from
-    // a remote service, the maximum size is what can be sent in one
+    // the maximum size is what can be sent in one
     // BLE packet. But we must be connected to know that value.
     //
     // Otherwise it can be a long as the characteristic
     // will permit, whether or not we're connected.
 
     if (self->characteristic != NULL &&
         self->characteristic->service != NULL &&
-        self->characteristic->service->is_remote &&
         (common_hal_bleio_characteristic_get_properties(self->characteristic) &
          (CHAR_PROP_INDICATE | CHAR_PROP_NOTIFY)) &&
         self->conn_handle != BLE_CONN_HANDLE_INVALID) {

shared-bindings/_bleio/PacketBuffer.c

@@ -166,27 +166,27 @@ 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);
 
-//|   .. attribute:: incoming_packet_length
+//|   .. attribute:: packet_size
 //|
 //|     Maximum size of a packet.
 //|     If the packet is arriving from a remote service via notify or indicate,
 //|     the maximum size is `Connection.max_packet_length`.
 //|     Otherwise it is the ``max_length`` of the `Characteristic`.
 //|
-STATIC mp_obj_t bleio_packet_buffer_get_incoming_packet_length(mp_obj_t self_in) {
+STATIC mp_obj_t bleio_packet_buffer_get_packet_size(mp_obj_t self_in) {
     bleio_packet_buffer_obj_t *self = MP_OBJ_TO_PTR(self_in);
 
-    mp_int_t size = common_hal_bleio_packet_buffer_get_incoming_packet_length(self);
+    mp_int_t size = common_hal_bleio_packet_buffer_get_packet_size(self);
     if (size < 0) {
         mp_raise_ValueError(translate("No connection: size cannot be determined"));
     }
     return MP_OBJ_NEW_SMALL_INT(size);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(bleio_packet_buffer_get_incoming_packet_length_obj, bleio_packet_buffer_get_incoming_packet_length);
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(bleio_packet_buffer_get_packet_size_obj, bleio_packet_buffer_get_packet_size);
 
-const mp_obj_property_t bleio_packet_buffer_incoming_packet_length_obj = {
+const mp_obj_property_t bleio_packet_buffer_packet_size_obj = {
     .base.type = &mp_type_property,
-    .proxy = { (mp_obj_t)&bleio_packet_buffer_get_incoming_packet_length_obj,
+    .proxy = { (mp_obj_t)&bleio_packet_buffer_get_packet_size_obj,
                (mp_obj_t)&mp_const_none_obj,
                (mp_obj_t)&mp_const_none_obj },
 };
@@ -198,7 +198,7 @@ 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) },
 
-    { 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_packet_size), MP_ROM_PTR(&bleio_packet_buffer_packet_size_obj) },
 };
 
 STATIC MP_DEFINE_CONST_DICT(bleio_packet_buffer_locals_dict, bleio_packet_buffer_locals_dict_table);

shared-bindings/_bleio/PacketBuffer.h

@@ -36,7 +36,7 @@ extern void common_hal_bleio_packet_buffer_construct(
     size_t buffer_size);
 void common_hal_bleio_packet_buffer_write(bleio_packet_buffer_obj_t *self, uint8_t *data, size_t len, uint8_t* header, size_t header_len);
 mp_int_t common_hal_bleio_packet_buffer_readinto(bleio_packet_buffer_obj_t *self, uint8_t *data, size_t len);
-mp_int_t common_hal_bleio_packet_buffer_get_incoming_packet_length(bleio_packet_buffer_obj_t *self);
+mp_int_t common_hal_bleio_packet_buffer_get_packet_size(bleio_packet_buffer_obj_t *self);
 bool common_hal_bleio_packet_buffer_deinited(bleio_packet_buffer_obj_t *self);
 void common_hal_bleio_packet_buffer_deinit(bleio_packet_buffer_obj_t *self);