Skip to content

Commit 5536e57

Browse files
mdroberts1243mdroberts1243
committed
Changes to compile cleanly
1 parent 08189ed commit 5536e57

6 files changed

Lines changed: 16 additions & 5 deletions

File tree

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,7 @@ TAGS
8080
*.mo
8181

8282
.vscode
83+
.idea
8384

8485
# Python Virtual Environments
8586
####################

‎shared-bindings/displayio/Display.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@
112112
//| ...
113113
//|
114114
STATIC mp_obj_t displayio_display_make_new(const mp_obj_type_t *type, size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
115-
enum { ARG_display_bus, ARG_init_sequence, ARG_width, ARG_height, ARG_colstart, ARG_rowstart, ARG_rotation, ARG_color_depth, ARG_grayscale, ARG_pixels_in_byte_share_row, ARG_bytes_per_cell, ARG_reverse_pixels_in_byte, ARG_reverse_bytes_in_word, ARG_set_column_command, ARG_set_row_command, ARG_write_ram_command, ARG_set_vertical_scroll, ARG_backlight_pin, ARG_brightness_command, ARG_brightness, ARG_auto_brightness, ARG_single_byte_bounds, ARG_data_as_commands, ARG_auto_refresh, ARG_native_frames_per_second, ARG_backlight_on_high };
115+
enum { ARG_display_bus, ARG_init_sequence, ARG_width, ARG_height, ARG_colstart, ARG_rowstart, ARG_rotation, ARG_color_depth, ARG_grayscale, ARG_pixels_in_byte_share_row, ARG_bytes_per_cell, ARG_reverse_pixels_in_byte, ARG_reverse_bytes_in_word, ARG_set_column_command, ARG_set_row_command, ARG_write_ram_command, ARG_set_vertical_scroll, ARG_backlight_pin, ARG_brightness_command, ARG_brightness, ARG_auto_brightness, ARG_single_byte_bounds, ARG_data_as_commands, ARG_auto_refresh, ARG_native_frames_per_second, ARG_backlight_on_high, ARG_column_and_page_addressing };
116116
static const mp_arg_t allowed_args[] = {
117117
{ MP_QSTR_display_bus, MP_ARG_REQUIRED | MP_ARG_OBJ },
118118
{ MP_QSTR_init_sequence, MP_ARG_REQUIRED | MP_ARG_OBJ },

‎shared-module/displayio/Display.c‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -288,7 +288,9 @@ STATIC bool _refresh_area(displayio_display_obj_t* self, const displayio_area_t*
288288
}
289289
remaining_rows -= rows_per_buffer;
290290

291-
displayio_display_core_set_region_to_update(&self->core, self->set_column_command, self->set_row_command, NO_COMMAND, NO_COMMAND, self->data_as_commands, false, &subrectangle);
291+
displayio_display_core_set_region_to_update(&self->core, self->set_column_command,
292+
self->set_row_command, NO_COMMAND, NO_COMMAND, self->data_as_commands, false,
293+
&subrectangle, self->column_and_page_addressing);
292294

293295
uint16_t subrectangle_size_bytes;
294296
if (self->core.colorspace.depth >= 8) {

‎shared-module/displayio/EPaperDisplay.c‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,9 @@ bool displayio_epaperdisplay_refresh_area(displayio_epaperdisplay_obj_t* self, c
239239
uint16_t remaining_rows = displayio_area_height(&clipped);
240240

241241
if (self->set_row_window_command != NO_COMMAND) {
242-
displayio_display_core_set_region_to_update(&self->core, self->set_column_window_command, self->set_row_window_command, self->set_current_column_command, self->set_current_row_command, false, self->chip_select, &clipped);
242+
displayio_display_core_set_region_to_update(&self->core, self->set_column_window_command,
243+
self->set_row_window_command, self->set_current_column_command, self->set_current_row_command,
244+
false, self->chip_select, &clipped, false);
243245
}
244246

245247
uint8_t write_command = self->write_black_ram_command;

‎shared-module/displayio/display_core.c‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,10 @@ void displayio_display_core_end_transaction(displayio_display_core_t* self) {
208208
self->end_transaction(self->bus);
209209
}
210210

211-
void displayio_display_core_set_region_to_update(displayio_display_core_t* self, uint8_t column_command, uint8_t row_command, uint16_t set_current_column_command, uint16_t set_current_row_command, bool data_as_commands, bool always_toggle_chip_select, displayio_area_t* area) {
211+
void displayio_display_core_set_region_to_update(displayio_display_core_t* self, uint8_t column_command,
212+
uint8_t row_command, uint16_t set_current_column_command, uint16_t set_current_row_command,
213+
bool data_as_commands, bool always_toggle_chip_select,
214+
displayio_area_t* area, bool column_and_page_addressing) {
212215
uint16_t x1 = area->x1;
213216
uint16_t x2 = area->x2;
214217
uint16_t y1 = area->y1;

‎shared-module/displayio/display_core.h‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,10 @@ bool displayio_display_core_bus_free(displayio_display_core_t *self);
7474
bool displayio_display_core_begin_transaction(displayio_display_core_t* self);
7575
void displayio_display_core_end_transaction(displayio_display_core_t* self);
7676

77-
void displayio_display_core_set_region_to_update(displayio_display_core_t* self, uint8_t column_command, uint8_t row_command, uint16_t set_current_column_command, uint16_t set_current_row_command, bool data_as_commands, bool always_toggle_chip_select, displayio_area_t* area);
77+
void displayio_display_core_set_region_to_update(displayio_display_core_t* self, uint8_t column_command,
78+
uint8_t row_command, uint16_t set_current_column_command, uint16_t set_current_row_command,
79+
bool data_as_commands, bool always_toggle_chip_select,
80+
displayio_area_t* area, bool column_and_page_addressing);
7881

7982
void release_display_core(displayio_display_core_t* self);
8083

0 commit comments

Comments
 (0)