Merge pull request #35 from makermelissa/optimization

[hackapet/Adafruit_Blinka_Displayio.git] / displayio / display.py

diff --git a/displayio/display.py b/displayio/display.py
index 4db7fd188ad31cd6c4a31a6e8d8092b6342863c7..5f0a4aba745d45105a7eb35680370f171dc3a921 100644 (file)
--- a/displayio/display.py
+++ b/displayio/display.py
@@ -38,9 +38,11 @@ displayio for Blinka
 import time
 import struct
 import threading
 import time
 import struct
 import threading

+import digitalio

 from PIL import Image
 import numpy
 from recordclass import recordclass
 from PIL import Image
 import numpy
 from recordclass import recordclass

+from displayio.colorconverter import ColorConverter

 
 __version__ = "0.0.0-auto.0"
 __repo__ = "https://github.com/adafruit/Adafruit_Blinka_displayio.git"
 
 __version__ = "0.0.0-auto.0"
 __repo__ = "https://github.com/adafruit/Adafruit_Blinka_displayio.git"


@@ -48,9 +50,13 @@ __repo__ = "https://github.com/adafruit/Adafruit_Blinka_displayio.git"
 Rectangle = recordclass("Rectangle", "x1 y1 x2 y2")
 displays = []
 
 Rectangle = recordclass("Rectangle", "x1 y1 x2 y2")
 displays = []
 

-# pylint: disable=unnecessary-pass, unused-argument
+BACKLIGHT_IN_OUT = 1
+BACKLIGHT_PWM = 2

 
 

+# pylint: disable=unnecessary-pass, unused-argument

 # pylint: disable=too-many-instance-attributes
 # pylint: disable=too-many-instance-attributes

+
+

 class Display:
     """This initializes a display and connects it into CircuitPython. Unlike other objects
     in CircuitPython, Display objects live until ``displayio.release_displays()`` is called.
 class Display:
     """This initializes a display and connects it into CircuitPython. Unlike other objects
     in CircuitPython, Display objects live until ``displayio.release_displays()`` is called.


@@ -135,20 +141,37 @@ class Display:
         self._height = height
         self._colstart = colstart
         self._rowstart = rowstart
         self._height = height
         self._colstart = colstart
         self._rowstart = rowstart

-        self._rotation = 0
+        self._rotation = rotation

         self._auto_brightness = auto_brightness
         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))
         self._subrectangles = []
         self._bounds_encoding = ">BB" if single_byte_bounds else ">HH"
         self._current_group = None
         self._auto_refresh = auto_refresh
         self._initialize(init_sequence)
         self._buffer = Image.new("RGB", (width, height))
         self._subrectangles = []
         self._bounds_encoding = ">BB" if single_byte_bounds else ">HH"
         self._current_group = None

-        self.rotation = rotation

         displays.append(self)
         self._refresh_thread = None
         if self._auto_refresh:
             self.auto_refresh = True
         displays.append(self)
         self._refresh_thread = None
         if self._auto_refresh:
             self.auto_refresh = True

+        self._colorconverter = ColorConverter()
+
+        self._backlight_type = None
+        if backlight_pin is not None:
+            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
 
 
     # pylint: enable=too-many-locals
 


@@ -159,6 +182,7 @@ class Display:
             data_size = init_sequence[i + 1]
             delay = (data_size & 0x80) > 0
             data_size &= ~0x80
             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:
             self._write(command, init_sequence[i + 2 : i + 2 + data_size])
             delay_time_ms = 10
             if delay:


@@ -170,14 +194,18 @@ class Display:
             i += 2 + data_size
 
     def _write(self, command, data):
             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)
         else:
             self._bus.send(True, bytes([command]), toggle_every_byte=True)
             self._bus.send(False, data)

+        self._bus.end_transaction()

 
     def _release(self):
 
     def _release(self):

-        self._bus.release()
+        self._bus._release()  # pylint: disable=protected-access

         self._bus = None
 
     def show(self, group):
         self._bus = None
 
     def show(self, group):


@@ -198,6 +226,8 @@ class Display:
         When auto refresh is on, updates the display immediately. (The display will also
         update without calls to this.)
         """
         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))
         # Go through groups and and add each to buffer
         if self._current_group is not None:
             buffer = Image.new("RGBA", (self._width, self._height))


@@ -206,8 +236,9 @@ class Display:
             # save image to buffer (or probably refresh buffer so we can compare)
             self._buffer.paste(buffer)
 
             # 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)
 
         for area in self._subrectangles:
             self._refresh_display_area(area)


@@ -251,7 +282,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):
 
     def _clip(self, rectangle):
         if self._rotation in (90, 270):


@@ -301,7 +335,11 @@ class Display:
 
     def fill_row(self, y, buffer):
         """Extract the pixels from a single row"""
 
     def fill_row(self, y, buffer):
         """Extract the pixels from a single row"""

-        pass
+        for x in range(0, self._width):
+            _rgb_565 = self._colorconverter.convert(self._buffer.getpixel((x, y)))
+            buffer[x * 2] = (_rgb_565 >> 8) & 0xFF
+            buffer[x * 2 + 1] = _rgb_565 & 0xFF
+        return buffer

 
     @property
     def auto_refresh(self):
 
     @property
     def auto_refresh(self):


@@ -332,7 +370,16 @@ class Display:
 
     @brightness.setter
     def brightness(self, value):
 
     @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 = 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")

 
     @property
     def auto_brightness(self):
 
     @property
     def auto_brightness(self):