Merge pull request #77 from tekktrik/dev/typing-fix
Fix Unions to Literals
This commit is contained in:
commit
20f292d39b
11 changed files with 33 additions and 22 deletions
|
|
@ -18,6 +18,7 @@ from adafruit_epd import mcp_sram
|
||||||
try:
|
try:
|
||||||
"""Needed for type annotations"""
|
"""Needed for type annotations"""
|
||||||
from typing import Any, Union, Callable, Optional
|
from typing import Any, Union, Callable, Optional
|
||||||
|
from typing_extensions import Literal
|
||||||
from busio import SPI
|
from busio import SPI
|
||||||
from digitalio import DigitalInOut
|
from digitalio import DigitalInOut
|
||||||
from circuitpython_typing.pil import Image
|
from circuitpython_typing.pil import Image
|
||||||
|
|
@ -247,7 +248,7 @@ class Adafruit_EPD: # pylint: disable=too-many-instance-attributes, too-many-pu
|
||||||
"""Set the RAM address location, must be implemented in subclass"""
|
"""Set the RAM address location, must be implemented in subclass"""
|
||||||
raise NotImplementedError()
|
raise NotImplementedError()
|
||||||
|
|
||||||
def set_black_buffer(self, index: Union[0, 1], inverted: bool) -> None:
|
def set_black_buffer(self, index: Literal[0, 1], inverted: bool) -> None:
|
||||||
"""Set the index for the black buffer data (0 or 1) and whether its inverted"""
|
"""Set the index for the black buffer data (0 or 1) and whether its inverted"""
|
||||||
if index == 0:
|
if index == 0:
|
||||||
self._blackframebuf = self._framebuf1
|
self._blackframebuf = self._framebuf1
|
||||||
|
|
@ -257,7 +258,7 @@ class Adafruit_EPD: # pylint: disable=too-many-instance-attributes, too-many-pu
|
||||||
raise RuntimeError("Buffer index must be 0 or 1")
|
raise RuntimeError("Buffer index must be 0 or 1")
|
||||||
self._black_inverted = inverted
|
self._black_inverted = inverted
|
||||||
|
|
||||||
def set_color_buffer(self, index: Union[0, 1], inverted: bool) -> None:
|
def set_color_buffer(self, index: Literal[0, 1], inverted: bool) -> None:
|
||||||
"""Set the index for the color buffer data (0 or 1) and whether its inverted"""
|
"""Set the index for the color buffer data (0 or 1) and whether its inverted"""
|
||||||
if index == 0:
|
if index == 0:
|
||||||
self._colorframebuf = self._framebuf1
|
self._colorframebuf = self._framebuf1
|
||||||
|
|
@ -271,7 +272,7 @@ class Adafruit_EPD: # pylint: disable=too-many-instance-attributes, too-many-pu
|
||||||
self,
|
self,
|
||||||
func: Callable,
|
func: Callable,
|
||||||
args: Any,
|
args: Any,
|
||||||
color: Union[0, 1, 2, 3, 4, 5],
|
color: Literal[0, 1, 2, 3, 4, 5],
|
||||||
) -> None:
|
) -> None:
|
||||||
black = getattr(self._blackframebuf, func)
|
black = getattr(self._blackframebuf, func)
|
||||||
red = getattr(self._colorframebuf, func)
|
red = getattr(self._colorframebuf, func)
|
||||||
|
|
@ -368,7 +369,7 @@ class Adafruit_EPD: # pylint: disable=too-many-instance-attributes, too-many-pu
|
||||||
return self._width
|
return self._width
|
||||||
|
|
||||||
@property
|
@property
|
||||||
def rotation(self) -> Union[0, 1, 2, 3]:
|
def rotation(self) -> Literal[0, 1, 2, 3]:
|
||||||
"""The rotation of the display, can be one of (0, 1, 2, 3)"""
|
"""The rotation of the display, can be one of (0, 1, 2, 3)"""
|
||||||
return self._framebuf1.rotation
|
return self._framebuf1.rotation
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -16,7 +16,8 @@ from adafruit_epd.epd import Adafruit_EPD
|
||||||
|
|
||||||
try:
|
try:
|
||||||
"""Needed for type annotations"""
|
"""Needed for type annotations"""
|
||||||
from typing import Union
|
import typing # pylint: disable=unused-import
|
||||||
|
from typing_extensions import Literal
|
||||||
from busio import SPI
|
from busio import SPI
|
||||||
from digitalio import DigitalInOut
|
from digitalio import DigitalInOut
|
||||||
|
|
||||||
|
|
@ -144,7 +145,7 @@ class Adafruit_IL0373(Adafruit_EPD):
|
||||||
if not self._busy:
|
if not self._busy:
|
||||||
time.sleep(15) # wait 15 seconds
|
time.sleep(15) # wait 15 seconds
|
||||||
|
|
||||||
def write_ram(self, index: Union[0, 1]) -> int:
|
def write_ram(self, index: Literal[0, 1]) -> int:
|
||||||
"""Send the one byte command for starting the RAM write process. Returns
|
"""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
|
the byte read at the same time over SPI. index is the RAM buffer, can be
|
||||||
0 or 1 for tri-color displays."""
|
0 or 1 for tri-color displays."""
|
||||||
|
|
|
||||||
|
|
@ -16,7 +16,8 @@ from adafruit_epd.epd import Adafruit_EPD
|
||||||
|
|
||||||
try:
|
try:
|
||||||
"""Needed for type annotations"""
|
"""Needed for type annotations"""
|
||||||
from typing import Union
|
import typing # pylint: disable=unused-import
|
||||||
|
from typing_extensions import Literal
|
||||||
from busio import SPI
|
from busio import SPI
|
||||||
from digitalio import DigitalInOut
|
from digitalio import DigitalInOut
|
||||||
|
|
||||||
|
|
@ -144,7 +145,7 @@ class Adafruit_IL0398(Adafruit_EPD):
|
||||||
if not self._busy:
|
if not self._busy:
|
||||||
time.sleep(15) # wait 15 seconds
|
time.sleep(15) # wait 15 seconds
|
||||||
|
|
||||||
def write_ram(self, index: Union[0, 1]) -> int:
|
def write_ram(self, index: Literal[0, 1]) -> int:
|
||||||
"""Send the one byte command for starting the RAM write process. Returns
|
"""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
|
the byte read at the same time over SPI. index is the RAM buffer, can be
|
||||||
0 or 1 for tri-color displays."""
|
0 or 1 for tri-color displays."""
|
||||||
|
|
|
||||||
|
|
@ -16,7 +16,8 @@ from adafruit_epd.epd import Adafruit_EPD
|
||||||
|
|
||||||
try:
|
try:
|
||||||
"Needed for type annotations"
|
"Needed for type annotations"
|
||||||
from typing import Union
|
import typing # pylint: disable=unused-import
|
||||||
|
from typing_extensions import Literal
|
||||||
from busio import SPI
|
from busio import SPI
|
||||||
from digitalio import DigitalInOut
|
from digitalio import DigitalInOut
|
||||||
|
|
||||||
|
|
@ -167,7 +168,7 @@ class Adafruit_IL91874(Adafruit_EPD):
|
||||||
if not self._busy:
|
if not self._busy:
|
||||||
time.sleep(16) # wait 16 seconds
|
time.sleep(16) # wait 16 seconds
|
||||||
|
|
||||||
def write_ram(self, index: Union[0, 1]) -> int:
|
def write_ram(self, index: Literal[0, 1]) -> int:
|
||||||
"""Send the one byte command for starting the RAM write process. Returns
|
"""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
|
the byte read at the same time over SPI. index is the RAM buffer, can be
|
||||||
0 or 1 for tri-color displays."""
|
0 or 1 for tri-color displays."""
|
||||||
|
|
|
||||||
|
|
@ -16,7 +16,8 @@ from adafruit_epd.epd import Adafruit_EPD
|
||||||
|
|
||||||
try:
|
try:
|
||||||
"""Needed for type annotations"""
|
"""Needed for type annotations"""
|
||||||
from typing import Union
|
import typing # pylint: disable=unused-import
|
||||||
|
from typing_extensions import Literal
|
||||||
from busio import SPI
|
from busio import SPI
|
||||||
from digitalio import DigitalInOut
|
from digitalio import DigitalInOut
|
||||||
|
|
||||||
|
|
@ -156,7 +157,7 @@ class Adafruit_SSD1608(Adafruit_EPD):
|
||||||
if not self._busy:
|
if not self._busy:
|
||||||
time.sleep(3) # wait 3 seconds
|
time.sleep(3) # wait 3 seconds
|
||||||
|
|
||||||
def write_ram(self, index: Union[0]) -> int:
|
def write_ram(self, index: Literal[0]) -> int:
|
||||||
"""Send the one byte command for starting the RAM write process. Returns
|
"""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
|
the byte read at the same time over SPI. index is the RAM buffer, can be
|
||||||
0 or 1 for tri-color displays."""
|
0 or 1 for tri-color displays."""
|
||||||
|
|
|
||||||
|
|
@ -16,7 +16,8 @@ from adafruit_epd.epd import Adafruit_EPD
|
||||||
|
|
||||||
try:
|
try:
|
||||||
"""Needed for type annotations"""
|
"""Needed for type annotations"""
|
||||||
from typing import Union
|
import typing # pylint: disable=unused-import
|
||||||
|
from typing_extensions import Literal
|
||||||
from busio import SPI
|
from busio import SPI
|
||||||
from digitalio import DigitalInOut
|
from digitalio import DigitalInOut
|
||||||
|
|
||||||
|
|
@ -178,7 +179,7 @@ class Adafruit_SSD1675(Adafruit_EPD):
|
||||||
if not self._busy:
|
if not self._busy:
|
||||||
time.sleep(3) # wait 3 seconds
|
time.sleep(3) # wait 3 seconds
|
||||||
|
|
||||||
def write_ram(self, index: Union[0, 1]) -> int:
|
def write_ram(self, index: Literal[0, 1]) -> int:
|
||||||
"""Send the one byte command for starting the RAM write process. Returns
|
"""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
|
the byte read at the same time over SPI. index is the RAM buffer, can be
|
||||||
0 or 1 for tri-color displays."""
|
0 or 1 for tri-color displays."""
|
||||||
|
|
|
||||||
|
|
@ -16,7 +16,8 @@ from adafruit_epd.epd import Adafruit_EPD
|
||||||
|
|
||||||
try:
|
try:
|
||||||
"""Needed for type annotations"""
|
"""Needed for type annotations"""
|
||||||
from typing import Union
|
import typing # pylint: disable=unused-import
|
||||||
|
from typing_extensions import Literal
|
||||||
from busio import SPI
|
from busio import SPI
|
||||||
from digitalio import DigitalInOut
|
from digitalio import DigitalInOut
|
||||||
|
|
||||||
|
|
@ -220,7 +221,7 @@ class Adafruit_SSD1675B(Adafruit_EPD):
|
||||||
if not self._busy:
|
if not self._busy:
|
||||||
time.sleep(3) # wait 3 seconds
|
time.sleep(3) # wait 3 seconds
|
||||||
|
|
||||||
def write_ram(self, index: Union[0, 1]) -> int:
|
def write_ram(self, index: Literal[0, 1]) -> int:
|
||||||
"""Send the one byte command for starting the RAM write process. Returns
|
"""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
|
the byte read at the same time over SPI. index is the RAM buffer, can be
|
||||||
0 or 1 for tri-color displays."""
|
0 or 1 for tri-color displays."""
|
||||||
|
|
|
||||||
|
|
@ -16,7 +16,8 @@ from adafruit_epd.epd import Adafruit_EPD
|
||||||
|
|
||||||
try:
|
try:
|
||||||
"""Needed for type annotations"""
|
"""Needed for type annotations"""
|
||||||
from typing import Union
|
import typing # pylint: disable=unused-import
|
||||||
|
from typing_extensions import Literal
|
||||||
from busio import SPI
|
from busio import SPI
|
||||||
from digitalio import DigitalInOut
|
from digitalio import DigitalInOut
|
||||||
|
|
||||||
|
|
@ -191,7 +192,7 @@ class Adafruit_SSD1680(Adafruit_EPD):
|
||||||
if not self._busy:
|
if not self._busy:
|
||||||
time.sleep(3) # wait 3 seconds
|
time.sleep(3) # wait 3 seconds
|
||||||
|
|
||||||
def write_ram(self, index: Union[0, 1]) -> int:
|
def write_ram(self, index: Literal[0, 1]) -> int:
|
||||||
"""Send the one byte command for starting the RAM write process. Returns
|
"""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
|
the byte read at the same time over SPI. index is the RAM buffer, can be
|
||||||
0 or 1 for tri-color displays."""
|
0 or 1 for tri-color displays."""
|
||||||
|
|
|
||||||
|
|
@ -15,7 +15,8 @@ import adafruit_framebuf
|
||||||
from adafruit_epd.epd import Adafruit_EPD
|
from adafruit_epd.epd import Adafruit_EPD
|
||||||
|
|
||||||
try:
|
try:
|
||||||
from typing import Union
|
import typing # pylint: disable=unused-import
|
||||||
|
from typing_extensions import Literal
|
||||||
from busio import SPI
|
from busio import SPI
|
||||||
from digitalio import DigitalInOut
|
from digitalio import DigitalInOut
|
||||||
|
|
||||||
|
|
@ -173,7 +174,7 @@ class Adafruit_SSD1681(Adafruit_EPD):
|
||||||
if not self._busy:
|
if not self._busy:
|
||||||
time.sleep(3) # wait 3 seconds
|
time.sleep(3) # wait 3 seconds
|
||||||
|
|
||||||
def write_ram(self, index: Union[0, 1]) -> int:
|
def write_ram(self, index: Literal[0, 1]) -> int:
|
||||||
"""Send the one byte command for starting the RAM write process. Returns
|
"""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
|
the byte read at the same time over SPI. index is the RAM buffer, can be
|
||||||
0 or 1 for tri-color displays."""
|
0 or 1 for tri-color displays."""
|
||||||
|
|
|
||||||
|
|
@ -16,7 +16,8 @@ from adafruit_epd.epd import Adafruit_EPD
|
||||||
|
|
||||||
try:
|
try:
|
||||||
"""Needed for type annotations"""
|
"""Needed for type annotations"""
|
||||||
from typing import Union
|
import typing # pylint: disable=unused-import
|
||||||
|
from typing_extensions import Literal
|
||||||
from busio import SPI
|
from busio import SPI
|
||||||
from digitalio import DigitalInOut
|
from digitalio import DigitalInOut
|
||||||
|
|
||||||
|
|
@ -152,7 +153,7 @@ class Adafruit_UC8151D(Adafruit_EPD):
|
||||||
if not self._busy:
|
if not self._busy:
|
||||||
time.sleep(15) # wait 15 seconds
|
time.sleep(15) # wait 15 seconds
|
||||||
|
|
||||||
def write_ram(self, index: Union[0, 1]) -> int:
|
def write_ram(self, index: Literal[0, 1]) -> int:
|
||||||
"""Send the one byte command for starting the RAM write process. Returns
|
"""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
|
the byte read at the same time over SPI. index is the RAM buffer, can be
|
||||||
0 or 1 for tri-color displays."""
|
0 or 1 for tri-color displays."""
|
||||||
|
|
|
||||||
|
|
@ -5,3 +5,4 @@
|
||||||
Adafruit-Blinka
|
Adafruit-Blinka
|
||||||
adafruit-circuitpython-busdevice
|
adafruit-circuitpython-busdevice
|
||||||
adafruit-circuitpython-framebuf
|
adafruit-circuitpython-framebuf
|
||||||
|
typing-extensions~=4.0
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue