From: Melissa LeBlanc-Williams Date: Tue, 16 Jun 2020 17:37:37 +0000 (-0700) Subject: Merge pull request #18 from makermelissa/rotation X-Git-Tag: 0.3.0~1 X-Git-Url: https://git.ayoreis.com/hackapet/Adafruit_Blinka_Displayio.git/commitdiff_plain/029b85fdd0b34467ff7a282c0b7be3470aaf4a35?hp=8c03c015b51b174a31ef44d929dbccddc4f295b7 Merge pull request #18 from makermelissa/rotation Fixed rotation for rectangle displays and added backlight --- diff --git a/displayio/display.py b/displayio/display.py index e5998e1..84cdc25 100644 --- a/displayio/display.py +++ b/displayio/display.py @@ -38,6 +38,7 @@ displayio for Blinka import time import struct import threading +import digitalio from PIL import Image import numpy from recordclass import recordclass @@ -48,6 +49,9 @@ __repo__ = "https://github.com/adafruit/Adafruit_Blinka_displayio.git" Rectangle = recordclass("Rectangle", "x1 y1 x2 y2") displays = [] +BACKLIGHT_IN_OUT = 1 +BACKLIGHT_PWM = 2 + # pylint: disable=unnecessary-pass, unused-argument # pylint: disable=too-many-instance-attributes @@ -137,7 +141,7 @@ class Display: self._rowstart = rowstart self._rotation = rotation self._auto_brightness = auto_brightness - self._brightness = brightness + self._brightness = 1.0 self._auto_refresh = auto_refresh self._initialize(init_sequence) self._buffer = Image.new("RGB", (width, height)) @@ -149,6 +153,13 @@ class Display: if self._auto_refresh: self.auto_refresh = True + self._backlight_type = None + if backlight_pin is not None: + self._backlight_type = BACKLIGHT_IN_OUT + self._backlight = digitalio.DigitalInOut(backlight_pin) + self._backlight.switch_to_output() + self.brightness = brightness + # pylint: enable=too-many-locals def _initialize(self, init_sequence): @@ -158,6 +169,7 @@ class Display: data_size = init_sequence[i + 1] delay = (data_size & 0x80) > 0 data_size &= ~0x80 + self._write(command, init_sequence[i + 2 : i + 2 + data_size]) delay_time_ms = 10 if delay: @@ -169,11 +181,15 @@ class Display: i += 2 + data_size def _write(self, command, data): - if self._single_byte_bounds: - self._bus.send(True, bytes([command]) + data, toggle_every_byte=True) + self._bus.begin_transaction() + if self._data_as_commands: + if command is not None: + self._bus.send(True, bytes([command]), toggle_every_byte=True) + self._bus.send(command is not None, data) else: self._bus.send(True, bytes([command]), toggle_every_byte=True) self._bus.send(False, data) + self._bus.end_transaction() def _release(self): self._bus.release() @@ -218,8 +234,11 @@ class Display: def _refresh_display_area(self, rectangle): """Loop through dirty rectangles and redraw that area.""" - img = self._buffer.crop(rectangle).convert("RGB") - img = img.rotate(self._rotation) + img = self._buffer.convert("RGB").crop(rectangle) + img = img.rotate(self._rotation, expand=True) + + display_rectangle = self._apply_rotation(rectangle) + img = img.crop(self._clip(display_rectangle)) data = numpy.array(img).astype("uint16") color = ( @@ -232,8 +251,6 @@ class Display: numpy.dstack(((color >> 8) & 0xFF, color & 0xFF)).flatten().tolist() ) - display_rectangle = self._apply_rotation(rectangle) - self._write( self._set_column_command, self._encode_pos( @@ -249,15 +266,35 @@ class Display: ), ) - self._write(self._write_ram_command, pixels) + if self._data_as_commands: + self._write(None, pixels) + else: + self._write(self._write_ram_command, pixels) + + def _clip(self, rectangle): + if self._rotation in (90, 270): + width, height = self._height, self._width + else: + width, height = self._width, self._height + + if rectangle.x1 < 0: + rectangle.x1 = 0 + if rectangle.y1 < 0: + rectangle.y1 = 0 + if rectangle.x2 > width: + rectangle.x2 = width + if rectangle.y2 > height: + rectangle.y2 = height + + return rectangle def _apply_rotation(self, rectangle): """Adjust the rectangle coordinates based on rotation""" if self._rotation == 90: return Rectangle( - self._width - rectangle.y2, + self._height - rectangle.y2, rectangle.x1, - self._width - rectangle.y1, + self._height - rectangle.y1, rectangle.x2, ) if self._rotation == 180: @@ -270,9 +307,9 @@ class Display: if self._rotation == 270: return Rectangle( rectangle.y1, - self._height - rectangle.x2, + self._width - rectangle.x2, rectangle.y2, - self._height - rectangle.x1, + self._width - rectangle.x1, ) return rectangle @@ -313,7 +350,14 @@ class Display: @brightness.setter def brightness(self, value): - self._brightness = value + if 0 <= float(value) <= 1.0: + self._brightness = value + if self._backlight_type == BACKLIGHT_IN_OUT: + self._backlight.value = int(round(self._brightness)) + # PWM not currently implemented + # Command-based brightness not implemented + else: + raise ValueError("Brightness must be between 0.0 and 1.0") @property def auto_brightness(self): diff --git a/displayio/fourwire.py b/displayio/fourwire.py index 5d8a433..a48c771 100644 --- a/displayio/fourwire.py +++ b/displayio/fourwire.py @@ -68,9 +68,12 @@ class FourWire: first code.py run. """ self._dc = digitalio.DigitalInOut(command) - self._dc.switch_to_output() + self._dc.switch_to_output(value=False) self._chip_select = digitalio.DigitalInOut(chip_select) self._chip_select.switch_to_output(value=True) + self._frequency = baudrate + self._polarity = polarity + self._phase = phase if reset is not None: self._reset = digitalio.DigitalInOut(reset) @@ -78,10 +81,6 @@ class FourWire: else: self._reset = None self._spi = spi_bus - while self._spi.try_lock(): - pass - self._spi.configure(baudrate=baudrate, polarity=polarity, phase=phase) - self._spi.unlock() def _release(self): self.reset() @@ -108,8 +107,6 @@ class FourWire: such as vertical scroll, set via ``send`` may or may not be reset once the code is done. """ - while self._spi.try_lock(): - pass self._dc.value = not is_command if toggle_every_byte: for byte in data: @@ -119,4 +116,20 @@ class FourWire: self._chip_select.value = False else: self._spi.write(data) + + def begin_transaction(self): + """Begin the SPI transaction by locking, configuring, and setting Chip Select + """ + if not self._spi.try_lock(): + return False + self._spi.configure( + baudrate=self._frequency, polarity=self._polarity, phase=self._phase + ) + self._chip_select.value = False + return True + + def end_transaction(self): + """End the SPI transaction by unlocking and setting Chip Select + """ + self._chip_select.value = True self._spi.unlock()