Skip to content

espressif/_bleio: build discovered GATT objects on the VM task #11104

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dhalbert wants to merge 3 commits into
base: main
Choose a base branch
from
+229 −68
Open

espressif/_bleio: build discovered GATT objects on the VM task #11104

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2bae80a
espressif/_bleio: build discovered GATT objects on the VM task
dhalbert Jul 8, 2026
97cf5c5
espressif/_bleio: guard buffer state shared with the NimBLE host task
dhalbert Jul 8, 2026
8eb5e6f
espressif/_bleio: restore CIRCUITPY_VERBOSE_BLE discovery prints
dhalbert Jul 8, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 16 additions & 5 deletions ports/espressif/common-hal/_bleio/CharacteristicBuffer.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,19 @@
#include "shared-bindings/_bleio/__init__.h"
#include "shared-bindings/_bleio/Connection.h"
#include "shared-bindings/_bleio/CharacteristicBuffer.h"
#include "shared-bindings/microcontroller/__init__.h"

#include "supervisor/shared/tick.h"

#include "common-hal/_bleio/ble_events.h"

// The ringbuf is filled from the nimble_host task, which preempts the VM task
// at arbitrary points, and ringbuf operations are not atomic, so guard them
// with interrupts disabled.

// Runs on the nimble_host task.
void bleio_characteristic_buffer_extend(bleio_characteristic_buffer_obj_t *self, const uint8_t *data, size_t len) {
common_hal_mcu_disable_interrupts();
if (self->watch_for_interrupt_char) {
for (uint16_t i = 0; i < len; i++) {
if (data[i] == mp_interrupt_char) {
Expand All @@ -34,6 +41,7 @@ void bleio_characteristic_buffer_extend(bleio_characteristic_buffer_obj_t *self,
} else {
ringbuf_put_n(&self->ringbuf, data, len);
}
common_hal_mcu_enable_interrupts();
}

void _common_hal_bleio_characteristic_buffer_construct(bleio_characteristic_buffer_obj_t *self,
Expand Down Expand Up @@ -70,20 +78,23 @@ uint32_t common_hal_bleio_characteristic_buffer_read(bleio_characteristic_buffer
}
}

common_hal_mcu_disable_interrupts();
uint32_t num_bytes_read = ringbuf_get_n(&self->ringbuf, data, len);
common_hal_mcu_enable_interrupts();
return num_bytes_read;
}

// NOTE: The nRF port has protection around these operations because the ringbuf
// is filled from an interrupt. On ESP the ringbuf is filled from the BLE host
// task that won't interrupt us.

uint32_t common_hal_bleio_characteristic_buffer_rx_characters_available(bleio_characteristic_buffer_obj_t *self) {
return ringbuf_num_filled(&self->ringbuf);
common_hal_mcu_disable_interrupts();
uint32_t count = ringbuf_num_filled(&self->ringbuf);
common_hal_mcu_enable_interrupts();
return count;
}

void common_hal_bleio_characteristic_buffer_clear_rx_buffer(bleio_characteristic_buffer_obj_t *self) {
common_hal_mcu_disable_interrupts();
ringbuf_clear(&self->ringbuf);
common_hal_mcu_enable_interrupts();
}

bool common_hal_bleio_characteristic_buffer_deinited(bleio_characteristic_buffer_obj_t *self) {
Expand Down
Loading
Loading