Skip to content

Commit 3d62f87

Browse files
dhalbertdhalbert
committed
back to '.packet_size' for compatiblity
1 parent 84cee1a commit 3d62f87

3 files changed

Lines changed: 11 additions & 12 deletions

File tree

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

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -285,7 +285,7 @@ void common_hal_bleio_packet_buffer_write(bleio_packet_buffer_obj_t *self, uint8
285285
if (self->conn_handle == BLE_CONN_HANDLE_INVALID) {
286286
return;
287287
}
288-
uint16_t packet_size = common_hal_bleio_packet_buffer_get_incoming_packet_length(self);
288+
uint16_t packet_size = common_hal_bleio_packet_buffer_get_packet_size(self);
289289
uint16_t max_size = packet_size - len;
290290
while (max_size < self->pending_size && self->conn_handle != BLE_CONN_HANDLE_INVALID) {
291291
RUN_BACKGROUND_TASKS;
@@ -313,17 +313,16 @@ void common_hal_bleio_packet_buffer_write(bleio_packet_buffer_obj_t *self, uint8
313313
}
314314
}
315315

316-
mp_int_t common_hal_bleio_packet_buffer_get_incoming_packet_length(bleio_packet_buffer_obj_t *self) {
316+
mp_int_t common_hal_bleio_packet_buffer_get_packet_size(bleio_packet_buffer_obj_t *self) {
317317
// If this PacketBuffer is being used for NOTIFY or INDICATE from
318-
// a remote service, the maximum size is what can be sent in one
318+
// the maximum size is what can be sent in one
319319
// BLE packet. But we must be connected to know that value.
320320
//
321321
// Otherwise it can be a long as the characteristic
322322
// will permit, whether or not we're connected.
323323

324324
if (self->characteristic != NULL &&
325325
self->characteristic->service != NULL &&
326-
self->characteristic->service->is_remote &&
327326
(common_hal_bleio_characteristic_get_properties(self->characteristic) &
328327
(CHAR_PROP_INDICATE | CHAR_PROP_NOTIFY)) &&
329328
self->conn_handle != BLE_CONN_HANDLE_INVALID) {

‎shared-bindings/_bleio/PacketBuffer.c‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -166,27 +166,27 @@ STATIC mp_obj_t bleio_packet_buffer_deinit(mp_obj_t self_in) {
166166
}
167167
STATIC MP_DEFINE_CONST_FUN_OBJ_1(bleio_packet_buffer_deinit_obj, bleio_packet_buffer_deinit);
168168

169-
//| .. attribute:: incoming_packet_length
169+
//| .. attribute:: packet_size
170170
//|
171171
//| Maximum size of a packet.
172172
//| If the packet is arriving from a remote service via notify or indicate,
173173
//| the maximum size is `Connection.max_packet_length`.
174174
//| Otherwise it is the ``max_length`` of the `Characteristic`.
175175
//|
176-
STATIC mp_obj_t bleio_packet_buffer_get_incoming_packet_length(mp_obj_t self_in) {
176+
STATIC mp_obj_t bleio_packet_buffer_get_packet_size(mp_obj_t self_in) {
177177
bleio_packet_buffer_obj_t *self = MP_OBJ_TO_PTR(self_in);
178178

179-
mp_int_t size = common_hal_bleio_packet_buffer_get_incoming_packet_length(self);
179+
mp_int_t size = common_hal_bleio_packet_buffer_get_packet_size(self);
180180
if (size < 0) {
181181
mp_raise_ValueError(translate("No connection: size cannot be determined"));
182182
}
183183
return MP_OBJ_NEW_SMALL_INT(size);
184184
}
185-
STATIC MP_DEFINE_CONST_FUN_OBJ_1(bleio_packet_buffer_get_incoming_packet_length_obj, bleio_packet_buffer_get_incoming_packet_length);
185+
STATIC MP_DEFINE_CONST_FUN_OBJ_1(bleio_packet_buffer_get_packet_size_obj, bleio_packet_buffer_get_packet_size);
186186

187-
const mp_obj_property_t bleio_packet_buffer_incoming_packet_length_obj = {
187+
const mp_obj_property_t bleio_packet_buffer_packet_size_obj = {
188188
.base.type = &mp_type_property,
189-
.proxy = { (mp_obj_t)&bleio_packet_buffer_get_incoming_packet_length_obj,
189+
.proxy = { (mp_obj_t)&bleio_packet_buffer_get_packet_size_obj,
190190
(mp_obj_t)&mp_const_none_obj,
191191
(mp_obj_t)&mp_const_none_obj },
192192
};
@@ -198,7 +198,7 @@ STATIC const mp_rom_map_elem_t bleio_packet_buffer_locals_dict_table[] = {
198198
{ MP_OBJ_NEW_QSTR(MP_QSTR_readinto), MP_ROM_PTR(&bleio_packet_buffer_readinto_obj) },
199199
{ MP_OBJ_NEW_QSTR(MP_QSTR_write), MP_ROM_PTR(&bleio_packet_buffer_write_obj) },
200200

201-
{ MP_OBJ_NEW_QSTR(MP_QSTR_incoming_packet_length), MP_ROM_PTR(&bleio_packet_buffer_incoming_packet_length_obj) },
201+
{ MP_OBJ_NEW_QSTR(MP_QSTR_packet_size), MP_ROM_PTR(&bleio_packet_buffer_packet_size_obj) },
202202
};
203203

204204
STATIC MP_DEFINE_CONST_DICT(bleio_packet_buffer_locals_dict, bleio_packet_buffer_locals_dict_table);

‎shared-bindings/_bleio/PacketBuffer.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ extern void common_hal_bleio_packet_buffer_construct(
3636
size_t buffer_size);
3737
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);
3838
mp_int_t common_hal_bleio_packet_buffer_readinto(bleio_packet_buffer_obj_t *self, uint8_t *data, size_t len);
39-
mp_int_t common_hal_bleio_packet_buffer_get_incoming_packet_length(bleio_packet_buffer_obj_t *self);
39+
mp_int_t common_hal_bleio_packet_buffer_get_packet_size(bleio_packet_buffer_obj_t *self);
4040
bool common_hal_bleio_packet_buffer_deinited(bleio_packet_buffer_obj_t *self);
4141
void common_hal_bleio_packet_buffer_deinit(bleio_packet_buffer_obj_t *self);
4242

0 commit comments

Comments
 (0)