Skip to content

Add address_little_endian and fix display memory reuse #7891

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Apr 26, 2023
Merged

Add address_little_endian and fix display memory reuse #7891

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
7089ea4
Add address_little_endian for displayio
tannewt Apr 20, 2023
d5b747b
Fix board inits
tannewt Apr 21, 2023
b160378
Fix native epd boards
tannewt Apr 21, 2023
87fc5ef
Re-enable partial updates when available
tannewt Apr 24, 2023
eab202a
Fix SH110x
tannewt Apr 25, 2023
75046b3
Save space with consolidated errors
tannewt Apr 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ports/atmel-samd/boards/hallowing_m0_express/board.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ uint8_t display_init_sequence[] = {
};

void board_init(void) {
displayio_fourwire_obj_t *bus = &displays[0].fourwire_bus;
displayio_fourwire_obj_t *bus = &allocate_display_bus()->fourwire_bus;
bus->base.type = &displayio_fourwire_type;
busio_spi_obj_t *spi = common_hal_board_create_spi(0);
common_hal_busio_spi_never_reset(spi);
Expand All @@ -82,7 +82,7 @@ void board_init(void) {
0, // Polarity
0); // Phase

displayio_display_obj_t *display = &displays[0].display;
displayio_display_obj_t *display = &allocate_display()->display;
display->base.type = &displayio_display_type;
common_hal_displayio_display_construct(display,
bus,
Expand Down
6 changes: 3 additions & 3 deletions ports/atmel-samd/boards/hallowing_m4_express/board.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,11 +47,11 @@ uint8_t display_init_sequence[] = {
};

void board_init(void) {
busio_spi_obj_t *spi = &displays[0].fourwire_bus.inline_bus;
displayio_fourwire_obj_t *bus = &allocate_display_bus()->fourwire_bus;
busio_spi_obj_t *spi = &bus->inline_bus;
common_hal_busio_spi_construct(spi, &pin_PA01, &pin_PA00, NULL, false);
common_hal_busio_spi_never_reset(spi);

displayio_fourwire_obj_t *bus = &displays[0].fourwire_bus;
bus->base.type = &displayio_fourwire_type;
common_hal_displayio_fourwire_construct(bus,
spi,
Expand All @@ -62,7 +62,7 @@ void board_init(void) {
0, // Polarity
0); // Phase

displayio_display_obj_t *display = &displays[0].display;
displayio_display_obj_t *display = &allocate_display()->display;
display->base.type = &displayio_display_type;
common_hal_displayio_display_construct(display,
bus,
Expand Down
6 changes: 3 additions & 3 deletions ports/atmel-samd/boards/monster_m4sk/board.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,11 +48,11 @@ uint8_t display_init_sequence[] = {
};

void board_init(void) {
busio_spi_obj_t *spi = &displays[0].fourwire_bus.inline_bus;
displayio_fourwire_obj_t *bus = &allocate_display_bus()->fourwire_bus;
busio_spi_obj_t *spi = &bus->inline_bus;
common_hal_busio_spi_construct(spi, &pin_PA13, &pin_PA12, NULL, false);
common_hal_busio_spi_never_reset(spi);

displayio_fourwire_obj_t *bus = &displays[0].fourwire_bus;
bus->base.type = &displayio_fourwire_type;
common_hal_displayio_fourwire_construct(bus,
spi,
Expand All @@ -63,7 +63,7 @@ void board_init(void) {
0, // Polarity
0); // Phase

displayio_display_obj_t *display = &displays[0].display;
displayio_display_obj_t *display = &allocate_display()->display;
display->base.type = &displayio_display_type;
common_hal_displayio_display_construct(display,
bus,
Expand Down
9 changes: 5 additions & 4 deletions ports/atmel-samd/boards/openbook_m4/board.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,11 +57,11 @@ uint8_t refresh_sequence[] = {
};

void board_init(void) {
busio_spi_obj_t *spi = &displays[0].fourwire_bus.inline_bus;
displayio_fourwire_obj_t *bus = &allocate_display_bus()->fourwire_bus;
busio_spi_obj_t *spi = &bus->inline_bus;
common_hal_busio_spi_construct(spi, &pin_PB13, &pin_PB15, NULL, false);
common_hal_busio_spi_never_reset(spi);

displayio_fourwire_obj_t *bus = &displays[0].fourwire_bus;
bus->base.type = &displayio_fourwire_type;
common_hal_displayio_fourwire_construct(bus,
spi,
Expand All @@ -72,7 +72,7 @@ void board_init(void) {
0, // Polarity
0); // Phase

displayio_epaperdisplay_obj_t *display = &displays[0].epaper_display;
displayio_epaperdisplay_obj_t *display = &allocate_display()->epaper_display;
display->base.type = &displayio_epaperdisplay_type;
common_hal_displayio_epaperdisplay_construct(display,
bus,
Expand Down Expand Up @@ -106,7 +106,8 @@ void board_init(void) {
false, // chip_select (don't always toggle chip select)
false, // grayscale
false, // acep
false); // two_byte_sequence_length
false, // two_byte_sequence_length
false); // address_little_endian
}

// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
6 changes: 3 additions & 3 deletions ports/atmel-samd/boards/pewpew_lcd/board.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,11 +46,11 @@ uint8_t display_init_sequence[] = {
};

void board_init(void) {
busio_spi_obj_t *spi = &displays[0].fourwire_bus.inline_bus;
displayio_fourwire_obj_t *bus = &allocate_display_bus()->fourwire_bus;
busio_spi_obj_t *spi = &bus->inline_bus;
common_hal_busio_spi_construct(spi, &pin_PA23, &pin_PA22, NULL, false);
common_hal_busio_spi_never_reset(spi);

displayio_fourwire_obj_t *bus = &displays[0].fourwire_bus;
bus->base.type = &displayio_fourwire_type;
common_hal_displayio_fourwire_construct(bus,
spi,
Expand All @@ -61,7 +61,7 @@ void board_init(void) {
0, // Polarity
0); // Phase

displayio_display_obj_t *display = &displays[0].display;
displayio_display_obj_t *display = &allocate_display()->display;
display->base.type = &displayio_display_type;
common_hal_displayio_display_construct(display,
bus,
Expand Down
6 changes: 3 additions & 3 deletions ports/atmel-samd/boards/pewpew_m4/board.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,11 +97,11 @@ uint8_t display_init_sequence[] = {
};

void board_init(void) {
busio_spi_obj_t *spi = &displays[0].fourwire_bus.inline_bus;
displayio_fourwire_obj_t *bus = &allocate_display_bus()->fourwire_bus;
busio_spi_obj_t *spi = &bus->inline_bus;
common_hal_busio_spi_construct(spi, &pin_PA13, &pin_PA15, NULL, false);
common_hal_busio_spi_never_reset(spi);

displayio_fourwire_obj_t *bus = &displays[0].fourwire_bus;
bus->base.type = &displayio_fourwire_type;
common_hal_displayio_fourwire_construct(bus,
spi,
Expand All @@ -115,7 +115,7 @@ void board_init(void) {
uint32_t cfg0 = lookupCfg(CFG_DISPLAY_CFG0, 0x000000);
uint32_t offX = (cfg0 >> 8) & 0xff;
uint32_t offY = (cfg0 >> 16) & 0xff;
displayio_display_obj_t *display = &displays[0].display;
displayio_display_obj_t *display = &allocate_display()->display;
display->base.type = &displayio_display_type;
common_hal_displayio_display_construct(display,
bus,
Expand Down
6 changes: 3 additions & 3 deletions ports/atmel-samd/boards/pybadge/board.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,11 +68,11 @@ uint8_t display_init_sequence[] = {
};

void board_init(void) {
busio_spi_obj_t *spi = &displays[0].fourwire_bus.inline_bus;
displayio_fourwire_obj_t *bus = &allocate_display_bus()->fourwire_bus;
busio_spi_obj_t *spi = &bus->inline_bus;
common_hal_busio_spi_construct(spi, &pin_PB13, &pin_PB15, NULL, false);
common_hal_busio_spi_never_reset(spi);

displayio_fourwire_obj_t *bus = &displays[0].fourwire_bus;
bus->base.type = &displayio_fourwire_type;
common_hal_displayio_fourwire_construct(bus,
spi,
Expand All @@ -83,7 +83,7 @@ void board_init(void) {
0, // Polarity
0); // Phase

displayio_display_obj_t *display = &displays[0].display;
displayio_display_obj_t *display = &allocate_display()->display;
display->base.type = &displayio_display_type;
common_hal_displayio_display_construct(display,
bus,
Expand Down
6 changes: 3 additions & 3 deletions ports/atmel-samd/boards/pygamer/board.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,11 +70,11 @@ uint8_t display_init_sequence[] = {
};

void board_init(void) {
busio_spi_obj_t *spi = &displays[0].fourwire_bus.inline_bus;
displayio_fourwire_obj_t *bus = &allocate_display_bus()->fourwire_bus;
busio_spi_obj_t *spi = &bus->inline_bus;
common_hal_busio_spi_construct(spi, &pin_PB13, &pin_PB15, NULL, false);
common_hal_busio_spi_never_reset(spi);

displayio_fourwire_obj_t *bus = &displays[0].fourwire_bus;
bus->base.type = &displayio_fourwire_type;
common_hal_displayio_fourwire_construct(bus,
spi,
Expand All @@ -85,7 +85,7 @@ void board_init(void) {
0, // Polarity
0); // Phase

displayio_display_obj_t *display = &displays[0].display;
displayio_display_obj_t *display = &allocate_display()->display;
display->base.type = &displayio_display_type;
common_hal_displayio_display_construct(display,
bus,
Expand Down
4 changes: 2 additions & 2 deletions ports/atmel-samd/boards/pyportal/board.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ uint8_t display_init_sequence[] = {
};

void board_init(void) {
paralleldisplay_parallelbus_obj_t *bus = &displays[0].parallel_bus;
paralleldisplay_parallelbus_obj_t *bus = &allocate_display_bus()->parallel_bus;
bus->base.type = &paralleldisplay_parallelbus_type;
common_hal_paralleldisplay_parallelbus_construct(bus,
&pin_PA16, // Data0
Expand All @@ -72,7 +72,7 @@ void board_init(void) {
&pin_PA00, // Reset
0); // Frequency

displayio_display_obj_t *display = &displays[0].display;
displayio_display_obj_t *display = &allocate_display()->display;
display->base.type = &displayio_display_type;
common_hal_displayio_display_construct(display,
bus,
Expand Down
4 changes: 2 additions & 2 deletions ports/atmel-samd/boards/pyportal_titano/board.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ uint8_t display_init_sequence[] = {
};

void board_init(void) {
paralleldisplay_parallelbus_obj_t *bus = &displays[0].parallel_bus;
paralleldisplay_parallelbus_obj_t *bus = &allocate_display_bus()->parallel_bus;
bus->base.type = &paralleldisplay_parallelbus_type;
common_hal_paralleldisplay_parallelbus_construct(bus,
&pin_PA16, // Data0
Expand All @@ -89,7 +89,7 @@ void board_init(void) {
&pin_PA00, // Reset
0); // Frequency

displayio_display_obj_t *display = &displays[0].display;
displayio_display_obj_t *display = &allocate_display()->display;
display->base.type = &displayio_display_type;
common_hal_displayio_display_construct(display,
bus,
Expand Down
6 changes: 3 additions & 3 deletions ports/atmel-samd/boards/seeeduino_wio_terminal/board.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,11 +65,11 @@ uint8_t display_init_sequence[] = {
};

void board_init(void) {
busio_spi_obj_t *spi = &displays[0].fourwire_bus.inline_bus;
displayio_fourwire_obj_t *bus = &allocate_display_bus()->fourwire_bus;
busio_spi_obj_t *spi = &bus->inline_bus;
common_hal_busio_spi_construct(spi, &pin_PB20, &pin_PB19, NULL, false);
common_hal_busio_spi_never_reset(spi);

displayio_fourwire_obj_t *bus = &displays[0].fourwire_bus;
bus->base.type = &displayio_fourwire_type;
common_hal_displayio_fourwire_construct(bus,
spi,
Expand All @@ -80,7 +80,7 @@ void board_init(void) {
0, // Polarity
0); // Phase

displayio_display_obj_t *display = &displays[0].display;
displayio_display_obj_t *display = &allocate_display()->display;
display->base.type = &displayio_display_type;
common_hal_displayio_display_construct(display,
bus,
Expand Down
4 changes: 2 additions & 2 deletions ports/atmel-samd/boards/ugame10/board.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ uint8_t display_init_sequence[] = {
};

void board_init(void) {
displayio_fourwire_obj_t *bus = &displays[0].fourwire_bus;
displayio_fourwire_obj_t *bus = &allocate_display_bus()->fourwire_bus;
bus->base.type = &displayio_fourwire_type;
busio_spi_obj_t *spi = common_hal_board_create_spi(0);
common_hal_displayio_fourwire_construct(bus,
Expand All @@ -82,7 +82,7 @@ void board_init(void) {
0, // Polarity
0); // Phase

displayio_display_obj_t *display = &displays[0].display;
displayio_display_obj_t *display = &allocate_display()->display;
display->base.type = &displayio_display_type;
common_hal_displayio_display_construct(display,
bus,
Expand Down
2 changes: 1 addition & 1 deletion ports/broadcom/boards/diodes_delight_piunora/board.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ void board_init(void) {
fb->base.type = &videocore_framebuffer_type;
common_hal_videocore_framebuffer_construct(fb, 640, 480);

framebufferio_framebufferdisplay_obj_t *display = &displays[0].framebuffer_display;
framebufferio_framebufferdisplay_obj_t *display = &allocate_display()->framebuffer_display;
display->base.type = &framebufferio_framebufferdisplay_type;
common_hal_framebufferio_framebufferdisplay_construct(
display,
Expand Down
2 changes: 1 addition & 1 deletion ports/broadcom/boards/raspberrypi_cm4/board.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ void board_init(void) {
fb->base.type = &videocore_framebuffer_type;
common_hal_videocore_framebuffer_construct(fb, 640, 480);

framebufferio_framebufferdisplay_obj_t *display = &displays[0].framebuffer_display;
framebufferio_framebufferdisplay_obj_t *display = &allocate_display()->framebuffer_display;
display->base.type = &framebufferio_framebufferdisplay_type;
common_hal_framebufferio_framebufferdisplay_construct(
display,
Expand Down
2 changes: 1 addition & 1 deletion ports/broadcom/boards/raspberrypi_cm4io/board.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ void board_init(void) {
fb->base.type = &videocore_framebuffer_type;
common_hal_videocore_framebuffer_construct(fb, 640, 480);

framebufferio_framebufferdisplay_obj_t *display = &displays[0].framebuffer_display;
framebufferio_framebufferdisplay_obj_t *display = &allocate_display()->framebuffer_display;
display->base.type = &framebufferio_framebufferdisplay_type;
common_hal_framebufferio_framebufferdisplay_construct(
display,
Expand Down
2 changes: 1 addition & 1 deletion ports/broadcom/boards/raspberrypi_pi4b/board.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ void board_init(void) {
fb->base.type = &videocore_framebuffer_type;
common_hal_videocore_framebuffer_construct(fb, 640, 480);

framebufferio_framebufferdisplay_obj_t *display = &displays[0].framebuffer_display;
framebufferio_framebufferdisplay_obj_t *display = &allocate_display()->framebuffer_display;
display->base.type = &framebufferio_framebufferdisplay_type;
common_hal_framebufferio_framebufferdisplay_construct(
display,
Expand Down
2 changes: 1 addition & 1 deletion ports/broadcom/boards/raspberrypi_zero/board.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ void board_init(void) {
fb->base.type = &videocore_framebuffer_type;
common_hal_videocore_framebuffer_construct(fb, 640, 480);

framebufferio_framebufferdisplay_obj_t *display = &displays[0].framebuffer_display;
framebufferio_framebufferdisplay_obj_t *display = &allocate_display()->framebuffer_display;
display->base.type = &framebufferio_framebufferdisplay_type;
common_hal_framebufferio_framebufferdisplay_construct(
display,
Expand Down
2 changes: 1 addition & 1 deletion ports/broadcom/boards/raspberrypi_zero2w/board.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ void board_init(void) {
fb->base.type = &videocore_framebuffer_type;
common_hal_videocore_framebuffer_construct(fb, 640, 480);

framebufferio_framebufferdisplay_obj_t *display = &displays[0].framebuffer_display;
framebufferio_framebufferdisplay_obj_t *display = &allocate_display()->framebuffer_display;
display->base.type = &framebufferio_framebufferdisplay_type;
common_hal_framebufferio_framebufferdisplay_construct(
display,
Expand Down
2 changes: 1 addition & 1 deletion ports/broadcom/boards/raspberrypi_zero_w/board.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ void board_init(void) {
fb->base.type = &videocore_framebuffer_type;
common_hal_videocore_framebuffer_construct(fb, 640, 480);

framebufferio_framebufferdisplay_obj_t *display = &displays[0].framebuffer_display;
framebufferio_framebufferdisplay_obj_t *display = &allocate_display()->framebuffer_display;
display->base.type = &framebufferio_framebufferdisplay_type;
common_hal_framebufferio_framebufferdisplay_construct(
display,
Expand Down
6 changes: 3 additions & 3 deletions ports/espressif/boards/01space_lcd042_esp32c3/board.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,19 +55,19 @@ void board_init(void) {
busio_i2c_obj_t *i2c = common_hal_board_create_i2c(0);

// What we would do if it wasn't the shared board I2C: (for reference)
// busio_i2c_obj_t *i2c = &displays[0].i2cdisplay_bus.inline_bus;
// busio_i2c_obj_t *i2c = &allocate_display_bus()->i2cdisplay_bus.inline_bus;
// common_hal_busio_i2c_construct(i2c, &pin_GPIO23, &pin_GPIO22, 100000, 0);
// common_hal_busio_i2c_never_reset(i2c);

displayio_i2cdisplay_obj_t *bus = &displays[0].i2cdisplay_bus;
displayio_i2cdisplay_obj_t *bus = &allocate_display_bus()->i2cdisplay_bus;
bus->base.type = &displayio_i2cdisplay_type;
common_hal_displayio_i2cdisplay_construct(bus,
i2c,
0x3c,
NULL
);

displayio_display_obj_t *display = &displays[0].display;
displayio_display_obj_t *display = &allocate_display()->display;
display->base.type = &displayio_display_type;
common_hal_displayio_display_construct(display,
bus,
Expand Down
4 changes: 2 additions & 2 deletions ports/espressif/boards/adafruit_esp32s2_camera/board.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ uint8_t display_init_sequence[] = {

void board_init(void) {
busio_spi_obj_t *spi = common_hal_board_create_spi(0);
displayio_fourwire_obj_t *bus = &displays[0].fourwire_bus;
displayio_fourwire_obj_t *bus = &allocate_display_bus()->fourwire_bus;
bus->base.type = &displayio_fourwire_type;
common_hal_displayio_fourwire_construct(bus,
spi,
Expand All @@ -63,7 +63,7 @@ void board_init(void) {
0, // Polarity
0); // Phase

displayio_display_obj_t *display = &displays[0].display;
displayio_display_obj_t *display = &allocate_display()->display;
display->base.type = &displayio_display_type;
common_hal_displayio_display_construct(
display,
Expand Down
4 changes: 2 additions & 2 deletions ports/espressif/boards/adafruit_feather_esp32s2_reverse_tft/board.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ uint8_t display_init_sequence[] = {

void board_init(void) {
busio_spi_obj_t *spi = common_hal_board_create_spi(0);
displayio_fourwire_obj_t *bus = &displays[0].fourwire_bus;
displayio_fourwire_obj_t *bus = &allocate_display_bus()->fourwire_bus;
bus->base.type = &displayio_fourwire_type;

common_hal_displayio_fourwire_construct(
Expand All @@ -85,7 +85,7 @@ void board_init(void) {
0, // polarity
0 // phase
);
displayio_display_obj_t *display = &displays[0].display;
displayio_display_obj_t *display = &allocate_display()->display;
display->base.type = &displayio_display_type;

common_hal_displayio_display_construct(
Expand Down
Loading