Improve Turing 2.1/5/8.8 by sending correct colors

Author: mathoudebine

library/lcd/lcd_comm_rev_c.py

@@ -30,7 +30,7 @@
 from serial.tools.list_ports import comports
 
 from library.lcd.lcd_comm import Orientation, LcdComm
-from library.lcd.serialize import image_to_BGRA, image_to_BGR, chunked
+from library.lcd.serialize import image_to_BGRA, image_to_compressed_BGRA, chunked
 from library.log import logger
 
 
@@ -200,7 +200,8 @@ def _hello(self):
         # This command reads LCD answer on serial link, so it bypasses the queue
         self.sub_revision = SubRevision.UNKNOWN
         self._send_command(Command.HELLO, bypass_queue=True)
-        response = ''.join(filter(lambda x: x in set(string.printable), str(self.serial_read(23).decode(errors="ignore"))))
+        response = ''.join(
+            filter(lambda x: x in set(string.printable), str(self.serial_read(23).decode(errors="ignore"))))
         self.serial_flush_input()
         logger.debug("Display ID returned: %s" % response)
 
@@ -252,13 +253,13 @@ def Clear(self):
         self.SetOrientation(orientation=backup_orientation)
 
     def ScreenOff(self):
-        logger.info("Calling ScreenOff")
+        # logger.info("Calling ScreenOff")
         self._send_command(Command.STOP_VIDEO)
         self._send_command(Command.STOP_MEDIA, readsize=1024)
         self._send_command(Command.TURNOFF)
 
     def ScreenOn(self):
-        logger.info("Calling ScreenOn")
+        # logger.info("Calling ScreenOn")
         self._send_command(Command.STOP_VIDEO)
         self._send_command(Command.STOP_MEDIA, readsize=1024)
         # self._send_command(Command.SET_BRIGHTNESS, payload=bytearray([255]))
@@ -357,7 +358,7 @@ def _generate_full_image(self, image: Image.Image) -> bytes:
             elif self.orientation == Orientation.REVERSE_LANDSCAPE:
                 image = image.rotate(180)
 
-        bgra_data = image_to_BGRA(image)
+        bgra_data, pixel_size = image_to_BGRA(image)
 
         return b'\x00'.join(chunked(bgra_data, 249))
 
@@ -397,15 +398,13 @@ def _generate_update_image(
 
         img_raw_data = bytearray()
 
-        # Some screens require BGR for update image, some require BGRA
+        # Some screens require different RGBA encoding
         if self.rom_version > 88:
-            # BGRA mode
-            img_data = image_to_BGRA(image)
-            pixel_size = 4
+            # BGRA mode on 4 bytes : [B, G, R, A]
+            img_data, pixel_size = image_to_BGRA(image)
         else:
-            # BGR mode
-            img_data = image_to_BGR(image)
-            pixel_size = 3
+            # BGRA mode on 3 bytes: [6-bit B + 2-bit A, 6-bit G + 2-bit A, R]
+            img_data, pixel_size = image_to_compressed_BGRA(image)
 
         for h, line in enumerate(chunked(img_data, image.width * pixel_size)):
             if self.sub_revision == SubRevision.REV_8INCH:

library/lcd/serialize.py

@@ -6,7 +6,7 @@
 
 def chunked(data: bytes, chunk_size: int) -> Iterator[bytes]:
     for i in range(0, len(data), chunk_size):
-        yield data[i : i + chunk_size]
+        yield data[i: i + chunk_size]
 
 
 def image_to_RGB565(image: Image.Image, endianness: Literal["big", "little"]) -> bytes:
@@ -39,20 +39,35 @@ def image_to_RGB565(image: Image.Image, endianness: Literal["big", "little"]) ->
     return rgb565.astype(typ).tobytes()
 
 
-def image_to_BGR(image: Image.Image) -> bytes:
+def image_to_BGR(image: Image.Image) -> (bytes, int):
     if image.mode not in ["RGB", "RGBA"]:
         # we need the first 3 channels to be R, G and B
         image = image.convert("RGB")
     rgb = np.asarray(image)
     # same as rgb[:, :, [2, 1, 0]] but faster
     bgr = np.take(rgb, (2, 1, 0), axis=-1)
-    return bgr.tobytes()
+    return bgr.tobytes(), 3
 
 
-def image_to_BGRA(image: Image.Image) -> bytes:
+def image_to_BGRA(image: Image.Image) -> (bytes, int):
     if image.mode != "RGBA":
         image = image.convert("RGBA")
     rgba = np.asarray(image)
     # same as rgba[:, :, [2, 1, 0, 3]] but faster
     bgra = np.take(rgba, (2, 1, 0, 3), axis=-1)
-    return bgra.tobytes()
+    return bgra.tobytes(), 4
+
+
+# FIXME: to optimize like other functions above
+def image_to_compressed_BGRA(image: Image.Image) -> (bytes, int):
+    compressed_bgra = bytearray()
+    image_data = image.convert("RGBA").load()
+    for h in range(image.height):
+        for w in range(image.width):
+            # r = pixel[0], g = pixel[1], b = pixel[2], a = pixel[3]
+            pixel = image_data[w, h]
+            a = pixel[3] >> 4
+            compressed_bgra.append(pixel[2] & 0xFC | a >> 2)
+            compressed_bgra.append(pixel[1] & 0xFC | a & 2)
+            compressed_bgra.append(pixel[0])
+    return bytes(compressed_bgra), 3