Skip to content

Commit 6378d60

Browse files
jeplerjepler
committed
displayio: implement, use allocate_display_or_raise
1 parent ada102d commit 6378d60

4 files changed

Lines changed: 25 additions & 22 deletions

File tree

‎shared-bindings/displayio/Display.c‎

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -152,17 +152,8 @@ STATIC mp_obj_t displayio_display_make_new(const mp_obj_type_t *type, size_t n_a
152152
mp_raise_ValueError(translate("Display rotation must be in 90 degree increments"));
153153
}
154154

155-
displayio_display_obj_t *self = NULL;
156-
for (uint8_t i = 0; i < CIRCUITPY_DISPLAY_LIMIT; i++) {
157-
if (displays[i].display.base.type == NULL ||
158-
displays[i].display.base.type == &mp_type_NoneType) {
159-
self = &displays[i].display;
160-
break;
161-
}
162-
}
163-
if (self == NULL) {
164-
mp_raise_RuntimeError(translate("Too many displays"));
165-
}
155+
primary_display_t *disp = allocate_display_or_raise();
156+
displayio_display_obj_t *self = &disp->display;;
166157
self->base.type = &displayio_display_type;
167158
common_hal_displayio_display_construct(
168159
self,

‎shared-bindings/displayio/EPaperDisplay.c‎

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -136,17 +136,8 @@ STATIC mp_obj_t displayio_epaperdisplay_make_new(const mp_obj_type_t *type, size
136136
mp_raise_ValueError(translate("Display rotation must be in 90 degree increments"));
137137
}
138138

139-
displayio_epaperdisplay_obj_t *self = NULL;
140-
for (uint8_t i = 0; i < CIRCUITPY_DISPLAY_LIMIT; i++) {
141-
if (displays[i].display.base.type == NULL ||
142-
displays[i].display.base.type == &mp_type_NoneType) {
143-
self = &displays[i].epaper_display;
144-
break;
145-
}
146-
}
147-
if (self == NULL) {
148-
mp_raise_RuntimeError(translate("Too many displays"));
149-
}
139+
primary_display_t *disp = allocate_display_or_raise();
140+
displayio_epaperdisplay_obj_t *self = &disp->epaper_display;;
150141

151142
mp_float_t refresh_time = mp_obj_get_float(args[ARG_refresh_time].u_obj);
152143
mp_float_t seconds_per_frame = mp_obj_get_float(args[ARG_seconds_per_frame].u_obj);

‎shared-module/displayio/__init__.c‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -308,3 +308,21 @@ void displayio_area_transform_within(bool mirror_x, bool mirror_y, bool transpos
308308
transformed->x1 = whole->x1 + (y1 - whole->y1);
309309
}
310310
}
311+
312+
primary_display_t *allocate_display() {
313+
for (uint8_t i = 0; i < CIRCUITPY_DISPLAY_LIMIT; i++) {
314+
mp_const_obj_t display_type = displays[i].display.base.type;
315+
if (display_type == NULL || display_type == &mp_type_NoneType) {
316+
return &displays[i];
317+
}
318+
}
319+
return NULL;
320+
321+
primary_display_t *allocate_display_or_raise() {
322+
primary_display_t *result = allocate_display();
323+
if (!result) {
324+
mp_raise_RuntimeError(translate("Too many displays"));
325+
}
326+
}
327+
328+
}

‎shared-module/displayio/__init__.h‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,4 +54,7 @@ void displayio_background(void);
5454
void reset_displays(void);
5555
void displayio_gc_collect(void);
5656

57+
primary_display_t *allocate_display(void);
58+
primary_display_t *allocate_display_or_raise(void);
59+
5760
#endif // MICROPY_INCLUDED_SHARED_MODULE_DISPLAYIO___INIT___H

0 commit comments

Comments
 (0)