Skip to content

Commit 403e3ef

Browse files
committed
change to CIRCUITPYTHON_TERMINAL. change internal API to use set_root_group
1 parent 788638f commit 403e3ef

File tree

7 files changed

+15
-10
lines changed

7 files changed

+15
-10
lines changed

shared-bindings/displayio/Display.c

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -430,10 +430,7 @@ STATIC mp_obj_t displayio_display_obj_set_root_group(mp_obj_t self_in, mp_obj_t
430430
group = MP_OBJ_TO_PTR(native_group(group_in));
431431
}
432432

433-
bool ok = common_hal_displayio_display_show(self, group);
434-
if (!ok) {
435-
mp_raise_ValueError(translate("Group already used"));
436-
}
433+
common_hal_displayio_display_set_root_group(self, group);
437434
return mp_const_none;
438435
}
439436
MP_DEFINE_CONST_FUN_OBJ_2(displayio_display_set_root_group_obj, displayio_display_obj_set_root_group);

shared-bindings/displayio/__init__.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ STATIC const mp_rom_map_elem_t displayio_module_globals_table[] = {
9696
#endif
9797

9898
{ MP_ROM_QSTR(MP_QSTR_release_displays), MP_ROM_PTR(&displayio_release_displays_obj) },
99-
{ MP_ROM_QSTR(MP_QSTR_SERIAL_GROUP), MP_ROM_PTR(&circuitpython_splash) },
99+
{ MP_ROM_QSTR(MP_QSTR_CIRCUITPYTHON_TERMINAL), MP_ROM_PTR(&circuitpython_splash) },
100100
};
101101
STATIC MP_DEFINE_CONST_DICT(displayio_module_globals, displayio_module_globals_table);
102102

shared-module/displayio/Display.c

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ void common_hal_displayio_display_construct(displayio_display_obj_t *self,
141141
}
142142

143143
bool common_hal_displayio_display_show(displayio_display_obj_t *self, displayio_group_t *root_group) {
144-
return displayio_display_core_show(&self->core, root_group);
144+
return displayio_display_core_set_root_group(&self->core, root_group);
145145
}
146146

147147
uint16_t common_hal_displayio_display_get_width(displayio_display_obj_t *self) {
@@ -398,6 +398,14 @@ void common_hal_displayio_display_set_auto_refresh(displayio_display_obj_t *self
398398
self->auto_refresh = auto_refresh;
399399
}
400400

401+
mp_obj_t common_hal_displayio_display_set_root_group(displayio_display_obj_t *self, displayio_group_t *root_group) {
402+
bool ok = displayio_display_core_set_root_group(&self->core, root_group);
403+
if (!ok) {
404+
mp_raise_ValueError(translate("Group already used"));
405+
}
406+
return mp_const_none;
407+
}
408+
401409
void displayio_display_background(displayio_display_obj_t *self) {
402410
if (self->auto_refresh && (supervisor_ticks_ms64() - self->core.last_refresh) > self->native_ms_per_frame) {
403411
_refresh_display(self);

shared-module/displayio/EPaperDisplay.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ void common_hal_displayio_epaperdisplay_construct(displayio_epaperdisplay_obj_t
103103
}
104104

105105
bool common_hal_displayio_epaperdisplay_show(displayio_epaperdisplay_obj_t *self, displayio_group_t *root_group) {
106-
return displayio_display_core_show(&self->core, root_group);
106+
return displayio_display_core_set_root_group(&self->core, root_group);
107107
}
108108

109109
STATIC const displayio_area_t *displayio_epaperdisplay_get_refresh_areas(displayio_epaperdisplay_obj_t *self) {

shared-module/displayio/display_core.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ void displayio_display_core_set_rotation(displayio_display_core_t *self,
162162
}
163163
}
164164

165-
bool displayio_display_core_show(displayio_display_core_t *self, displayio_group_t *root_group) {
165+
bool displayio_display_core_set_root_group(displayio_display_core_t *self, displayio_group_t *root_group) {
166166

167167
if (root_group == NULL) { // set the display to the REPL, reset REPL position and size
168168
circuitpython_splash.in_group = false;

shared-module/displayio/display_core.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ void displayio_display_core_construct(displayio_display_core_t *self,
6161
mp_obj_t bus, uint16_t width, uint16_t height, uint16_t ram_width, uint16_t ram_height, int16_t colstart, int16_t rowstart, uint16_t rotation,
6262
uint16_t color_depth, bool grayscale, bool pixels_in_byte_share_row, uint8_t bytes_per_cell, bool reverse_pixels_in_byte, bool reverse_bytes_in_word);
6363

64-
bool displayio_display_core_show(displayio_display_core_t *self, displayio_group_t *root_group);
64+
bool displayio_display_core_set_root_group(displayio_display_core_t *self, displayio_group_t *root_group);
6565

6666
uint16_t displayio_display_core_get_width(displayio_display_core_t *self);
6767
uint16_t displayio_display_core_get_height(displayio_display_core_t *self);

shared-module/framebufferio/FramebufferDisplay.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ void common_hal_framebufferio_framebufferdisplay_construct(framebufferio_framebu
102102
}
103103

104104
bool common_hal_framebufferio_framebufferdisplay_show(framebufferio_framebufferdisplay_obj_t *self, displayio_group_t *root_group) {
105-
return displayio_display_core_show(&self->core, root_group);
105+
return displayio_display_core_set_root_group(&self->core, root_group);
106106
}
107107

108108
uint16_t common_hal_framebufferio_framebufferdisplay_get_width(framebufferio_framebufferdisplay_obj_t *self) {

0 commit comments

Comments
 (0)