import time
import struct
-import circuitpython_typing
+from circuitpython_typing import WriteableBuffer, ReadableBuffer
from paralleldisplay import ParallelBus
from ._fourwire import FourWire
from ._group import Group
if self.current_group is not None:
self.current_group._update_transform(self.transform)
- def show(self, root_group: Group) -> bool:
- # pylint: disable=protected-access
-
+ def set_root_group(self, root_group: Group) -> bool:
"""
Switches to displaying the given group of layers. When group is `None`, the
default CircuitPython terminal will be shown.
:param Optional[displayio.Group] root_group: The group to show.
"""
-
- """
- # TODO: Implement Supervisor
- if root_group is None:
- circuitpython_splash = _Supervisor().circuitpython_splash
- if not circuitpython_splash._in_group:
- root_group = circuitpython_splash
- elif self.current_group == circuitpython_splash:
- return True
- """
+ # pylint: disable=protected-access
if root_group == self.current_group:
return True
def fill_area(
self,
area: Area,
- mask: circuitpython_typing.WriteableBuffer,
- buffer: circuitpython_typing.WriteableBuffer,
+ mask: WriteableBuffer,
+ buffer: WriteableBuffer,
) -> bool:
"""Call the current group's fill area function"""
if self.current_group is not None:
)
return False
- """
- def _clip(self, rectangle):
- if self._core.rotation in (90, 270):
- width, height = self._core.height, self._core.width
- else:
- width, height = self._core.width, self._core.height
-
- rectangle.x1 = max(rectangle.x1, 0)
- rectangle.y1 = max(rectangle.y1, 0)
- rectangle.x2 = min(rectangle.x2, width)
- rectangle.y2 = min(rectangle.y2, height)
-
- return rectangle
- """
-
def clip_area(self, area: Area, clipped: Area) -> bool:
"""Shrink the area to the region shared by the two areas"""
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
if self.colorspace.depth < 8:
pixels_per_byte = 8 // self.colorspace.depth
if self.colorspace.pixels_in_byte_share_row:
- region_x1 /= pixels_per_byte * self.colorspace.bytes_per_cell
- region_x2 /= pixels_per_byte * self.colorspace.bytes_per_cell
+ region_x1 //= pixels_per_byte * self.colorspace.bytes_per_cell
+ region_x2 //= pixels_per_byte * 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_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
- """
- self._core.send(
- DISPLAY_COMMAND, CHIP_SELECT_TOGGLE_EVERY_BYTE, bytes([command]) + data
- )
- self._core.send(DISPLAY_DATA, CHIP_SELECT_UNTOUCHED, data)
- """
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]))
-
+ self.send(DISPLAY_COMMAND, CHIP_SELECT_UNTOUCHED, data)
+ data = bytearray(0)
if self.ram_width < 0x100: # Single Byte Bounds
- data = struct.pack(">BB", region_y1, region_y2)
+ 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,
chip_select: int,
- data: circuitpython_typing.ReadableBuffer,
+ data: ReadableBuffer,
) -> None:
"""
Send the data to the current bus
"""
+ print(len(data))
+ if isinstance(data, memoryview):
+ data = data.tobytes()
+ print(data)
self._send(data_type, chip_select, data)
- def begin_transaction(self) -> None:
+ def begin_transaction(self) -> bool:
"""
Begin Bus Transaction
"""
- self._begin_transaction()
+ return self._begin_transaction()
def end_transaction(self) -> None:
"""
projects / hackapet / Adafruit_Blinka_Displayio.git / blobdiff