X-Git-Url: https://git.ayoreis.com/hackapet/Adafruit_Blinka_Displayio.git/blobdiff_plain/a7c4f8b9e3a58b0da8dcacdc3e5414427f8b487f..HEAD:/i2cdisplaybus/__init__.py

diff --git a/i2cdisplaybus/__init__.py b/i2cdisplaybus/__init__.py
index b004e54..c963158 100644
--- a/i2cdisplaybus/__init__.py
+++ b/i2cdisplaybus/__init__.py
@@ -21,6 +21,8 @@ i2cdisplaybus for Blinka
 """
 
 import time
+from typing import Optional
+
 import busio
 import digitalio
 from circuitpython_typing import ReadableBuffer
@@ -87,9 +89,7 @@ class I2CDisplayBus:
         done.
         """
         self._begin_transaction()
-        # re-wrap in case of byte-string
-        buffer = list(data) if isinstance(data, bytes) else data
-        self._send(DISPLAY_COMMAND, CHIP_SELECT_UNTOUCHED, bytes([command] + buffer))
+        self._send(DISPLAY_COMMAND, CHIP_SELECT_UNTOUCHED, data, command)
         self._end_transaction()
 
     def _send(
@@ -97,14 +97,24 @@ class I2CDisplayBus:
         data_type: int,
         _chip_select: int,  # Chip select behavior
         data: ReadableBuffer,
+        command: Optional[int] = None,
     ):
+        # pylint: disable=too-many-branches
         if data_type == DISPLAY_COMMAND:
             n = len(data)
+            if command is not None:
+                n += 1
             if n > 0:
                 command_bytes = bytearray(n * 2)
                 for i in range(n):
                     command_bytes[2 * i] = 0x80
-                    command_bytes[2 * i + 1] = data[i]
+                    if command is not None:
+                        if i > 0:
+                            command_bytes[2 * i + 1] = data[i]
+                        else:
+                            command_bytes[2 * i + 1] = command
+                    else:
+                        command_bytes[2 * i + 1] = data[i]
 
             try:
                 self._i2c.writeto(self._dev_addr, buffer=command_bytes)
@@ -115,9 +125,16 @@ class I2CDisplayBus:
                     ) from error
                 raise error
         else:
-            data_bytes = bytearray(len(data) + 1)
+            size = len(data) + 1
+            if command is not None:
+                size += 1
+            data_bytes = bytearray(size)
             data_bytes[0] = 0x40
-            data_bytes[1:] = data
+            if command is not None:
+                data_bytes[1] = command
+                data_bytes[2:] = data
+            else:
+                data_bytes[1:] = data
             try:
                 self._i2c.writeto(self._dev_addr, buffer=data_bytes)
             except OSError as error: