black and pylint

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

diff --git a/displayio/display.py b/displayio/display.py
index 0bc7e8c987bdf69d64929f3bfafb030e3cfd338e..757092d645c58b211e76e7c7c25569b3ea5358bf 100644 (file)
--- a/displayio/display.py
+++ b/displayio/display.py
@@ -53,8 +53,17 @@ BACKLIGHT_IN_OUT = 1
 BACKLIGHT_PWM = 2
 
 # pylint: disable=unnecessary-pass, unused-argument
 BACKLIGHT_PWM = 2
 
 # pylint: disable=unnecessary-pass, unused-argument

-

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

+
+
+def _rgb_tuple_to_rgb565(color_tuple):
+    return (
+        ((color_tuple[0] & 0x00F8) << 8)
+        | ((color_tuple[1] & 0x00FC) << 3)
+        | (color_tuple[2] & 0x00F8) >> 3
+    )
+
+

 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.


@@ -155,9 +164,19 @@ class Display:
 
         self._backlight_type = None
         if backlight_pin is not None:
 
         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
             self.brightness = brightness
 
     # pylint: enable=too-many-locals


@@ -322,7 +341,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 = _rgb_tuple_to_rgb565(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):


@@ -357,8 +380,10 @@ class Display:
             self._brightness = value
             if self._backlight_type == BACKLIGHT_IN_OUT:
                 self._backlight.value = round(self._brightness)
             self._brightness = value
             if self._backlight_type == BACKLIGHT_IN_OUT:
                 self._backlight.value = round(self._brightness)

-            # PWM not currently implemented
-            # Command-based brightness not implemented
+            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")
 
         else:
             raise ValueError("Brightness must be between 0.0 and 1.0")