diff --git a/.pylintrc b/.pylintrc index 5c31f66..256ac2f 100644 --- a/.pylintrc +++ b/.pylintrc @@ -22,8 +22,8 @@ ignore-patterns= #init-hook= # Use multiple processes to speed up Pylint. -# jobs=1 -jobs=2 +jobs=1 +# jobs=2 # List of plugins (as comma separated values of python modules names) to load, # usually to register additional checkers. @@ -253,7 +253,7 @@ ignore-docstrings=yes ignore-imports=no # Minimum lines number of a similarity. -min-similarity-lines=4 +min-similarity-lines=50 [BASIC] diff --git a/adafruit_epd/ssd1681.py b/adafruit_epd/ssd1681.py index fca0f57..22ddd02 100644 --- a/adafruit_epd/ssd1681.py +++ b/adafruit_epd/ssd1681.py @@ -6,7 +6,7 @@ `adafruit_epd.ssd1681` - Adafruit SSD1681 - ePaper display driver ==================================================================================== CircuitPython driver for Adafruit SSD1681 display breakouts -* Author(s): Dean Miller, Ladyada +* Author(s): Dean Miller, Ladyada, Melissa LeBlanc-Williams """ import time @@ -66,8 +66,6 @@ _SSD1681_SET_RAMYCOUNT = const(0x4F) _SSD1681_NOP = const(0xFF) -_LUT_DATA = b'\x02\x02\x01\x11\x12\x12""fiiYX\x99\x99\x88\x00\x00\x00\x00\xf8\xb4\x13Q5QQ\x19\x01\x00' # pylint: disable=line-too-long - class Adafruit_SSD1681(Adafruit_EPD): """driver class for Adafruit SSD1681 ePaper display breakouts""" @@ -85,16 +83,22 @@ def __init__( self._height = height self._buffer1_size = int(width * height / 8) + self._buffer2_size = int(width * height / 8) if sramcs_pin: self._buffer1 = self.sram.get_view(0) + self._buffer2 = self.sram.get_view(self._buffer1_size) else: self._buffer1 = bytearray((width * height) // 8) + self._buffer2 = bytearray((width * height) // 8) self._framebuf1 = adafruit_framebuf.FrameBuffer( self._buffer1, width, height, buf_format=adafruit_framebuf.MHMSB ) + self._framebuf2 = adafruit_framebuf.FrameBuffer( + self._buffer2, width, height, buf_format=adafruit_framebuf.MHMSB + ) self.set_black_buffer(0, True) - self.set_color_buffer(0, True) + self.set_color_buffer(1, False) # pylint: enable=too-many-arguments def begin(self, reset=True): @@ -158,7 +162,9 @@ def write_ram(self, index): 0 or 1 for tri-color displays.""" if index == 0: return self.command(_SSD1681_WRITE_BWRAM, end=False) - raise RuntimeError("RAM index must be 0") + if index == 1: + return self.command(_SSD1681_WRITE_REDRAM, end=False) + raise RuntimeError("RAM index must be 0 or 1") def set_ram_address(self, x, y): # pylint: disable=unused-argument, no-self-use """Set the RAM address location, not used on this chipset but required by @@ -166,4 +172,4 @@ def set_ram_address(self, x, y): # pylint: disable=unused-argument, no-self-use # Set RAM X address counter self.command(_SSD1681_SET_RAMXCOUNT, bytearray([x])) # Set RAM Y address counter - self.command(_SSD1681_SET_RAMYCOUNT, bytearray([y >> 8, y])) + self.command(_SSD1681_SET_RAMYCOUNT, bytearray([y, y >> 8])) diff --git a/examples/epd_bitmap.py b/examples/epd_bitmap.py index de97a09..23a027e 100644 --- a/examples/epd_bitmap.py +++ b/examples/epd_bitmap.py @@ -10,6 +10,7 @@ from adafruit_epd.il0398 import Adafruit_IL0398 # pylint: disable=unused-import from adafruit_epd.ssd1608 import Adafruit_SSD1608 # pylint: disable=unused-import from adafruit_epd.ssd1675 import Adafruit_SSD1675 # pylint: disable=unused-import +from adafruit_epd.ssd1681 import Adafruit_SSD1681 # pylint: disable=unused-import # create the spi device and pins we will need @@ -22,16 +23,17 @@ # give them all to our driver print("Creating display") -# display = Adafruit_SSD1608(200, 200, spi, # 1.54" HD mono display -# display = Adafruit_SSD1675(122, 250, spi, # 2.13" HD mono display -# display = Adafruit_IL91874(176, 264, spi, # 2.7" Tri-color display -# display = Adafruit_IL0373(152, 152, spi, # 1.54" Tri-color display -# display = Adafruit_IL0373(128, 296, spi, # 2.9" Tri-color display -# display = Adafruit_IL0398(400, 300, spi, # 4.2" Tri-color display +# display = Adafruit_SSD1608(200, 200, # 1.54" HD mono display +# display = Adafruit_SSD1675(122, 250, # 2.13" HD mono display +# display = Adafruit_SSD1681(200, 200, # 1.54" HD Tri-color display +# display = Adafruit_IL91874(176, 264, # 2.7" Tri-color display +# display = Adafruit_IL0373(152, 152, # 1.54" Tri-color display +# display = Adafruit_IL0373(128, 296, # 2.9" Tri-color display +# display = Adafruit_IL0398(400, 300, # 4.2" Tri-color display display = Adafruit_IL0373( 104, - 212, - spi, # 2.13" Tri-color display + 212, # 2.13" Tri-color display + spi, cs_pin=ecs, dc_pin=dc, sramcs_pin=srcs, diff --git a/examples/epd_blinka.py b/examples/epd_blinka.py index ebd4d12..2ea4f46 100644 --- a/examples/epd_blinka.py +++ b/examples/epd_blinka.py @@ -31,14 +31,14 @@ # give them all to our driver print("Creating display") -# display = Adafruit_SSD1608(200, 200, spi, # 1.54" HD mono display -# display = Adafruit_SSD1681(200, 200, spi, # 1.54" HD mono display (alt) -# display = Adafruit_SSD1675(122, 250, spi, # 2.13" HD mono display -# display = Adafruit_IL91874(176, 264, spi, # 2.7" Tri-color display -# display = Adafruit_IL0373(152, 152, spi, # 1.54" Tri-color display -# display = Adafruit_IL0373(128, 296, spi, # 2.9" Tri-color display -# display = Adafruit_IL0398(400, 300, spi, # 4.2" Tri-color display -# display = Adafruit_IL0373(104, 212, spi, # 2.13" Tri-color display +# display = Adafruit_SSD1608(200, 200, # 1.54" HD mono display +# display = Adafruit_SSD1681(200, 200, # 1.54" HD Tri-color display +# display = Adafruit_SSD1675(122, 250, # 2.13" HD mono display +# display = Adafruit_IL91874(176, 264, # 2.7" Tri-color display +# display = Adafruit_IL0373(152, 152, # 1.54" Tri-color display +# display = Adafruit_IL0373(128, 296, # 2.9" Tri-color display +# display = Adafruit_IL0398(400, 300, # 4.2" Tri-color display +# display = Adafruit_IL0373(104, 212, # 2.13" Tri-color display display = Adafruit_SSD1675B( 122, 250, diff --git a/examples/epd_pillow_demo.py b/examples/epd_pillow_demo.py index 6a4195e..0509cf5 100644 --- a/examples/epd_pillow_demo.py +++ b/examples/epd_pillow_demo.py @@ -15,6 +15,7 @@ from adafruit_epd.il0398 import Adafruit_IL0398 # pylint: disable=unused-import from adafruit_epd.ssd1608 import Adafruit_SSD1608 # pylint: disable=unused-import from adafruit_epd.ssd1675 import Adafruit_SSD1675 # pylint: disable=unused-import +from adafruit_epd.ssd1681 import Adafruit_SSD1681 # pylint: disable=unused-import # First define some color constants WHITE = (0xFF, 0xFF, 0xFF) @@ -39,6 +40,7 @@ # give them all to our driver # display = Adafruit_SSD1608(200, 200, # 1.54" HD mono display # display = Adafruit_SSD1675(122, 250, # 2.13" HD mono display +# display = Adafruit_SSD1681(200, 200, # 1.54" HD Tri-color display # display = Adafruit_IL91874(176, 264, # 2.7" Tri-color display # display = Adafruit_IL0373(152, 152, # 1.54" Tri-color display # display = Adafruit_IL0373(128, 296, # 2.9" Tri-color display diff --git a/examples/epd_pillow_image.py b/examples/epd_pillow_image.py index 9ef54cd..6c0e24a 100644 --- a/examples/epd_pillow_image.py +++ b/examples/epd_pillow_image.py @@ -17,6 +17,7 @@ from adafruit_epd.il0398 import Adafruit_IL0398 # pylint: disable=unused-import from adafruit_epd.ssd1608 import Adafruit_SSD1608 # pylint: disable=unused-import from adafruit_epd.ssd1675 import Adafruit_SSD1675 # pylint: disable=unused-import +from adafruit_epd.ssd1681 import Adafruit_SSD1681 # pylint: disable=unused-import # create the spi device and pins we will need @@ -30,6 +31,7 @@ # give them all to our driver # display = Adafruit_SSD1608(200, 200, # 1.54" HD mono display # display = Adafruit_SSD1675(122, 250, # 2.13" HD mono display +# display = Adafruit_SSD1681(200, 200, # 1.54" HD Tri-color display # display = Adafruit_IL91874(176, 264, # 2.7" Tri-color display # display = Adafruit_IL0373(152, 152, # 1.54" Tri-color display # display = Adafruit_IL0373(128, 296, # 2.9" Tri-color display diff --git a/examples/epd_simpletest.py b/examples/epd_simpletest.py index 8236abe..62d6e93 100644 --- a/examples/epd_simpletest.py +++ b/examples/epd_simpletest.py @@ -10,6 +10,7 @@ from adafruit_epd.il0398 import Adafruit_IL0398 # pylint: disable=unused-import from adafruit_epd.ssd1608 import Adafruit_SSD1608 # pylint: disable=unused-import from adafruit_epd.ssd1675 import Adafruit_SSD1675 # pylint: disable=unused-import +from adafruit_epd.ssd1681 import Adafruit_SSD1681 # pylint: disable=unused-import # create the spi device and pins we will need spi = busio.SPI(board.SCK, MOSI=board.MOSI, MISO=board.MISO) @@ -19,18 +20,19 @@ rst = digitalio.DigitalInOut(board.D9) # can be None to not use this pin busy = digitalio.DigitalInOut(board.D5) # can be None to not use this pin -# give them all to our driver +# give them all to our drivers print("Creating display") -# display = Adafruit_SSD1608(200, 200, spi, # 1.54" HD mono display -# display = Adafruit_SSD1675(122, 250, spi, # 2.13" HD mono display -# display = Adafruit_IL91874(176, 264, spi, # 2.7" Tri-color display -# display = Adafruit_IL0373(152, 152, spi, # 1.54" Tri-color display -# display = Adafruit_IL0373(128, 296, spi, # 2.9" Tri-color display -# display = Adafruit_IL0398(400, 300, spi, # 4.2" Tri-color display +# display = Adafruit_SSD1608(200, 200, # 1.54" HD mono display +# display = Adafruit_SSD1675(122, 250, # 2.13" HD mono display +# display = Adafruit_SSD1681(200, 200, # 1.54" HD Tri-color display +# display = Adafruit_IL91874(176, 264, # 2.7" Tri-color display +# display = Adafruit_IL0373(152, 152, # 1.54" Tri-color display +# display = Adafruit_IL0373(128, 296, # 2.9" Tri-color display +# display = Adafruit_IL0398(400, 300, # 4.2" Tri-color display display = Adafruit_IL0373( 104, - 212, - spi, # 2.13" Tri-color display + 212, # 2.13" Tri-color display + spi, cs_pin=ecs, dc_pin=dc, sramcs_pin=srcs,