Skip to content

initial typing support, mypy passes #111

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Apr 27, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
# SPDX-FileCopyrightText: 2022 Kattni Rembor, written for Adafruit Industries
# SPDX-FileCopyrightText: 2023 Matt Land
#
# SPDX-License-Identifier: MIT

Expand Down Expand Up @@ -47,3 +48,5 @@ _build
.idea
.vscode
*~

.mypy_cache/
20 changes: 18 additions & 2 deletions adafruit_rgb_display/hx8353.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
# SPDX-FileCopyrightText: 2017 Radomir Dopieralski for Adafruit Industries
# SPDX-FileCopyrightText: 2023 Matt Land
#
# SPDX-License-Identifier: MIT

Expand All @@ -8,11 +9,17 @@

A simple driver for the HX8353-based displays.

* Author(s): Radomir Dopieralski, Michael McWethy
* Author(s): Radomir Dopieralski, Michael McWethy, Matt Land
"""
from micropython import const
from adafruit_rgb_display.rgb import DisplaySPI

try:
from typing import Optional
import digitalio
import busio
except ImportError:
pass

__version__ = "0.0.0+auto.0"
__repo__ = "https://github.com/adafruit/Adafruit_CircuitPython_RGB_Display.git"
Expand Down Expand Up @@ -59,5 +66,14 @@ class HX8353(DisplaySPI):
_ENCODE_POS = ">HH"

# pylint: disable-msg=useless-super-delegation, too-many-arguments
def __init__(self, spi, dc, cs, rst=None, width=128, height=128, rotation=0):
def __init__(
self,
spi: busio.SPI,
dc: digitalio.DigitalInOut,
cs: digitalio.DigitalInOut,
rst: Optional[digitalio.DigitalInOut] = None,
width: int = 128,
height: int = 128,
rotation: int = 0,
) -> None:
super().__init__(spi, dc, cs, rst, width, height, rotation)
30 changes: 19 additions & 11 deletions adafruit_rgb_display/hx8357.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
# SPDX-FileCopyrightText: 2019 Melissa LeBlanc-Williams for Adafruit Industries
# SPDX-FileCopyrightText: 2023 Matt Land
#
# SPDX-License-Identifier: MIT

Expand All @@ -8,11 +9,18 @@

A simple driver for the HX8357-based displays.

* Author(s): Melissa LeBlanc-Williams
* Author(s): Melissa LeBlanc-Williams, Matt Land
"""
from micropython import const
from adafruit_rgb_display.rgb import DisplaySPI

try:
from typing import Optional
import digitalio
import busio
except ImportError:
pass

__version__ = "0.0.0+auto.0"
__repo__ = "https://github.com/adafruit/Adafruit_CircuitPython_RGB_Display.git"

Expand Down Expand Up @@ -94,16 +102,16 @@ class HX8357(DisplaySPI):
# pylint: disable-msg=useless-super-delegation, too-many-arguments
def __init__(
self,
spi,
dc,
cs,
rst=None,
width=480,
height=320,
baudrate=16000000,
polarity=0,
phase=0,
rotation=0,
spi: busio.SPI,
dc: digitalio.DigitalInOut,
cs: digitalio.DigitalInOut,
rst: Optional[digitalio.DigitalInOut] = None,
width: int = 480,
height: int = 320,
baudrate: int = 16000000,
polarity: int = 0,
phase: int = 0,
rotation: int = 0,
):
super().__init__(
spi,
Expand Down
34 changes: 22 additions & 12 deletions adafruit_rgb_display/ili9341.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
# SPDX-FileCopyrightText: 2017 Radomir Dopieralski for Adafruit Industries
# SPDX-FileCopyrightText: 2023 Matt Land
#
# SPDX-License-Identifier: MIT

Expand All @@ -8,12 +9,19 @@

A simple driver for the ILI9341/ILI9340-based displays.

* Author(s): Radomir Dopieralski, Michael McWethy
* Author(s): Radomir Dopieralski, Michael McWethy, Matt Land
"""
import struct

from adafruit_rgb_display.rgb import DisplaySPI

try:
from typing import Optional
import digitalio
import busio
except ImportError:
pass

__version__ = "0.0.0+auto.0"
__repo__ = "https://github.com/adafruit/Adafruit_CircuitPython_RGB_Display.git"

Expand Down Expand Up @@ -74,16 +82,16 @@ class ILI9341(DisplaySPI):
# pylint: disable-msg=too-many-arguments
def __init__(
self,
spi,
dc,
cs,
rst=None,
width=240,
height=320,
baudrate=16000000,
polarity=0,
phase=0,
rotation=0,
spi: busio.SPI,
dc: digitalio.DigitalInOut,
cs: digitalio.DigitalInOut,
rst: Optional[digitalio.DigitalInOut] = None,
width: int = 240,
height: int = 320,
baudrate: int = 16000000,
polarity: int = 0,
phase: int = 0,
rotation: int = 0,
):
super().__init__(
spi,
Expand All @@ -101,7 +109,9 @@ def __init__(

# pylint: enable-msg=too-many-arguments

def scroll(self, dy=None): # pylint: disable-msg=invalid-name
def scroll(
self, dy: Optional[int] = None # pylint: disable-msg=invalid-name
) -> Optional[int]:
"""Scroll the display by delta y"""
if dy is None:
return self._scroll
Expand Down
Loading