Skip to content

Commit e1df598

Browse files
tannewttannewt
committed
Split displayio hardware support from core
These are moved: * Display -> busdisplay.BusDisplay * FourWire -> fourwire.FourWire * EPaperDisplay -> epaperdisplay.EPaperDisplay * I2CDisplay -> i2cdisplaybus.I2CDisplayBus `paralleldisplay` is now `paralleldisplaybus` (and registered as `paralleldisplay` too). Bus related helpers are split out of display_core into bus_core. It is in still displayio since it is a dependency of both busdisplay and epaperdisplay. Fixes adafruit#7667
1 parent 168c40e commit e1df598

126 files changed

Lines changed: 1900 additions & 1576 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎main.c‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,10 @@
9494
#include "shared-module/displayio/__init__.h"
9595
#endif
9696

97+
#if CIRCUITPY_EPAPERDISPLAY
98+
#include "shared-bindings/epaperdisplay/EPaperDisplay.h"
99+
#endif
100+
97101
#if CIRCUITPY_KEYPAD
98102
#include "shared-module/keypad/__init__.h"
99103
#endif
@@ -534,7 +538,7 @@ STATIC bool run_code_py(safe_mode_t safe_mode, bool *simulate_reset) {
534538

535539
// Program has finished running.
536540
bool printed_press_any_key = false;
537-
#if CIRCUITPY_DISPLAYIO
541+
#if CIRCUITPY_EPAPERDISPLAY
538542
size_t time_to_epaper_refresh = 1;
539543
#endif
540544

@@ -682,7 +686,7 @@ STATIC bool run_code_py(safe_mode_t safe_mode, bool *simulate_reset) {
682686
// Refresh the ePaper display if we have one. That way it'll show an error message.
683687
// Skip if we're about to autoreload. Otherwise we may delay when user code can update
684688
// the display.
685-
#if CIRCUITPY_DISPLAYIO
689+
#if CIRCUITPY_EPAPERDISPLAY
686690
if (time_to_epaper_refresh > 0 && !autoreload_pending()) {
687691
time_to_epaper_refresh = maybe_refresh_epaperdisplay();
688692
}
@@ -724,7 +728,7 @@ STATIC bool run_code_py(safe_mode_t safe_mode, bool *simulate_reset) {
724728
}
725729
time_to_next_change = total_time - tick_diff;
726730
}
727-
#if CIRCUITPY_DISPLAYIO
731+
#if CIRCUITPY_EPAPERDISPLAY
728732
if (time_to_epaper_refresh > 0 && time_to_next_change > 0) {
729733
time_to_next_change = MIN(time_to_next_change, time_to_epaper_refresh);
730734
}

‎ports/atmel-samd/boards/hallowing_m0_express/board.c‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,12 @@
2727
#include "supervisor/board.h"
2828

2929
#include "shared-bindings/board/__init__.h"
30-
#include "shared-bindings/displayio/FourWire.h"
30+
#include "shared-bindings/fourwire/FourWire.h"
3131
#include "shared-module/displayio/__init__.h"
3232
#include "shared-module/displayio/mipi_constants.h"
3333
#include "shared-bindings/busio/SPI.h"
3434

35-
displayio_fourwire_obj_t board_display_obj;
35+
fourwire_fourwire_obj_t board_display_obj;
3636

3737
#define DELAY 0x80
3838

@@ -69,11 +69,11 @@ uint8_t display_init_sequence[] = {
6969
};
7070

7171
void board_init(void) {
72-
displayio_fourwire_obj_t *bus = &allocate_display_bus()->fourwire_bus;
73-
bus->base.type = &displayio_fourwire_type;
72+
fourwire_fourwire_obj_t *bus = &allocate_display_bus()->fourwire_bus;
73+
bus->base.type = &fourwire_fourwire_type;
7474
busio_spi_obj_t *spi = common_hal_board_create_spi(0);
7575
common_hal_busio_spi_never_reset(spi);
76-
common_hal_displayio_fourwire_construct(bus,
76+
common_hal_fourwire_fourwire_construct(bus,
7777
spi,
7878
&pin_PA28, // Command or data
7979
&pin_PA01, // Chip select
@@ -82,9 +82,9 @@ void board_init(void) {
8282
0, // Polarity
8383
0); // Phase
8484

85-
displayio_display_obj_t *display = &allocate_display()->display;
86-
display->base.type = &displayio_display_type;
87-
common_hal_displayio_display_construct(display,
85+
busdisplay_busdisplay_obj_t *display = &allocate_display()->display;
86+
display->base.type = &busdisplay_busdisplay_type;
87+
common_hal_busdisplay_busdisplay_construct(display,
8888
bus,
8989
128, // Width
9090
128, // Height

‎ports/atmel-samd/boards/hallowing_m4_express/board.c‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,12 @@
2828
#include "mpconfigboard.h"
2929
#include "hal/include/hal_gpio.h"
3030
#include "shared-bindings/busio/SPI.h"
31-
#include "shared-bindings/displayio/FourWire.h"
31+
#include "shared-bindings/busdisplay/BusDisplay.h"
32+
#include "shared-bindings/fourwire/FourWire.h"
3233
#include "shared-module/displayio/__init__.h"
3334
#include "shared-module/displayio/mipi_constants.h"
3435

35-
displayio_fourwire_obj_t board_display_obj;
36+
fourwire_fourwire_obj_t board_display_obj;
3637

3738
#define DELAY 0x80
3839

@@ -47,13 +48,13 @@ uint8_t display_init_sequence[] = {
4748
};
4849

4950
void board_init(void) {
50-
displayio_fourwire_obj_t *bus = &allocate_display_bus()->fourwire_bus;
51+
fourwire_fourwire_obj_t *bus = &allocate_display_bus()->fourwire_bus;
5152
busio_spi_obj_t *spi = &bus->inline_bus;
5253
common_hal_busio_spi_construct(spi, &pin_PA01, &pin_PA00, NULL, false);
5354
common_hal_busio_spi_never_reset(spi);
5455

55-
bus->base.type = &displayio_fourwire_type;
56-
common_hal_displayio_fourwire_construct(bus,
56+
bus->base.type = &fourwire_fourwire_type;
57+
common_hal_fourwire_fourwire_construct(bus,
5758
spi,
5859
&pin_PB31, // TFT_DC Command or data
5960
&pin_PA27, // TFT_CS Chip select
@@ -62,9 +63,9 @@ void board_init(void) {
6263
0, // Polarity
6364
0); // Phase
6465

65-
displayio_display_obj_t *display = &allocate_display()->display;
66-
display->base.type = &displayio_display_type;
67-
common_hal_displayio_display_construct(display,
66+
busdisplay_busdisplay_obj_t *display = &allocate_display()->display;
67+
display->base.type = &busdisplay_busdisplay_type;
68+
common_hal_busdisplay_busdisplay_construct(display,
6869
bus,
6970
240, // Width (after rotation)
7071
240, // Height (after rotation)

‎ports/atmel-samd/boards/monster_m4sk/board.c‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,11 @@
2828
#include "mpconfigboard.h"
2929
#include "hal/include/hal_gpio.h"
3030
#include "shared-bindings/busio/SPI.h"
31-
#include "shared-bindings/displayio/FourWire.h"
31+
#include "shared-bindings/fourwire/FourWire.h"
3232
#include "shared-module/displayio/__init__.h"
3333
#include "shared-module/displayio/mipi_constants.h"
3434

35-
displayio_fourwire_obj_t board_display_obj;
35+
fourwire_fourwire_obj_t board_display_obj;
3636

3737
#define DELAY 0x80
3838

@@ -48,13 +48,13 @@ uint8_t display_init_sequence[] = {
4848
};
4949

5050
void board_init(void) {
51-
displayio_fourwire_obj_t *bus = &allocate_display_bus()->fourwire_bus;
51+
fourwire_fourwire_obj_t *bus = &allocate_display_bus()->fourwire_bus;
5252
busio_spi_obj_t *spi = &bus->inline_bus;
5353
common_hal_busio_spi_construct(spi, &pin_PA13, &pin_PA12, NULL, false);
5454
common_hal_busio_spi_never_reset(spi);
5555

56-
bus->base.type = &displayio_fourwire_type;
57-
common_hal_displayio_fourwire_construct(bus,
56+
bus->base.type = &fourwire_fourwire_type;
57+
common_hal_fourwire_fourwire_construct(bus,
5858
spi,
5959
&pin_PA07, // TFT_DC Command or data
6060
&pin_PA06, // TFT_CS Chip select
@@ -63,9 +63,9 @@ void board_init(void) {
6363
0, // Polarity
6464
0); // Phase
6565

66-
displayio_display_obj_t *display = &allocate_display()->display;
67-
display->base.type = &displayio_display_type;
68-
common_hal_displayio_display_construct(display,
66+
busdisplay_busdisplay_obj_t *display = &allocate_display()->display;
67+
display->base.type = &busdisplay_busdisplay_type;
68+
common_hal_busdisplay_busdisplay_construct(display,
6969
bus,
7070
240, // Width (after rotation)
7171
240, // Height (after rotation)

‎ports/atmel-samd/boards/openbook_m4/board.c‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,12 @@
2828
#include "mpconfigboard.h"
2929
#include "hal/include/hal_gpio.h"
3030
#include "shared-bindings/busio/SPI.h"
31-
#include "shared-bindings/displayio/FourWire.h"
31+
#include "shared-bindings/fourwire/FourWire.h"
3232
#include "shared-bindings/time/__init__.h"
3333
#include "shared-module/displayio/__init__.h"
3434
#include "shared-module/displayio/mipi_constants.h"
3535

36-
displayio_fourwire_obj_t board_display_obj;
36+
fourwire_fourwire_obj_t board_display_obj;
3737

3838
#define DELAY 0x80
3939
#define HEIGHT 400
@@ -57,13 +57,13 @@ uint8_t refresh_sequence[] = {
5757
};
5858

5959
void board_init(void) {
60-
displayio_fourwire_obj_t *bus = &allocate_display_bus()->fourwire_bus;
60+
fourwire_fourwire_obj_t *bus = &allocate_display_bus()->fourwire_bus;
6161
busio_spi_obj_t *spi = &bus->inline_bus;
6262
common_hal_busio_spi_construct(spi, &pin_PB13, &pin_PB15, NULL, false);
6363
common_hal_busio_spi_never_reset(spi);
6464

65-
bus->base.type = &displayio_fourwire_type;
66-
common_hal_displayio_fourwire_construct(bus,
65+
bus->base.type = &fourwire_fourwire_type;
66+
common_hal_fourwire_fourwire_construct(bus,
6767
spi,
6868
&pin_PB05, // EPD_DC Command or data
6969
&pin_PB07, // EPD_CS Chip select
@@ -72,9 +72,9 @@ void board_init(void) {
7272
0, // Polarity
7373
0); // Phase
7474

75-
displayio_epaperdisplay_obj_t *display = &allocate_display()->epaper_display;
76-
display->base.type = &displayio_epaperdisplay_type;
77-
common_hal_displayio_epaperdisplay_construct(display,
75+
epaperdisplay_epaperdisplay_obj_t *display = &allocate_display()->epaper_display;
76+
display->base.type = &epaperdisplay_epaperdisplay_type;
77+
common_hal_epaperdisplay_epaperdisplay_construct(display,
7878
bus,
7979
start_sequence,
8080
sizeof(start_sequence),

‎ports/atmel-samd/boards/pewpew_lcd/board.c‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,12 @@
2727
#include "supervisor/board.h"
2828

2929
#include "shared-bindings/board/__init__.h"
30-
#include "shared-bindings/displayio/FourWire.h"
30+
#include "shared-bindings/fourwire/FourWire.h"
3131
#include "shared-module/displayio/__init__.h"
3232
#include "shared-module/displayio/mipi_constants.h"
3333
#include "shared-bindings/busio/SPI.h"
3434

35-
displayio_fourwire_obj_t board_display_obj;
35+
fourwire_fourwire_obj_t board_display_obj;
3636

3737
#define DELAY 0x80
3838

@@ -46,13 +46,13 @@ uint8_t display_init_sequence[] = {
4646
};
4747

4848
void board_init(void) {
49-
displayio_fourwire_obj_t *bus = &allocate_display_bus()->fourwire_bus;
49+
fourwire_fourwire_obj_t *bus = &allocate_display_bus()->fourwire_bus;
5050
busio_spi_obj_t *spi = &bus->inline_bus;
5151
common_hal_busio_spi_construct(spi, &pin_PA23, &pin_PA22, NULL, false);
5252
common_hal_busio_spi_never_reset(spi);
5353

54-
bus->base.type = &displayio_fourwire_type;
55-
common_hal_displayio_fourwire_construct(bus,
54+
bus->base.type = &fourwire_fourwire_type;
55+
common_hal_fourwire_fourwire_construct(bus,
5656
spi,
5757
NULL, // Command or data
5858
&pin_PA19, // Chip select
@@ -61,9 +61,9 @@ void board_init(void) {
6161
0, // Polarity
6262
0); // Phase
6363

64-
displayio_display_obj_t *display = &allocate_display()->display;
65-
display->base.type = &displayio_display_type;
66-
common_hal_displayio_display_construct(display,
64+
busdisplay_busdisplay_obj_t *display = &allocate_display()->display;
65+
display->base.type = &busdisplay_busdisplay_type;
66+
common_hal_busdisplay_busdisplay_construct(display,
6767
bus,
6868
96, // Width
6969
68, // Height

‎ports/atmel-samd/boards/pewpew_m4/board.c‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,11 @@
2929
#include "mpconfigboard.h"
3030
#include "hal/include/hal_gpio.h"
3131
#include "shared-bindings/busio/SPI.h"
32-
#include "shared-bindings/displayio/FourWire.h"
32+
#include "shared-bindings/fourwire/FourWire.h"
3333
#include "shared-module/displayio/__init__.h"
3434
#include "shared-module/displayio/mipi_constants.h"
3535

36-
displayio_fourwire_obj_t board_display_obj;
36+
fourwire_fourwire_obj_t board_display_obj;
3737

3838
typedef struct {
3939
const uint32_t *config_data;
@@ -97,13 +97,13 @@ uint8_t display_init_sequence[] = {
9797
};
9898

9999
void board_init(void) {
100-
displayio_fourwire_obj_t *bus = &allocate_display_bus()->fourwire_bus;
100+
fourwire_fourwire_obj_t *bus = &allocate_display_bus()->fourwire_bus;
101101
busio_spi_obj_t *spi = &bus->inline_bus;
102102
common_hal_busio_spi_construct(spi, &pin_PA13, &pin_PA15, NULL, false);
103103
common_hal_busio_spi_never_reset(spi);
104104

105-
bus->base.type = &displayio_fourwire_type;
106-
common_hal_displayio_fourwire_construct(bus,
105+
bus->base.type = &fourwire_fourwire_type;
106+
common_hal_fourwire_fourwire_construct(bus,
107107
spi,
108108
&pin_PA16, // TFT_DC Command or data
109109
&pin_PA11, // TFT_CS Chip select
@@ -115,9 +115,9 @@ void board_init(void) {
115115
uint32_t cfg0 = lookupCfg(CFG_DISPLAY_CFG0, 0x000000);
116116
uint32_t offX = (cfg0 >> 8) & 0xff;
117117
uint32_t offY = (cfg0 >> 16) & 0xff;
118-
displayio_display_obj_t *display = &allocate_display()->display;
119-
display->base.type = &displayio_display_type;
120-
common_hal_displayio_display_construct(display,
118+
busdisplay_busdisplay_obj_t *display = &allocate_display()->display;
119+
display->base.type = &busdisplay_busdisplay_type;
120+
common_hal_busdisplay_busdisplay_construct(display,
121121
bus,
122122
160, // Width (after rotation)
123123
128, // Height (after rotation)

‎ports/atmel-samd/boards/pybadge/board.c‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
#include "mpconfigboard.h"
2929
#include "hal/include/hal_gpio.h"
3030
#include "shared-bindings/busio/SPI.h"
31-
#include "shared-bindings/displayio/FourWire.h"
31+
#include "shared-bindings/fourwire/FourWire.h"
3232
#include "shared-module/displayio/__init__.h"
3333
#include "shared-module/displayio/mipi_constants.h"
3434
#include "supervisor/shared/board.h"
@@ -68,13 +68,13 @@ uint8_t display_init_sequence[] = {
6868
};
6969

7070
void board_init(void) {
71-
displayio_fourwire_obj_t *bus = &allocate_display_bus()->fourwire_bus;
71+
fourwire_fourwire_obj_t *bus = &allocate_display_bus()->fourwire_bus;
7272
busio_spi_obj_t *spi = &bus->inline_bus;
7373
common_hal_busio_spi_construct(spi, &pin_PB13, &pin_PB15, NULL, false);
7474
common_hal_busio_spi_never_reset(spi);
7575

76-
bus->base.type = &displayio_fourwire_type;
77-
common_hal_displayio_fourwire_construct(bus,
76+
bus->base.type = &fourwire_fourwire_type;
77+
common_hal_fourwire_fourwire_construct(bus,
7878
spi,
7979
&pin_PB05, // TFT_DC Command or data
8080
&pin_PB07, // TFT_CS Chip select
@@ -83,9 +83,9 @@ void board_init(void) {
8383
0, // Polarity
8484
0); // Phase
8585

86-
displayio_display_obj_t *display = &allocate_display()->display;
87-
display->base.type = &displayio_display_type;
88-
common_hal_displayio_display_construct(display,
86+
busdisplay_busdisplay_obj_t *display = &allocate_display()->display;
87+
display->base.type = &busdisplay_busdisplay_type;
88+
common_hal_busdisplay_busdisplay_construct(display,
8989
bus,
9090
160, // Width (after rotation)
9191
128, // Height (after rotation)

‎ports/atmel-samd/boards/pygamer/board.c‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,12 @@
2828
#include "mpconfigboard.h"
2929
#include "hal/include/hal_gpio.h"
3030
#include "shared-bindings/busio/SPI.h"
31-
#include "shared-bindings/displayio/FourWire.h"
31+
#include "shared-bindings/fourwire/FourWire.h"
3232
#include "shared-module/displayio/__init__.h"
3333
#include "shared-module/displayio/mipi_constants.h"
3434
#include "supervisor/shared/board.h"
3535

36-
displayio_fourwire_obj_t board_display_obj;
36+
fourwire_fourwire_obj_t board_display_obj;
3737

3838
#define DELAY 0x80
3939

@@ -70,13 +70,13 @@ uint8_t display_init_sequence[] = {
7070
};
7171

7272
void board_init(void) {
73-
displayio_fourwire_obj_t *bus = &allocate_display_bus()->fourwire_bus;
73+
fourwire_fourwire_obj_t *bus = &allocate_display_bus()->fourwire_bus;
7474
busio_spi_obj_t *spi = &bus->inline_bus;
7575
common_hal_busio_spi_construct(spi, &pin_PB13, &pin_PB15, NULL, false);
7676
common_hal_busio_spi_never_reset(spi);
7777

78-
bus->base.type = &displayio_fourwire_type;
79-
common_hal_displayio_fourwire_construct(bus,
78+
bus->base.type = &fourwire_fourwire_type;
79+
common_hal_fourwire_fourwire_construct(bus,
8080
spi,
8181
&pin_PB05, // TFT_DC Command or data
8282
&pin_PB12, // TFT_CS Chip select
@@ -85,9 +85,9 @@ void board_init(void) {
8585
0, // Polarity
8686
0); // Phase
8787

88-
displayio_display_obj_t *display = &allocate_display()->display;
89-
display->base.type = &displayio_display_type;
90-
common_hal_displayio_display_construct(display,
88+
busdisplay_busdisplay_obj_t *display = &allocate_display()->display;
89+
display->base.type = &busdisplay_busdisplay_type;
90+
common_hal_busdisplay_busdisplay_construct(display,
9191
bus,
9292
160, // Width
9393
128, // Height

0 commit comments

Comments
 (0)