Skip to content
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

rgbmatrix: Avoid leaving an incompletely configured display bus #9865

Merged
merged 3 commits into from
Dec 5, 2024
Merged

rgbmatrix: Avoid leaving an incompletely configured display bus #9865

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
ed5c0bd
rgbmatrix: Avoid leaving an incompletely configured display bus
jepler Dec 4, 2024
bc691c2
Merge branch 'main' into rgbmatrix-cleanup-failure
jepler Dec 4, 2024
bc465e5
Disable terminal on itsybitsy depending on language
jepler Dec 5, 2024
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
10 changes: 10 additions & 0 deletions ports/atmel-samd/boards/itsybitsy_m4_express/mpconfigboard.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,13 @@ CIRCUITPY_GIFIO = 0
CIRCUITPY_JPEGIO = 0

CIRCUITPY_BITBANG_APA102 = 1

# We don't have room for the fonts for terminalio for certain languages,
# so turn off terminalio, and if it's off and displayio is on,
# force a clean build.
# Note that we cannot test $(CIRCUITPY_DISPLAYIO) directly with an
# ifeq, because it's not set yet.
ifneq (,$(filter $(TRANSLATION),ja ko ru))
CIRCUITPY_TERMINALIO = 0
RELEASE_NEEDS_CLEAN_BUILD = $(CIRCUITPY_DISPLAYIO)
endif
18 changes: 17 additions & 1 deletion shared-bindings/rgbmatrix/RGBMatrix.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,16 @@ static void preflight_pins_or_throw(uint8_t clock_pin, uint8_t *rgb_pins, uint8_
#endif
}

typedef struct {
nlr_jump_callback_node_t callback;
mp_obj_base_t *base_ptr;
} nlr_jump_callback_node_clear_displaybus_t;

static void clear_display_bus(void *node_in) {
nlr_jump_callback_node_clear_displaybus_t *node = node_in;
node->base_ptr->type = &mp_type_NoneType;
}

//| def __init__(
//| self,
//| *,
Expand Down Expand Up @@ -217,6 +227,13 @@ static mp_obj_t rgbmatrix_rgbmatrix_make_new(const mp_obj_type_t *type, size_t n
rgbmatrix_rgbmatrix_obj_t *self = &allocate_display_bus_or_raise()->rgbmatrix;
self->base.type = &rgbmatrix_RGBMatrix_type;

// If an exception is thrown, ensure the display bus object's type is set
// back to the uninitialized/deinitialied type. **note that all other resource
// deallocations must be handled by the shared-module code**
nlr_jump_callback_node_clear_displaybus_t node;
node.base_ptr = &self->base;
nlr_push_jump_callback(&node.callback, clear_display_bus);

uint8_t rgb_count, addr_count;
uint8_t rgb_pins[MP_ARRAY_SIZE(self->rgb_pins)];
uint8_t addr_pins[MP_ARRAY_SIZE(self->addr_pins)];
Expand Down Expand Up @@ -254,7 +271,6 @@ static mp_obj_t rgbmatrix_rgbmatrix_make_new(const mp_obj_type_t *type, size_t n
clock_pin, latch_pin, output_enable_pin,
args[ARG_doublebuffer].u_bool,
args[ARG_framebuffer].u_obj, tile, args[ARG_serpentine].u_bool, NULL);

claim_and_never_reset_pins(args[ARG_rgb_list].u_obj);
claim_and_never_reset_pins(args[ARG_addr_list].u_obj);
claim_and_never_reset_pin(args[ARG_clock_pin].u_obj);
Expand Down