Merge pull request adafruit#3542 from jepler/terminal-memory-allocation

tannewt · web-flow · commit 4a95965b1aac · 2020-10-12T15:17:05.000-07:00
displayio, framebufferio: Remove spurious call to supervisor_start_terminal
diff --git a/shared-module/displayio/Display.c b/shared-module/displayio/Display.c
@@ -107,8 +107,6 @@ void common_hal_displayio_display_construct(displayio_display_obj_t* self,
         i += 2 + data_size;
     }
 
-    supervisor_start_terminal(width, height);
-
     // Always set the backlight type in case we're reusing memory.
     self->backlight_inout.base.type = &mp_type_NoneType;
     if (backlight_pin != NULL && common_hal_mcu_pin_is_free(backlight_pin)) {
diff --git a/shared-module/displayio/EPaperDisplay.c b/shared-module/displayio/EPaperDisplay.c
@@ -90,8 +90,6 @@ void common_hal_displayio_epaperdisplay_construct(displayio_epaperdisplay_obj_t*
         // TODO: Clear
     }
 
-    supervisor_start_terminal(width, height);
-
     // Set the group after initialization otherwise we may send pixels while we delay in
     // initialization.
     common_hal_displayio_epaperdisplay_show(self, &circuitpython_splash);
diff --git a/shared-module/framebufferio/FramebufferDisplay.c b/shared-module/framebufferio/FramebufferDisplay.c
@@ -96,8 +96,6 @@ void common_hal_framebufferio_framebufferdisplay_construct(framebufferio_framebu
         common_hal_framebufferio_framebufferdisplay_set_rotation(self, rotation);
     }
 
-    supervisor_start_terminal(self->core.width, self->core.height);
-
     // Set the group after initialization otherwise we may send pixels while we delay in
     // initialization.
     common_hal_framebufferio_framebufferdisplay_show(self, &circuitpython_splash);

Original file line number	Diff line number	Diff line change
`@@ -107,8 +107,6 @@ void common_hal_displayio_display_construct(displayio_display_obj_t* self,`
`107`	`107`	`i += 2 + data_size;`
`108`	`108`	`}`
`109`	`109`
`110`		`- supervisor_start_terminal(width, height);`
`111`		`-`
`112`	`110`	`// Always set the backlight type in case we're reusing memory.`
`113`	`111`	`self->backlight_inout.base.type = &mp_type_NoneType;`
`114`	`112`	`if (backlight_pin != NULL && common_hal_mcu_pin_is_free(backlight_pin)) {`
Original file line number	Diff line number	Diff line change
`@@ -90,8 +90,6 @@ void common_hal_displayio_epaperdisplay_construct(displayio_epaperdisplay_obj_t*`
`90`	`90`	`// TODO: Clear`
`91`	`91`	`}`
`92`	`92`
`93`		`- supervisor_start_terminal(width, height);`
`94`		`-`
`95`	`93`	`// Set the group after initialization otherwise we may send pixels while we delay in`
`96`	`94`	`// initialization.`
`97`	`95`	`common_hal_displayio_epaperdisplay_show(self, &circuitpython_splash);`
Original file line number	Diff line number	Diff line change
`@@ -96,8 +96,6 @@ void common_hal_framebufferio_framebufferdisplay_construct(framebufferio_framebu`
`96`	`96`	`common_hal_framebufferio_framebufferdisplay_set_rotation(self, rotation);`
`97`	`97`	`}`
`98`	`98`
`99`		`- supervisor_start_terminal(self->core.width, self->core.height);`
`100`		`-`
`101`	`99`	`// Set the group after initialization otherwise we may send pixels while we delay in`
`102`	`100`	`// initialization.`
`103`	`101`	`common_hal_framebufferio_framebufferdisplay_show(self, &circuitpython_splash);`