import time
import struct
from circuitpython_typing import WriteableBuffer, ReadableBuffer
-from paralleldisplay import ParallelBus
-from ._fourwire import FourWire
+from paralleldisplaybus import ParallelBus
+from fourwire import FourWire
+from i2cdisplaybus import I2CDisplayBus
+from busdisplay._displaybus import _DisplayBus
from ._group import Group
-from ._i2cdisplay import I2CDisplay
from ._structs import ColorspaceStruct, TransformStruct
from ._area import Area
-from ._displaybus import _DisplayBus
from ._helpers import bswap16
from ._constants import (
CHIP_SELECT_UNTOUCHED,
self.last_refresh = 0
if bus:
- if isinstance(bus, (FourWire, I2CDisplay, ParallelBus)):
+ if isinstance(bus, (FourWire, I2CDisplayBus, ParallelBus)):
self._bus_reset = bus.reset
+ self._bus_free = bus._free
self._begin_transaction = bus._begin_transaction
self._send = bus._send
self._end_transaction = bus._end_transaction
self.rotation = rotation
self.transform = TransformStruct()
+ self.set_rotation(rotation)
+
def set_rotation(self, rotation: int) -> None:
"""
Sets the rotation of the display as an int in degrees.
"""
# pylint: disable=protected-access, too-many-branches
- transposed = self.rotation in (90, 270)
- will_be_transposed = rotation in (90, 270)
- if transposed != will_be_transposed:
- self.width, self.height = self.height, self.width
-
height = self.height
width = self.width
self.transform.y = height
self.transform.dy = -1
- if self.current_group is not None:
- self.current_group._update_transform(self.transform)
-
def set_root_group(self, root_group: Group) -> bool:
"""
Switches to displaying the given group of layers. When group is `None`, the
if not overlaps:
return False
- # Expand the area if we have multiple pixels per byte and we need to byte align the bounds
+ # Expand the area if we have multiple pixels per byte and we need to byte
+ # align the bounds
if self.colorspace.depth < 8:
pixels_per_byte = (
8 // self.colorspace.depth * self.colorspace.bytes_per_cell
else:
region_y1 //= pixels_per_byte * self.colorspace.bytes_per_cell
region_y2 //= pixels_per_byte * self.colorspace.bytes_per_cell
-
region_x2 -= 1
region_y2 -= 1
# Set column
self.begin_transaction()
+ data = bytearray([self.column_command])
data_type = DISPLAY_DATA
if not self.data_as_commands:
- self.send(
- DISPLAY_COMMAND, CHIP_SELECT_UNTOUCHED, bytes([self.column_command])
- )
+ self.send(DISPLAY_COMMAND, CHIP_SELECT_UNTOUCHED, data)
+ data = bytearray(0)
else:
data_type = DISPLAY_COMMAND
if self.ram_width < 0x100: # Single Byte Bounds
- data = struct.pack(">BB", region_x1, region_x2)
+ data += struct.pack(">BB", region_x1, region_x2)
else:
if self.address_little_endian:
region_x1 = bswap16(region_x1)
region_x2 = bswap16(region_x2)
- data = struct.pack(">HH", region_x1, region_x2)
+ data += struct.pack(">HH", region_x1, region_x2)
# Quirk for SH1107 "SH1107_addressing"
# Column lower command = 0x00, Column upper command = 0x10
# Set row
self.begin_transaction()
+ data = bytearray([self.row_command])
if not self.data_as_commands:
- self.send(DISPLAY_COMMAND, CHIP_SELECT_UNTOUCHED, bytes([self.row_command]))
-
- if self.ram_width < 0x100: # Single Byte Bounds
- data = struct.pack(">BB", region_y1, region_y2)
+ self.send(DISPLAY_COMMAND, CHIP_SELECT_UNTOUCHED, data)
+ data = bytearray(0)
+ if self.ram_height < 0x100: # Single Byte Bounds
+ data += struct.pack(">BB", region_y1, region_y2)
else:
if self.address_little_endian:
region_y1 = bswap16(region_y1)
region_y2 = bswap16(region_y2)
- data = struct.pack(">HH", region_y1, region_y2)
+ data += struct.pack(">HH", region_y1, region_y2)
# Quirk for SH1107 "SH1107_addressing"
# Page address command = 0xB0
self.send(DISPLAY_DATA, chip_select, data[: len(data) // 2])
self.end_transaction()
- """
- img = self._buffer.convert("RGB").crop(astuple(area))
- img = img.rotate(360 - self._core.rotation, expand=True)
-
- display_area = self._apply_rotation(area)
-
- img = img.crop(astuple(display_area))
-
- data = numpy.array(img).astype("uint16")
- color = (
- ((data[:, :, 0] & 0xF8) << 8)
- | ((data[:, :, 1] & 0xFC) << 3)
- | (data[:, :, 2] >> 3)
- )
-
- pixels = bytes(
- numpy.dstack(((color >> 8) & 0xFF, color & 0xFF)).flatten().tolist()
- )
- """
-
def send(
self,
data_type: int,
"""
self._send(data_type, chip_select, data)
- def begin_transaction(self) -> None:
+ def bus_free(self) -> bool:
+ """
+ Check if the bus is free
+ """
+ return self._bus_free()
+
+ def begin_transaction(self) -> bool:
"""
Begin Bus Transaction
"""
- self._begin_transaction()
+ return self._begin_transaction()
def end_transaction(self) -> None:
"""