X-Git-Url: https://git.ayoreis.com/hackapet/Adafruit_Blinka_Displayio.git/blobdiff_plain/cfee25c8ae316776ce54589eae64409ea41bc42b..b39699fa4b1ed4838b72d068f0c13fdf62ef95de:/displayio/_display.py diff --git a/displayio/_display.py b/displayio/_display.py index 8551f8c..d8b49c7 100644 --- a/displayio/_display.py +++ b/displayio/_display.py @@ -18,7 +18,6 @@ displayio for Blinka """ import time -from array import array from typing import Optional import digitalio import microcontroller @@ -378,15 +377,15 @@ class Display: buffer_size = pixels_per_buffer // pixels_per_word if pixels_per_buffer % pixels_per_word: buffer_size += 1 - mask_length = (pixels_per_buffer // 8) + 1 # 1 bit per pixel + 1 + mask_length = (pixels_per_buffer // 32) + 1 # 1 bit per pixel + 1 remaining_rows = clipped.height() for subrect_index in range(subrectangles): subrectangle = Area( - clipped.x1, - clipped.y1 + rows_per_buffer * subrect_index, - clipped.x2, - clipped.y1 + rows_per_buffer * (subrect_index + 1), + x1=clipped.x1, + y1=clipped.y1 + rows_per_buffer * subrect_index, + x2=clipped.x2, + y2=clipped.y1 + rows_per_buffer * (subrect_index + 1), ) if remaining_rows < rows_per_buffer: subrectangle.y2 = subrectangle.y1 + remaining_rows @@ -401,8 +400,8 @@ class Display: 8 // self._core.colorspace.depth ) - buffer = memoryview(bytearray([0] * (buffer_size * 4))) - mask = memoryview(bytearray([0] * mask_length)) + buffer = memoryview(bytearray([0] * (buffer_size * 4))).cast("I") + mask = memoryview(bytearray([0] * mask_length)).cast("I") self._core.fill_area(subrectangle, mask, buffer) # Can't acquire display bus; skip the rest of the data. @@ -410,7 +409,7 @@ class Display: return False self._core.begin_transaction() - self._send_pixels(buffer[:subrectangle_size_bytes]) + self._send_pixels(buffer.tobytes()[:subrectangle_size_bytes]) self._core.end_transaction() return True @@ -426,9 +425,9 @@ class Display: if pixels_per_buffer % pixels_per_word: buffer_size += 1 - buffer = bytearray([0] * (buffer_size * 4)) + buffer = memoryview(bytearray([0] * (buffer_size * 4))).cast("I") mask_length = (pixels_per_buffer // 32) + 1 - mask = array("L", [0x00000000] * mask_length) + mask = memoryview(bytearray([0] * (mask_length * 4))).cast("I") self._core.fill_area(area, mask, buffer) return buffer @@ -512,7 +511,15 @@ class Display: def rotation(self, value: int): if value % 90 != 0: raise ValueError("Display rotation must be in 90 degree increments") + transposed = self._core.rotation in (90, 270) + will_transposed = value in (90, 270) + if transposed != will_transposed: + self._core.width, self._core.height = self._core.height, self._core.width self._core.set_rotation(value) + if self._core.current_group is not None: + self._core.current_group._update_transform( # pylint: disable=protected-access + self._core.transform + ) @property def bus(self) -> _DisplayBus: