X-Git-Url: https://git.ayoreis.com/hackapet/Adafruit_Blinka_Displayio.git/blobdiff_plain/28d05688b18970a511437eb433b8d2e2fc3c6e1e..2c0d4ae77523a1bf94102d0a599c90d8361ae926:/displayio/display.py diff --git a/displayio/display.py b/displayio/display.py index c5a82a3..1ea5d55 100644 --- a/displayio/display.py +++ b/displayio/display.py @@ -155,9 +155,19 @@ class Display: 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() + try: + from pulseio import PWMOut # pylint: disable=import-outside-toplevel + + # 100Hz looks decent and doesn't keep the CPU too busy + self._backlight = PWMOut(backlight_pin, frequency=100, duty_cycle=0) + self._backlight_type = BACKLIGHT_PWM + except ImportError: + # PWMOut not implemented on this platform + pass + if self._backlight_type is 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 @@ -169,6 +179,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: @@ -180,14 +191,18 @@ 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() + self._bus._release() # pylint: disable=protected-access self._bus = None def show(self, group): @@ -208,6 +223,8 @@ class Display: When auto refresh is on, updates the display immediately. (The display will also update without calls to this.) """ + self._subrectangles = [] + # Go through groups and and add each to buffer if self._current_group is not None: buffer = Image.new("RGBA", (self._width, self._height)) @@ -216,8 +233,9 @@ class Display: # save image to buffer (or probably refresh buffer so we can compare) self._buffer.paste(buffer) - # Eventually calculate dirty rectangles here - self._subrectangles.append(Rectangle(0, 0, self._width, self._height)) + if self._current_group is not None: + # Eventually calculate dirty rectangles here + self._subrectangles.append(Rectangle(0, 0, self._width, self._height)) for area in self._subrectangles: self._refresh_display_area(area) @@ -261,7 +279,10 @@ 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): @@ -342,13 +363,14 @@ class Display: @brightness.setter def brightness(self, value): - print("Brightness set") if 0 <= float(value) <= 1.0: self._brightness = value if self._backlight_type == BACKLIGHT_IN_OUT: - self._backlight.value = int(round(self._brightness)) - print(int(round(self._brightness))) - # PWM not currently implemented + self._backlight.value = round(self._brightness) + elif self._backlight_type == BACKLIGHT_PWM: + self._backlight.duty_cycle = self._brightness * 65535 + elif self._brightness_command is not None: + self._write(self._brightness_command, round(value * 255)) else: raise ValueError("Brightness must be between 0.0 and 1.0")