Skip to content

Commit 16a8a34

Browse files
tannewttannewt
authored
Merge pull request adafruit#2117 from pewpew-game/stage-fix-transaction
Fix transactions in _stage after displayio changes
2 parents 321835c + 5f6228b commit 16a8a34

2 files changed

Lines changed: 24 additions & 16 deletions

File tree

‎shared-bindings/_stage/__init__.c‎

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -96,21 +96,8 @@ STATIC mp_obj_t stage_render(size_t n_args, const mp_obj_t *args) {
9696
scale = mp_obj_get_int(args[7]);
9797
}
9898

99-
// TODO: Everything below should be in shared-module because it's not argument parsing.
100-
while (!displayio_display_core_begin_transaction(&display->core)) {
101-
RUN_BACKGROUND_TASKS;
102-
}
103-
displayio_area_t area;
104-
area.x1 = x0;
105-
area.y1 = y0;
106-
area.x2 = x1;
107-
area.y2 = y1;
108-
displayio_display_core_set_region_to_update(&display->core, display->set_column_command, display->set_row_command, NO_COMMAND, NO_COMMAND, display->data_as_commands, false, &area);
109-
110-
display->core.send(display->core.bus, DISPLAY_COMMAND, CHIP_SELECT_TOGGLE_EVERY_BYTE, &display->write_ram_command, 1);
11199
render_stage(x0, y0, x1, y1, layers, layers_size, buffer, buffer_size,
112100
display, scale);
113-
displayio_display_core_end_transaction(&display->core);
114101

115102
return mp_const_none;
116103
}

‎shared-module/_stage/__init__.c‎

Lines changed: 24 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,22 @@ void render_stage(uint16_t x0, uint16_t y0, uint16_t x1, uint16_t y1,
3636
uint16_t *buffer, size_t buffer_size,
3737
displayio_display_obj_t *display, uint8_t scale) {
3838

39+
40+
displayio_area_t area;
41+
area.x1 = x0;
42+
area.y1 = y0;
43+
area.x2 = x1;
44+
area.y2 = y1;
45+
displayio_display_core_set_region_to_update(
46+
&display->core, display->set_column_command, display->set_row_command,
47+
NO_COMMAND, NO_COMMAND, display->data_as_commands, false, &area);
48+
49+
while (!displayio_display_core_begin_transaction(&display->core)) {
50+
RUN_BACKGROUND_TASKS;
51+
}
52+
display->core.send(display->core.bus, DISPLAY_COMMAND,
53+
CHIP_SELECT_TOGGLE_EVERY_BYTE,
54+
&display->write_ram_command, 1);
3955
size_t index = 0;
4056
for (uint16_t y = y0; y < y1; ++y) {
4157
for (uint8_t yscale = 0; yscale < scale; ++yscale) {
@@ -57,8 +73,9 @@ void render_stage(uint16_t x0, uint16_t y0, uint16_t x1, uint16_t y1,
5773
index += 1;
5874
// The buffer is full, send it.
5975
if (index >= buffer_size) {
60-
display->core.send(display->core.bus, DISPLAY_DATA, CHIP_SELECT_UNTOUCHED, ((uint8_t*)buffer),
61-
buffer_size * 2);
76+
display->core.send(display->core.bus, DISPLAY_DATA,
77+
CHIP_SELECT_UNTOUCHED,
78+
((uint8_t*)buffer), buffer_size * 2);
6279
index = 0;
6380
}
6481
}
@@ -67,6 +84,10 @@ void render_stage(uint16_t x0, uint16_t y0, uint16_t x1, uint16_t y1,
6784
}
6885
// Send the remaining data.
6986
if (index) {
70-
display->core.send(display->core.bus, DISPLAY_DATA, CHIP_SELECT_UNTOUCHED, ((uint8_t*)buffer), index * 2);
87+
display->core.send(display->core.bus, DISPLAY_DATA,
88+
CHIP_SELECT_UNTOUCHED,
89+
((uint8_t*)buffer), index * 2);
7190
}
91+
92+
displayio_display_core_end_transaction(&display->core);
7293
}

0 commit comments

Comments
 (0)