change to CIRCUITPYTHON_TERMINAL. change internal API to use set_root_group

FoamyGuy · FoamyGuy · commit 403e3ef4309c · 2022-11-18T16:53:18.000-06:00
diff --git a/shared-bindings/displayio/Display.c b/shared-bindings/displayio/Display.c
@@ -430,10 +430,7 @@ STATIC mp_obj_t displayio_display_obj_set_root_group(mp_obj_t self_in, mp_obj_t
         group = MP_OBJ_TO_PTR(native_group(group_in));
     }
 
-    bool ok = common_hal_displayio_display_show(self, group);
-    if (!ok) {
-        mp_raise_ValueError(translate("Group already used"));
-    }
+    common_hal_displayio_display_set_root_group(self, group);
     return mp_const_none;
 }
 MP_DEFINE_CONST_FUN_OBJ_2(displayio_display_set_root_group_obj, displayio_display_obj_set_root_group);
diff --git a/shared-bindings/displayio/__init__.c b/shared-bindings/displayio/__init__.c
@@ -96,7 +96,7 @@ STATIC const mp_rom_map_elem_t displayio_module_globals_table[] = {
     #endif
 
     { MP_ROM_QSTR(MP_QSTR_release_displays), MP_ROM_PTR(&displayio_release_displays_obj) },
-    { MP_ROM_QSTR(MP_QSTR_SERIAL_GROUP), MP_ROM_PTR(&circuitpython_splash) },
+    { MP_ROM_QSTR(MP_QSTR_CIRCUITPYTHON_TERMINAL), MP_ROM_PTR(&circuitpython_splash) },
 };
 STATIC MP_DEFINE_CONST_DICT(displayio_module_globals, displayio_module_globals_table);
 
diff --git a/shared-module/displayio/Display.c b/shared-module/displayio/Display.c
@@ -141,7 +141,7 @@ void common_hal_displayio_display_construct(displayio_display_obj_t *self,
 }
 
 bool common_hal_displayio_display_show(displayio_display_obj_t *self, displayio_group_t *root_group) {
-    return displayio_display_core_show(&self->core, root_group);
+    return displayio_display_core_set_root_group(&self->core, root_group);
 }
 
 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
     self->auto_refresh = auto_refresh;
 }
 
+mp_obj_t common_hal_displayio_display_set_root_group(displayio_display_obj_t *self, displayio_group_t *root_group) {
+    bool ok = displayio_display_core_set_root_group(&self->core, root_group);
+    if (!ok) {
+        mp_raise_ValueError(translate("Group already used"));
+    }
+    return mp_const_none;
+}
+
 void displayio_display_background(displayio_display_obj_t *self) {
     if (self->auto_refresh && (supervisor_ticks_ms64() - self->core.last_refresh) > self->native_ms_per_frame) {
         _refresh_display(self);
diff --git a/shared-module/displayio/EPaperDisplay.c b/shared-module/displayio/EPaperDisplay.c
@@ -103,7 +103,7 @@ void common_hal_displayio_epaperdisplay_construct(displayio_epaperdisplay_obj_t
 }
 
 bool common_hal_displayio_epaperdisplay_show(displayio_epaperdisplay_obj_t *self, displayio_group_t *root_group) {
-    return displayio_display_core_show(&self->core, root_group);
+    return displayio_display_core_set_root_group(&self->core, root_group);
 }
 
 STATIC const displayio_area_t *displayio_epaperdisplay_get_refresh_areas(displayio_epaperdisplay_obj_t *self) {
diff --git a/shared-module/displayio/display_core.c b/shared-module/displayio/display_core.c
@@ -162,7 +162,7 @@ void displayio_display_core_set_rotation(displayio_display_core_t *self,
     }
 }
 
-bool displayio_display_core_show(displayio_display_core_t *self, displayio_group_t *root_group) {
+bool displayio_display_core_set_root_group(displayio_display_core_t *self, displayio_group_t *root_group) {
 
     if (root_group == NULL) { // set the display to the REPL, reset REPL position and size
         circuitpython_splash.in_group = false;
diff --git a/shared-module/displayio/display_core.h b/shared-module/displayio/display_core.h
@@ -61,7 +61,7 @@ void displayio_display_core_construct(displayio_display_core_t *self,
     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,
     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);
 
-bool displayio_display_core_show(displayio_display_core_t *self, displayio_group_t *root_group);
+bool displayio_display_core_set_root_group(displayio_display_core_t *self, displayio_group_t *root_group);
 
 uint16_t displayio_display_core_get_width(displayio_display_core_t *self);
 uint16_t displayio_display_core_get_height(displayio_display_core_t *self);
diff --git a/shared-module/framebufferio/FramebufferDisplay.c b/shared-module/framebufferio/FramebufferDisplay.c
@@ -102,7 +102,7 @@ void common_hal_framebufferio_framebufferdisplay_construct(framebufferio_framebu
 }
 
 bool common_hal_framebufferio_framebufferdisplay_show(framebufferio_framebufferdisplay_obj_t *self, displayio_group_t *root_group) {
-    return displayio_display_core_show(&self->core, root_group);
+    return displayio_display_core_set_root_group(&self->core, root_group);
 }
 
 uint16_t common_hal_framebufferio_framebufferdisplay_get_width(framebufferio_framebufferdisplay_obj_t *self) {

Original file line number	Diff line number	Diff line change
`@@ -430,10 +430,7 @@ STATIC mp_obj_t displayio_display_obj_set_root_group(mp_obj_t self_in, mp_obj_t`
`430`	`430`	`group = MP_OBJ_TO_PTR(native_group(group_in));`
`431`	`431`	`}`
`432`	`432`
`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);`
`437`	`434`	`return mp_const_none;`
`438`	`435`	`}`
`439`	`436`	`MP_DEFINE_CONST_FUN_OBJ_2(displayio_display_set_root_group_obj, displayio_display_obj_set_root_group);`
Original file line number	Diff line number	Diff line change
`@@ -103,7 +103,7 @@ void common_hal_displayio_epaperdisplay_construct(displayio_epaperdisplay_obj_t`
`103`	`103`	`}`
`104`	`104`
`105`	`105`	`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);`
`107`	`107`	`}`
`108`	`108`
`109`	`109`	`STATIC const displayio_area_t displayio_epaperdisplay_get_refresh_areas(displayio_epaperdisplay_obj_t self) {`
Original file line number	Diff line number	Diff line change
`@@ -162,7 +162,7 @@ void displayio_display_core_set_rotation(displayio_display_core_t *self,`
`162`	`162`	`}`
`163`	`163`	`}`
`164`	`164`
`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) {`
`166`	`166`
`167`	`167`	`if (root_group == NULL) { // set the display to the REPL, reset REPL position and size`
`168`	`168`	`circuitpython_splash.in_group = false;`
Original file line number	Diff line number	Diff line change
`@@ -102,7 +102,7 @@ void common_hal_framebufferio_framebufferdisplay_construct(framebufferio_framebu`
`102`	`102`	`}`
`103`	`103`
`104`	`104`	`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);`
`106`	`106`	`}`
`107`	`107`
`108`	`108`	`uint16_t common_hal_framebufferio_framebufferdisplay_get_width(framebufferio_framebufferdisplay_obj_t *self) {`