summaryrefslogtreecommitdiff
path: root/shared-module
diff options
context:
space:
mode:
authorMark Roberts <mdroberts1243@gmail.com>2020-09-29 15:37:06 -0400
committerScott Shawcroft <scott@tannewt.org>2020-09-30 11:06:13 -0700
commit9f19a8a7600ad59851953a7c0454d09245eadf4d (patch)
tree2abc79539b7fcb03a4aed6d0a2a511187f6d30f8 /shared-module
parentb1e1237887945f6499b8884594b14e8bc4c5afbd (diff)
Ran pre-commit locally
Diffstat (limited to 'shared-module')
-rw-r--r--shared-module/displayio/Display.c8
-rw-r--r--shared-module/displayio/EPaperDisplay.c4
-rw-r--r--shared-module/displayio/display_core.c8
-rw-r--r--shared-module/displayio/display_core.h6
4 files changed, 13 insertions, 13 deletions
diff --git a/shared-module/displayio/Display.c b/shared-module/displayio/Display.c
index 9864e9f9d..f2b8e0447 100644
--- a/shared-module/displayio/Display.c
+++ b/shared-module/displayio/Display.c
@@ -48,7 +48,7 @@ void common_hal_displayio_display_construct(displayio_display_obj_t* self,
uint8_t set_row_command, uint8_t write_ram_command, uint8_t set_vertical_scroll,
uint8_t* init_sequence, uint16_t init_sequence_len, const mcu_pin_obj_t* backlight_pin,
uint16_t brightness_command, mp_float_t brightness, bool auto_brightness,
- bool single_byte_bounds, bool data_as_commands, bool auto_refresh, uint16_t native_frames_per_second,
+ bool single_byte_bounds, bool data_as_commands, bool auto_refresh, uint16_t native_frames_per_second,
bool backlight_on_high, bool SH1107_addressing) {
// Turn off auto-refresh as we init.
@@ -246,7 +246,7 @@ STATIC bool _refresh_area(displayio_display_obj_t* self, const displayio_area_t*
uint16_t rows_per_buffer = displayio_area_height(&clipped);
uint8_t pixels_per_word = (sizeof(uint32_t) * 8) / self->core.colorspace.depth;
uint16_t pixels_per_buffer = displayio_area_size(&clipped);
-
+
uint16_t subrectangles = 1;
// for SH1107 and other boundary constrained controllers
// write one single row at a time
@@ -299,8 +299,8 @@ STATIC bool _refresh_area(displayio_display_obj_t* self, const displayio_area_t*
}
remaining_rows -= rows_per_buffer;
- 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,
+ 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, self->SH1107_addressing);
uint16_t subrectangle_size_bytes;
diff --git a/shared-module/displayio/EPaperDisplay.c b/shared-module/displayio/EPaperDisplay.c
index 3391a56b4..5b055e62e 100644
--- a/shared-module/displayio/EPaperDisplay.c
+++ b/shared-module/displayio/EPaperDisplay.c
@@ -240,8 +240,8 @@ bool displayio_epaperdisplay_refresh_area(displayio_epaperdisplay_obj_t* self, c
// added false parameter at end for SH1107_addressing quirk
if (self->set_row_window_command != NO_COMMAND) {
- 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,
+ 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, false);
}
diff --git a/shared-module/displayio/display_core.c b/shared-module/displayio/display_core.c
index eb8c8f3b4..c592202fb 100644
--- a/shared-module/displayio/display_core.c
+++ b/shared-module/displayio/display_core.c
@@ -57,7 +57,7 @@ void displayio_display_core_construct(displayio_display_core_t* self,
self->colstart = colstart;
self->rowstart = rowstart;
self->last_refresh = 0;
-
+
// (framebufferdisplay already validated its 'bus' is a buffer-protocol object)
if (bus) {
if (MP_OBJ_IS_TYPE(bus, &displayio_parallelbus_type)) {
@@ -208,9 +208,9 @@ void displayio_display_core_end_transaction(displayio_display_core_t* self) {
self->end_transaction(self->bus);
}
-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,
+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, bool SH1107_addressing) {
uint16_t x1 = area->x1;
uint16_t x2 = area->x2;
diff --git a/shared-module/displayio/display_core.h b/shared-module/displayio/display_core.h
index ad9998a2f..3b45f7946 100644
--- a/shared-module/displayio/display_core.h
+++ b/shared-module/displayio/display_core.h
@@ -74,9 +74,9 @@ bool displayio_display_core_bus_free(displayio_display_core_t *self);
bool displayio_display_core_begin_transaction(displayio_display_core_t* self);
void displayio_display_core_end_transaction(displayio_display_core_t* self);
-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,
+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, bool SH1107_addressing);
void release_display_core(displayio_display_core_t* self);