From 42f1d50acc37de1cbe5834bd27b7a45f42955aef Mon Sep 17 00:00:00 2001 From: foamyguy Date: Thu, 1 Dec 2022 17:25:36 -0600 Subject: [PATCH] remove extra function call. handle show(None) for framebuffer and epaper --- shared-module/displayio/Display.c | 2 +- shared-module/displayio/EPaperDisplay.c | 3 +++ shared-module/framebufferio/FramebufferDisplay.c | 3 +++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/shared-module/displayio/Display.c b/shared-module/displayio/Display.c index 1f7891dc17..8367e23b59 100644 --- a/shared-module/displayio/Display.c +++ b/shared-module/displayio/Display.c @@ -142,7 +142,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) { if (root_group == NULL) { - return displayio_display_core_set_root_group(&self->core, &circuitpython_splash); + root_group = &circuitpython_splash; } return displayio_display_core_set_root_group(&self->core, root_group); } diff --git a/shared-module/displayio/EPaperDisplay.c b/shared-module/displayio/EPaperDisplay.c index 68464d50ea..09bd5d6897 100644 --- a/shared-module/displayio/EPaperDisplay.c +++ b/shared-module/displayio/EPaperDisplay.c @@ -103,6 +103,9 @@ 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) { + if (root_group == NULL) { + root_group = &circuitpython_splash; + } return displayio_display_core_set_root_group(&self->core, root_group); } diff --git a/shared-module/framebufferio/FramebufferDisplay.c b/shared-module/framebufferio/FramebufferDisplay.c index 7575523166..70a0e6639d 100644 --- a/shared-module/framebufferio/FramebufferDisplay.c +++ b/shared-module/framebufferio/FramebufferDisplay.c @@ -102,6 +102,9 @@ void common_hal_framebufferio_framebufferdisplay_construct(framebufferio_framebu } bool common_hal_framebufferio_framebufferdisplay_show(framebufferio_framebufferdisplay_obj_t *self, displayio_group_t *root_group) { + if (root_group == NULL) { + root_group = &circuitpython_splash; + } return displayio_display_core_set_root_group(&self->core, root_group); }