From 8209cb7c8fddbb274c942f91620c1664709e7b23 Mon Sep 17 00:00:00 2001 From: Joel Date: Tue, 3 Dec 2024 20:58:01 -0500 Subject: [PATCH 1/5] Copy ssd1680.py -> ssd1680b.py with updated constants and docstrings - no logic changes from the vanilla SSD1680 driver -- will be applied in the next commit for diff clarity - update copyright/author sections - remove unnecessary pylint directives --- adafruit_epd/ssd1680b.py | 217 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 217 insertions(+) create mode 100644 adafruit_epd/ssd1680b.py diff --git a/adafruit_epd/ssd1680b.py b/adafruit_epd/ssd1680b.py new file mode 100644 index 0000000..469f209 --- /dev/null +++ b/adafruit_epd/ssd1680b.py @@ -0,0 +1,217 @@ +# SPDX-FileCopyrightText: 2018 Dean Miller for Adafruit Industries +# SPDX-FileCopyrightText: 2024 Joel Miller for Adafruit Industries +# +# SPDX-License-Identifier: MIT + +""" +`adafruit_epd.ssd1680b` - Adafruit SSD1680B - ePaper display driver +==================================================================================== +CircuitPython driver for Adafruit SSD1680B displays (GDEY0213B74 display module) +* Author(s): Melissa LeBlanc-Williams, Joel Miller +""" + +import time +from micropython import const +import adafruit_framebuf +from adafruit_epd.epd import Adafruit_EPD + +try: + """Needed for type annotations""" + # pylint: disable=unused-import + import typing + from typing_extensions import Literal + from busio import SPI + from digitalio import DigitalInOut +except ImportError: + pass + +__version__ = "0.0.0+auto.0" +__repo__ = "https://github.com/adafruit/Adafruit_CircuitPython_EPD.git" + +_SSD1680B_DRIVER_CONTROL = const(0x01) +_SSD1680B_GATE_VOLTAGE = const(0x03) +_SSD1680B_SOURCE_VOLTAGE = const(0x04) +_SSD1680B_INIT_SETTING = const(0x08) +_SSD1680B_INIT_WRITE_REG = const(0x09) +_SSD1680B_INIT_READ_REG = const(0x0A) +_SSD1680B_BOOSTER_SOFT_START = const(0x0C) +_SSD1680B_DEEP_SLEEP = const(0x10) +_SSD1680B_DATA_MODE = const(0x11) +_SSD1680B_SW_RESET = const(0x12) +_SSD1680B_HV_DETECT = const(0x14) +_SSD1680B_VCI_DETECT = const(0x15) +_SSD1680B_TEMP_CONTROL = const(0x18) +_SSD1680B_TEMP_WRITE = const(0x1A) +_SSD1680B_TEMP_READ = const(0x1B) +_SSD1680B_EXTTEMP_WRITE = const(0x1C) +_SSD1680B_MASTER_ACTIVATE = const(0x20) +_SSD1680B_DISP_CTRL1 = const(0x21) +_SSD1680B_DISP_CTRL2 = const(0x22) +_SSD1680B_WRITE_BWRAM = const(0x24) +_SSD1680B_WRITE_REDRAM = const(0x26) +_SSD1680B_READ_RAM = const(0x27) +_SSD1680B_VCOM_SENSE = const(0x28) +_SSD1680B_VCOM_DURATION = const(0x29) +_SSD1680B_WRITE_VCOM_OTP = const(0x2A) +_SSD1680B_WRITE_VCOM_CTRL = const(0x2B) +_SSD1680B_WRITE_VCOM_REG = const(0x2C) +_SSD1680B_READ_OTP = const(0x2D) +_SSD1680B_READ_USERID = const(0x2E) +_SSD1680B_READ_STATUS = const(0x2F) +_SSD1680B_WRITE_WS_OTP = const(0x30) +_SSD1680B_LOAD_WS_OTP = const(0x31) +_SSD1680B_WRITE_LUT = const(0x32) +_SSD1680B_CRC_CALC = const(0x34) +_SSD1680B_CRC_READ = const(0x35) +_SSD1680B_PROG_OTP = const(0x36) +_SSD1680B_WRITE_DISPLAY_OPT = const(0x37) +_SSD1680B_WRITE_USERID = const(0x38) +_SSD1680B_OTP_PROGMODE = const(0x39) +_SSD1680B_WRITE_BORDER = const(0x3C) +_SSD1680B_END_OPTION = const(0x3F) +_SSD1680B_SET_RAMXPOS = const(0x44) +_SSD1680B_SET_RAMYPOS = const(0x45) +_SSD1680B_AUTOWRITE_RED = const(0x46) +_SSD1680B_AUTOWRITE_BW = const(0x47) +_SSD1680B_SET_RAMXCOUNT = const(0x4E) +_SSD1680B_SET_RAMYCOUNT = const(0x4F) +_SSD1680B_NOP = const(0xFF) + + +class Adafruit_SSD1680B(Adafruit_EPD): + """ + Driver class for Adafruit SSD1680 "B" ePaper displays. This class is meant + to be used with Adafruit boards equipped with an SSD1680 driver chip paired + with a GDEY0213B74 display module. + """ + + def __init__( + self, + width: int, + height: int, + spi: SPI, + *, + cs_pin: DigitalInOut, + dc_pin: DigitalInOut, + sramcs_pin: DigitalInOut, + rst_pin: DigitalInOut, + busy_pin: DigitalInOut, + ) -> None: + super().__init__( + width, height, spi, cs_pin, dc_pin, sramcs_pin, rst_pin, busy_pin + ) + + stride = width + if stride % 8 != 0: + stride += 8 - stride % 8 + + self._buffer1_size = int(stride * height / 8) + self._buffer2_size = self._buffer1_size + + if sramcs_pin: + self._buffer1 = self.sram.get_view(0) + self._buffer2 = self.sram.get_view(self._buffer1_size) + else: + self._buffer1 = bytearray(self._buffer1_size) + self._buffer2 = bytearray(self._buffer2_size) + + self._framebuf1 = adafruit_framebuf.FrameBuffer( + self._buffer1, + width, + height, + stride=stride, + buf_format=adafruit_framebuf.MHMSB, + ) + self._framebuf2 = adafruit_framebuf.FrameBuffer( + self._buffer2, + width, + height, + stride=stride, + buf_format=adafruit_framebuf.MHMSB, + ) + self.set_black_buffer(0, True) + self.set_color_buffer(1, False) + + def begin(self, reset: bool = True) -> None: + """Begin communication with the display and set basic settings""" + if reset: + self.hardware_reset() + self.power_down() + + def busy_wait(self) -> None: + """ + Wait for display to be done with current task, either by polling the + busy pin, or pausing + """ + if self._busy: + while self._busy.value: + time.sleep(0.01) + else: + time.sleep(0.5) + + def power_up(self) -> None: + """Power up the display in preparation for writing RAM and updating""" + self.hardware_reset() + self.busy_wait() + self.command(_SSD1680B_SW_RESET) + self.busy_wait() + # driver output control + self.command( + _SSD1680B_DRIVER_CONTROL, + bytearray([self._height - 1, (self._height - 1) >> 8, 0x00]), + ) + # data entry mode + self.command(_SSD1680B_DATA_MODE, bytearray([0x03])) + + # Set voltages + self.command(_SSD1680B_WRITE_VCOM_REG, bytearray([0x36])) + self.command(_SSD1680B_GATE_VOLTAGE, bytearray([0x17])) + self.command(_SSD1680B_SOURCE_VOLTAGE, bytearray([0x41, 0x00, 0x32])) + + # Set ram X start/end postion + self.command(_SSD1680B_SET_RAMXPOS, bytearray([0x01, 0x10])) + # Set ram Y start/end postion + self.command( + _SSD1680B_SET_RAMYPOS, + bytearray([0, 0, self._height - 1, (self._height - 1) >> 8]), + ) + # Set border waveform + self.command(_SSD1680B_WRITE_BORDER, bytearray([0x05])) + + # Set ram X count + self.command(_SSD1680B_SET_RAMXCOUNT, bytearray([0x01])) + # Set ram Y count + self.command(_SSD1680B_SET_RAMYCOUNT, bytearray([self._height - 1, 0])) + self.busy_wait() + + def power_down(self) -> None: + """Power down the display - required when not actively displaying!""" + self.command(_SSD1680B_DEEP_SLEEP, bytearray([0x01])) + time.sleep(0.1) + + def update(self) -> None: + """Update the display from internal memory""" + self.command(_SSD1680B_DISP_CTRL2, bytearray([0xF4])) + self.command(_SSD1680B_MASTER_ACTIVATE) + self.busy_wait() + if not self._busy: + time.sleep(3) # wait 3 seconds + + def write_ram(self, index: Literal[0, 1]) -> int: + """ + Send the one byte command for starting the RAM write process. Returns + the byte read at the same time over SPI. index is the RAM buffer, can + be 0 or 1 for tri-color displays. + """ + if index == 0: + return self.command(_SSD1680B_WRITE_BWRAM, end=False) + if index == 1: + return self.command(_SSD1680B_WRITE_REDRAM, end=False) + raise RuntimeError("RAM index must be 0 or 1") + + def set_ram_address(self, x: int, y: int) -> None: + """Set the RAM address location""" + # Set RAM X address counter + self.command(_SSD1680B_SET_RAMXCOUNT, bytearray([x + 1])) + # Set RAM Y address counter + self.command(_SSD1680B_SET_RAMYCOUNT, bytearray([y, y >> 8])) From 08088ef37b94b5ff847c28cf180fddcc2fd4ad49 Mon Sep 17 00:00:00 2001 From: Joel Date: Tue, 3 Dec 2024 20:58:09 -0500 Subject: [PATCH 2/5] Update logic of new Adafruit_SSD1680B class, replacing Adafruit_SSD1680Z --- adafruit_epd/ssd1680.py | 79 +++------------------------------------- adafruit_epd/ssd1680b.py | 14 +++---- 2 files changed, 12 insertions(+), 81 deletions(-) diff --git a/adafruit_epd/ssd1680.py b/adafruit_epd/ssd1680.py index bd994b8..95a94d6 100644 --- a/adafruit_epd/ssd1680.py +++ b/adafruit_epd/ssd1680.py @@ -14,6 +14,11 @@ import adafruit_framebuf from adafruit_epd.epd import Adafruit_EPD +# for backwards compatibility +from adafruit_epd.ssd1680b import ( # pylint: disable=unused-import + Adafruit_SSD1680B as Adafruit_SSD1680Z, +) + try: """Needed for type annotations""" import typing # pylint: disable=unused-import @@ -211,77 +216,3 @@ def set_ram_address( self.command(_SSD1680_SET_RAMXCOUNT, bytearray([x + 1])) # Set RAM Y address counter self.command(_SSD1680_SET_RAMYCOUNT, bytearray([y, y >> 8])) - - -class Adafruit_SSD1680Z(Adafruit_SSD1680): - """Driver for SSD1680Z ePaper display, overriding SSD1680 settings.""" - - # pylint: disable=too-many-arguments, useless-parent-delegation - def __init__( - self, width, height, spi, *, cs_pin, dc_pin, sramcs_pin, rst_pin, busy_pin - ): - # Call the parent class's __init__() to initialize attributes - super().__init__( - width, - height, - spi, - cs_pin=cs_pin, - dc_pin=dc_pin, - sramcs_pin=sramcs_pin, - rst_pin=rst_pin, - busy_pin=busy_pin, - ) - self.busy_pin = busy_pin # Ensure busy_pin is set - - # pylint: enable=too-many-arguments, useless-parent-delegation - - def power_up(self): - """Power up sequence specifically for SSD1680Z.""" - self.hardware_reset() - self.busy_wait() - self.command(_SSD1680_SW_RESET) - self.busy_wait() - - self.command( - _SSD1680_DRIVER_CONTROL, - bytearray([self._height, (self._height) >> 8, 0x00]), - ) - self.command(_SSD1680_DATA_MODE, bytearray([0x03])) - - # Set voltages - self.command(_SSD1680_WRITE_VCOM_REG, bytearray([0x36])) - self.command(_SSD1680_GATE_VOLTAGE, bytearray([0x17])) - self.command(_SSD1680_SOURCE_VOLTAGE, bytearray([0x41, 0x00, 0x32])) - - self.command(_SSD1680_SET_RAMXPOS, bytearray([0x00, (self._width // 8)])) - self.command( - _SSD1680_SET_RAMYPOS, - bytearray([0x00, 0x00, self._height, (self._height) >> 8]), - ) - - # Set border waveform - self.command(_SSD1680_WRITE_BORDER, bytearray([0x05])) - - # Set ram X count - self.command(_SSD1680_SET_RAMXCOUNT, bytearray([0x01])) - # Set ram Y count - self.command(_SSD1680_SET_RAMYCOUNT, bytearray([self._height, 0])) - self.busy_wait() - - def update(self): - """Update the display specifically for SSD1680Z.""" - self.command(_SSD1680_DISP_CTRL2, bytearray([0xF7])) # Full update for SSD1680Z - self.command(_SSD1680_MASTER_ACTIVATE) - self.busy_wait() - if not self.busy_pin: - time.sleep(3) # Wait for update to complete - - def set_ram_address( - self, x: int, y: int - ) -> None: # pylint: disable=unused-argument, no-self-use - """Set the RAM address location, not used on this chipset but required by - the superclass""" - # Set RAM X address counter - self.command(_SSD1680_SET_RAMXCOUNT, bytearray([x])) - # Set RAM Y address counter - self.command(_SSD1680_SET_RAMYCOUNT, bytearray([y, y >> 8])) diff --git a/adafruit_epd/ssd1680b.py b/adafruit_epd/ssd1680b.py index 469f209..62ded36 100644 --- a/adafruit_epd/ssd1680b.py +++ b/adafruit_epd/ssd1680b.py @@ -7,7 +7,7 @@ `adafruit_epd.ssd1680b` - Adafruit SSD1680B - ePaper display driver ==================================================================================== CircuitPython driver for Adafruit SSD1680B displays (GDEY0213B74 display module) -* Author(s): Melissa LeBlanc-Williams, Joel Miller +* Author(s): Melissa LeBlanc-Williams, Joel Miller, Mikey Sklar """ import time @@ -158,7 +158,7 @@ def power_up(self) -> None: # driver output control self.command( _SSD1680B_DRIVER_CONTROL, - bytearray([self._height - 1, (self._height - 1) >> 8, 0x00]), + bytearray([self._height, self._height >> 8, 0x00]), ) # data entry mode self.command(_SSD1680B_DATA_MODE, bytearray([0x03])) @@ -169,11 +169,11 @@ def power_up(self) -> None: self.command(_SSD1680B_SOURCE_VOLTAGE, bytearray([0x41, 0x00, 0x32])) # Set ram X start/end postion - self.command(_SSD1680B_SET_RAMXPOS, bytearray([0x01, 0x10])) + self.command(_SSD1680B_SET_RAMXPOS, bytearray([0x00, self._width // 8])) # Set ram Y start/end postion self.command( _SSD1680B_SET_RAMYPOS, - bytearray([0, 0, self._height - 1, (self._height - 1) >> 8]), + bytearray([0, 0, self._height, self._height >> 8]), ) # Set border waveform self.command(_SSD1680B_WRITE_BORDER, bytearray([0x05])) @@ -181,7 +181,7 @@ def power_up(self) -> None: # Set ram X count self.command(_SSD1680B_SET_RAMXCOUNT, bytearray([0x01])) # Set ram Y count - self.command(_SSD1680B_SET_RAMYCOUNT, bytearray([self._height - 1, 0])) + self.command(_SSD1680B_SET_RAMYCOUNT, bytearray([self._height, 0])) self.busy_wait() def power_down(self) -> None: @@ -191,7 +191,7 @@ def power_down(self) -> None: def update(self) -> None: """Update the display from internal memory""" - self.command(_SSD1680B_DISP_CTRL2, bytearray([0xF4])) + self.command(_SSD1680B_DISP_CTRL2, bytearray([0xF7])) self.command(_SSD1680B_MASTER_ACTIVATE) self.busy_wait() if not self._busy: @@ -212,6 +212,6 @@ def write_ram(self, index: Literal[0, 1]) -> int: def set_ram_address(self, x: int, y: int) -> None: """Set the RAM address location""" # Set RAM X address counter - self.command(_SSD1680B_SET_RAMXCOUNT, bytearray([x + 1])) + self.command(_SSD1680B_SET_RAMXCOUNT, bytearray([x])) # Set RAM Y address counter self.command(_SSD1680B_SET_RAMYCOUNT, bytearray([y, y >> 8])) From 12b109088af4a4f2e465de9367da15b0164b21d7 Mon Sep 17 00:00:00 2001 From: Joel Date: Tue, 3 Dec 2024 20:58:20 -0500 Subject: [PATCH 3/5] Add new Adafruit_SSD1680B driver to example scripts --- examples/epd_bitmap.py | 2 ++ examples/epd_blinka.py | 2 ++ examples/epd_pillow_demo.py | 2 ++ examples/epd_pillow_image.py | 2 ++ examples/epd_simpletest.py | 2 ++ 5 files changed, 10 insertions(+) diff --git a/examples/epd_bitmap.py b/examples/epd_bitmap.py index bbe69cc..6bc31b9 100644 --- a/examples/epd_bitmap.py +++ b/examples/epd_bitmap.py @@ -11,6 +11,7 @@ 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.ssd1680 import Adafruit_SSD1680 # pylint: disable=unused-import +from adafruit_epd.ssd1680b import Adafruit_SSD1680B # pylint: disable=unused-import from adafruit_epd.ssd1681 import Adafruit_SSD1681 # pylint: disable=unused-import from adafruit_epd.uc8151d import Adafruit_UC8151D # pylint: disable=unused-import from adafruit_epd.ek79686 import Adafruit_EK79686 # pylint: disable=unused-import @@ -29,6 +30,7 @@ # display = Adafruit_SSD1608(200, 200, # 1.54" HD mono display # display = Adafruit_SSD1675(122, 250, # 2.13" HD mono display # display = Adafruit_SSD1680(122, 250, # 2.13" HD Tri-color display +# display = Adafruit_SSD1680B(122, 250 # 2.13" HD (Tri-color or mono) with GDEY0213B74 # display = Adafruit_SSD1681(200, 200, # 1.54" HD Tri-color display # display = Adafruit_IL91874(176, 264, # 2.7" Tri-color display # display = Adafruit_EK79686(176, 264, # 2.7" Tri-color display diff --git a/examples/epd_blinka.py b/examples/epd_blinka.py index a0a4436..e0f3d7c 100644 --- a/examples/epd_blinka.py +++ b/examples/epd_blinka.py @@ -16,6 +16,7 @@ from adafruit_epd.ssd1675 import Adafruit_SSD1675 # pylint: disable=unused-import from adafruit_epd.ssd1675b import Adafruit_SSD1675B # pylint: disable=unused-import from adafruit_epd.ssd1680 import Adafruit_SSD1680 # pylint: disable=unused-import +from adafruit_epd.ssd1680b import Adafruit_SSD1680B # pylint: disable=unused-import from adafruit_epd.ssd1681 import Adafruit_SSD1681 # pylint: disable=unused-import from adafruit_epd.uc8151d import Adafruit_UC8151D # pylint: disable=unused-import from adafruit_epd.ek79686 import Adafruit_EK79686 # pylint: disable=unused-import @@ -36,6 +37,7 @@ print("Creating display") # display = Adafruit_SSD1608(200, 200, # 1.54" HD mono display # display = Adafruit_SSD1680(122, 250, # 2.13" HD Tri-color display +# display = Adafruit_SSD1680B(122, 250 # 2.13" HD (Tri-color or mono) with GDEY0213B74 # 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 diff --git a/examples/epd_pillow_demo.py b/examples/epd_pillow_demo.py index 7f6afe5..8a092ef 100644 --- a/examples/epd_pillow_demo.py +++ b/examples/epd_pillow_demo.py @@ -16,6 +16,7 @@ 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.ssd1680 import Adafruit_SSD1680 # pylint: disable=unused-import +from adafruit_epd.ssd1680b import Adafruit_SSD1680B # pylint: disable=unused-import from adafruit_epd.ssd1681 import Adafruit_SSD1681 # pylint: disable=unused-import from adafruit_epd.uc8151d import Adafruit_UC8151D # pylint: disable=unused-import from adafruit_epd.ek79686 import Adafruit_EK79686 # pylint: disable=unused-import @@ -44,6 +45,7 @@ # display = Adafruit_SSD1608(200, 200, # 1.54" HD mono display # display = Adafruit_SSD1675(122, 250, # 2.13" HD mono display # display = Adafruit_SSD1680(122, 250, # 2.13" HD Tri-color or mono display +# display = Adafruit_SSD1680B(122, 250 # 2.13" HD (Tri-color or mono) with GDEY0213B74 # display = Adafruit_SSD1681(200, 200, # 1.54" HD Tri-color display # display = Adafruit_IL91874(176, 264, # 2.7" Tri-color display # display = Adafruit_EK79686(176, 264, # 2.7" Tri-color display diff --git a/examples/epd_pillow_image.py b/examples/epd_pillow_image.py index bdbb11d..bfb031a 100644 --- a/examples/epd_pillow_image.py +++ b/examples/epd_pillow_image.py @@ -18,6 +18,7 @@ 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.ssd1680 import Adafruit_SSD1680 # pylint: disable=unused-import +from adafruit_epd.ssd1680b import Adafruit_SSD1680B # pylint: disable=unused-import from adafruit_epd.ssd1681 import Adafruit_SSD1681 # pylint: disable=unused-import from adafruit_epd.uc8151d import Adafruit_UC8151D # pylint: disable=unused-import from adafruit_epd.ek79686 import Adafruit_EK79686 # pylint: disable=unused-import @@ -35,6 +36,7 @@ # display = Adafruit_SSD1608(200, 200, # 1.54" HD mono display # display = Adafruit_SSD1675(122, 250, # 2.13" HD mono display # display = Adafruit_SSD1680(122, 250, # 2.13" HD Tri-color or mono display +# display = Adafruit_SSD1680B(122, 250 # 2.13" HD (Tri-color or mono) with GDEY0213B74 # display = Adafruit_SSD1681(200, 200, # 1.54" HD Tri-color display # display = Adafruit_IL91874(176, 264, # 2.7" Tri-color display # display = Adafruit_EK79686(176, 264, # 2.7" Tri-color display diff --git a/examples/epd_simpletest.py b/examples/epd_simpletest.py index 2f8f5a6..36afe33 100644 --- a/examples/epd_simpletest.py +++ b/examples/epd_simpletest.py @@ -11,6 +11,7 @@ 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.ssd1680 import Adafruit_SSD1680 # pylint: disable=unused-import +from adafruit_epd.ssd1680b import Adafruit_SSD1680B # pylint: disable=unused-import from adafruit_epd.ssd1681 import Adafruit_SSD1681 # pylint: disable=unused-import from adafruit_epd.uc8151d import Adafruit_UC8151D # pylint: disable=unused-import from adafruit_epd.ek79686 import Adafruit_EK79686 # pylint: disable=unused-import @@ -28,6 +29,7 @@ # display = Adafruit_SSD1608(200, 200, # 1.54" HD mono display # display = Adafruit_SSD1675(122, 250, # 2.13" HD mono display # display = Adafruit_SSD1680(122, 250, # 2.13" HD Tri-color display +# display = Adafruit_SSD1680B(122, 250 # 2.13" HD (Tri-color or mono) with GDEY0213B74 # display = Adafruit_SSD1681(200, 200, # 1.54" HD Tri-color display # display = Adafruit_IL91874(176, 264, # 2.7" Tri-color display # display = Adafruit_EK79686(176, 264, # 2.7" Tri-color display From a34f6f870792aee7e33f74c381e0eaaccb65a251 Mon Sep 17 00:00:00 2001 From: Joel Date: Tue, 3 Dec 2024 20:58:25 -0500 Subject: [PATCH 4/5] Fix NOP command and add missing Read RAM Option command --- adafruit_epd/ssd1680.py | 3 ++- adafruit_epd/ssd1680b.py | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/adafruit_epd/ssd1680.py b/adafruit_epd/ssd1680.py index 95a94d6..30c032e 100644 --- a/adafruit_epd/ssd1680.py +++ b/adafruit_epd/ssd1680.py @@ -73,13 +73,14 @@ _SSD1680_OTP_PROGMODE = const(0x39) _SSD1680_WRITE_BORDER = const(0x3C) _SSD1680_END_OPTION = const(0x3F) +_SSD1680_READ_RAM_OPT = const(0x41) _SSD1680_SET_RAMXPOS = const(0x44) _SSD1680_SET_RAMYPOS = const(0x45) _SSD1680_AUTOWRITE_RED = const(0x46) _SSD1680_AUTOWRITE_BW = const(0x47) _SSD1680_SET_RAMXCOUNT = const(0x4E) _SSD1680_SET_RAMYCOUNT = const(0x4F) -_SSD1680_NOP = const(0xFF) +_SSD1680_NOP = const(0x7F) class Adafruit_SSD1680(Adafruit_EPD): diff --git a/adafruit_epd/ssd1680b.py b/adafruit_epd/ssd1680b.py index 62ded36..f7b0132 100644 --- a/adafruit_epd/ssd1680b.py +++ b/adafruit_epd/ssd1680b.py @@ -69,13 +69,14 @@ _SSD1680B_OTP_PROGMODE = const(0x39) _SSD1680B_WRITE_BORDER = const(0x3C) _SSD1680B_END_OPTION = const(0x3F) +_SSD1680B_READ_RAM_OPT = const(0x41) _SSD1680B_SET_RAMXPOS = const(0x44) _SSD1680B_SET_RAMYPOS = const(0x45) _SSD1680B_AUTOWRITE_RED = const(0x46) _SSD1680B_AUTOWRITE_BW = const(0x47) _SSD1680B_SET_RAMXCOUNT = const(0x4E) _SSD1680B_SET_RAMYCOUNT = const(0x4F) -_SSD1680B_NOP = const(0xFF) +_SSD1680B_NOP = const(0x7F) class Adafruit_SSD1680B(Adafruit_EPD): From fb5941adc6e4ac7fd900cf6b741b647f59fe7576 Mon Sep 17 00:00:00 2001 From: Joel Date: Tue, 3 Dec 2024 22:31:03 -0500 Subject: [PATCH 5/5] Add Raspberry Pi interactive example and test (grid) image --- examples/epd_bonnet_grid_250x122.bmp | Bin 0 -> 91798 bytes examples/epd_bonnet_grid_250x122.bmp.license | 2 + examples/rpi_epd_bonnet_interactive.py | 102 +++++++++++++++++++ 3 files changed, 104 insertions(+) create mode 100644 examples/epd_bonnet_grid_250x122.bmp create mode 100644 examples/epd_bonnet_grid_250x122.bmp.license create mode 100644 examples/rpi_epd_bonnet_interactive.py diff --git a/examples/epd_bonnet_grid_250x122.bmp b/examples/epd_bonnet_grid_250x122.bmp new file mode 100644 index 0000000000000000000000000000000000000000..1b7a2163a05cc69026f733c54bdf6bbb25cfa061 GIT binary patch literal 91798 zcmeI!!EF>k5JXWs3ql|Q0^m*#oCtzI2o}i_gGHA|mMn4Iu4idIvv8VUzuooq+pizb zPk(>DoX_X;`F%b=&*%B+)A{}M^!?xezkcxxfldN1*UuqveS7g0jSzTr8D_fkpmTZj zH+g~tKk}LH=DTT~^PTT}*Wcgvp>FWT;_?4B%-?q>0!;)q&G324iO!2c0F4{P>saR> z&IKMcLSUH;ud*+DlaUo@=JlNne7Db~)n-y3}&@0|!V5J-Df_fFhsgupTyGs}4&-+enbjPHDJ^nJW{BG5oUe-D8ZckasXG8!|>5)Of72^-lvP`>N$P5X@Rd~fu9 zymundKp^c^-8*rk5dzC-%q-`9d|#HZK<_~LuD>_!Grse^(f9G*i9iDZ{XGOu+_@{i z%V^9jOE?6UC2VBxK>4n}H|;aN^S#mc@!p9*1A(+xb??NDMhGmUF|(Za@qJms0=)y} zyZ+v^&-l*wM&HMKCjt!w^!E@rap$i5E~7ECEa4DXmavh%1LeE^-n7s7&i6*&$9pFN z4Fu9&)x8rp8X>TZ#>{fw$M)?=l)Q%MuQOWeFSEJ5avs?@jxR?|g6ceY|%f&_E#V zRoy#rqY(njXv{3~)n-y3}&@0|!V5YXR4;KZG~^1F=2%(8?-U|GUO z_70Tq`g_wp<2&CQeIM_g2s98#dsX*N+-QWrG8!|>c^}`GB`nZ8P`>N$P5X@Rd~fu9 wymundKtO*FffIM`%I`87Gs_YVfn^CB**j3a>+enbjPHDJ^nJW{BCwvoAB`KIu>b%7 literal 0 HcmV?d00001 diff --git a/examples/epd_bonnet_grid_250x122.bmp.license b/examples/epd_bonnet_grid_250x122.bmp.license new file mode 100644 index 0000000..b4b8f3d --- /dev/null +++ b/examples/epd_bonnet_grid_250x122.bmp.license @@ -0,0 +1,2 @@ +# SPDX-FileCopyrightText: 2024 Joel Miller for Adafruit Industries +# SPDX-License-Identifier: MIT diff --git a/examples/rpi_epd_bonnet_interactive.py b/examples/rpi_epd_bonnet_interactive.py new file mode 100644 index 0000000..3f77b32 --- /dev/null +++ b/examples/rpi_epd_bonnet_interactive.py @@ -0,0 +1,102 @@ +# SPDX-FileCopyrightText: 2024 Joel Miller for Adafruit Industries +# SPDX-License-Identifier: MIT + +# pylint: disable=line-too-long +""" +A minimalist example for tinkering with eInk displays interactively on a Raspberry Pi. + +1. Install system packages for working with Python programs and images + + ```bash + sudo apt update + sudo apt install -y python3-dev python3-pil python3-venv + + ``` + +2. Create and activate a Python virtual environment (named `examples`) + + ```bash + python3 -m venv --system-site-packages --upgrade-deps ./examples + source ./examples/bin/activate + ``` + +3. Install the Adafruit CircuitPython EPD package + + ```bash + pip install adafruit-circuitpython-epd + ``` + +4. Download this script and some example images from GitHub + + ```bash + wget https://raw.githubusercontent.com/adafruit/Adafruit_CircuitPython_EPD/refs/heads/main/examples/rpi_epd_bonnet_interactive.py + wget https://raw.githubusercontent.com/adafruit/Adafruit_CircuitPython_EPD/refs/heads/main/examples/epd_bonnet_blinka_250x122.bmp + wget https://raw.githubusercontent.com/adafruit/Adafruit_CircuitPython_EPD/refs/heads/main/examples/epd_bonnet_grid_250x122.bmp + ``` + +5. Try it out! + + ```bash + python -i rpi_epd_bonnet_interactive.py + ``` +""" + +import board +from busio import SPI +from digitalio import DigitalInOut + +try: + from PIL import Image # pylint: disable=unused-import +except ImportError: + print("Failed to import Pillow (PIL), the image examples below will not work.") + + +INTERACTIVE_EXAMPLES_HELP = """# EXAMPLES + +# Fill the entire display with black pixels: +>>> display.fill(display.BLACK) +>>> display.display() + +# Fill the entire display with white pixels: +>>> display.fill(display.WHITE) +>>> display.display() + +# Display the example grid image: +>>> display.image(Image.open("epd_bonnet_grid_250x122.bmp")) +>>> display.display() + +# Display the example blinka image: +>>> display.image(Image.open("epd_bonnet_blinka_250x122.bmp")) +>>> display.display() + +# If you want to try a different driver: import, setup, repeat: +>>> from adafruit_epd.ssd1675 import Adafruit_SSD1675 +>>> display = setup_display(Adafruit_SSD1675) + +# To quit out of this interactive prompt: +>>> exit() + +# Try it yourself! +""" + + +def setup_display(driver_class, width=122, height=250): + disp = driver_class( + width=width, + height=height, + spi=SPI(board.SCK, MOSI=board.MOSI, MISO=board.MISO), + cs_pin=DigitalInOut(board.CE0), + dc_pin=DigitalInOut(board.D22), + sramcs_pin=None, + rst_pin=DigitalInOut(board.D27), + busy_pin=DigitalInOut(board.D17), + ) + disp.rotation = 1 + return disp + + +if __name__ == "__main__": + from adafruit_epd.ssd1680b import Adafruit_SSD1680B + + display = setup_display(Adafruit_SSD1680B) + print(INTERACTIVE_EXAMPLES_HELP)