drivers/display/lcd160cr: Fix get_line method and enhance screen_dump.

The docs are updated and describe the new behaviour of these methods.
crypto-aes
Damien George 5 years ago
parent e4a53570d0
commit f351c6db5e
  1. 18
      docs/library/lcd160cr.rst
  2. 38
      drivers/display/lcd160cr.py

@ -150,11 +150,19 @@ The following methods manipulate individual pixels on the display.
.. method:: LCD160CR.get_line(x, y, buf)
Get a line of pixels into the given buffer.
.. method:: LCD160CR.screen_dump(buf)
Dump the entire screen to the given buffer.
Low-level method to get a line of pixels into the given buffer.
To read `n` pixels `buf` should be `2*n+1` bytes in length. The first byte
is a dummy byte and should be ignored, and subsequent bytes represent the
pixels in the line starting at coordinate `(x, y)`.
.. method:: LCD160CR.screen_dump(buf, x=0, y=0, w=None, h=None)
Dump the contents of the screen to the given buffer. The parameters `x` and `y`
specify the starting coordinate, and `w` and `h` the size of the region. If `w`
or `h` are `None` then they will take on their maximum values, set by the size
of the screen minus the given `x` and `y` values. `buf` should be large enough
to hold `2*w*h` bytes. If it's smaller then only the initial horizontal lines
will be stored.
.. method:: LCD160CR.screen_load(buf)

@ -257,6 +257,7 @@ class LCD160CR:
def get_line(self, x, y, buf):
l = len(buf) // 2
self._fcmd2b('<BBBBB', 0x10, l, x, y)
l *= 2
t = 1000
while t:
self.i2c.readfrom_into(self.i2c_addr, self.buf1)
@ -267,21 +268,28 @@ class LCD160CR:
sleep_ms(1)
raise OSError(uerrno.ETIMEDOUT)
def screen_dump(self, buf):
line = bytearray(self.w + 1)
h = len(buf) // (2 * self.w)
if h > self.h:
h = self.h
for i in range(h):
ix = i * self.w * 2
self.get_line(0, i, line)
for j in range(1, len(line)):
buf[ix] = line[j]
ix += 1
self.get_line(self.w // 2, i, line)
for j in range(1, len(line)):
buf[ix] = line[j]
ix += 1
def screen_dump(self, buf, x=0, y=0, w=None, h=None):
if w is None:
w = self.w - x
if h is None:
h = self.h - y
if w <= 127:
line = bytearray(2 * w + 1)
line2 = None
else:
# split line if more than 254 bytes needed
buflen = (w + 1) // 2
line = bytearray(2 * buflen + 1)
line2 = memoryview(line)[:2 * (w - buflen) + 1]
for i in range(min(len(buf) // (2 * w), h)):
ix = i * w * 2
self.get_line(x, y + i, line)
buf[ix:ix + len(line) - 1] = memoryview(line)[1:]
ix += len(line) - 1
if line2:
self.get_line(x + buflen, y + i, line2)
buf[ix:ix + len(line2) - 1] = memoryview(line2)[1:]
ix += len(line2) - 1
def screen_load(self, buf):
l = self.w * self.h * 2+2

Loading…
Cancel
Save