adafruit-mirror/Adafruit_Learning_System_Guides
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

pylint fixes

Browse source
This commit is contained in:
foamyguy 2024-10-11 17:00:48 -05:00
parent 5f676e6e62
commit 0168375d8b
3 changed files with 52 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
TFT_Spirit_Board/esp32s3_s2_tft_featherwing_480x320/code.py
View file

@ -7,6 +7,7 @@ Feather ESP32-S3 or S2 + TFT Featherwing 3.5" 480x320 pixels
Receive and display messages from the spirits.
"""
# pylint: disable=import-error, invalid-name
import os
import displayio
import board
@ -14,11 +15,13 @@ from digitalio import DigitalInOut
import adafruit_connection_manager
import wifi
import adafruit_requests
from adafruit_io.adafruit_io import IO_HTTP, AdafruitIO_RequestError
from adafruit_io.adafruit_io import IO_HTTP
from adafruit_hx8357 import HX8357 # TFT Featherwing 3.5" 480x320 display driver
from spirit_board import SpiritBoard
import adafruit_tsc2007
from spirit_board import SpiritBoard
# 3.5" TFT Featherwing is 480x320
displayio.release_displays()
@ -37,8 +40,7 @@ _touch_flip = (False, True)
# Initialize 3.5" TFT Featherwing Touchscreen
ts_cs_pin = DigitalInOut(board.D6)
i2c = board.I2C()
irq_dio = None
tsc = adafruit_tsc2007.TSC2007(i2c, irq=irq_dio)
tsc = adafruit_tsc2007.TSC2007(i2c, irq=None)
# Initialize a requests session
pool = adafruit_connection_manager.get_radio_socketpool(wifi.radio)

17
TFT_Spirit_Board/shared/lib/anchored_tilegrid.py
View file

@ -1,3 +1,6 @@
"""
AnchoredTilegrid helper class
"""
try:
from typing import Tuple
except ImportError:
@ -7,6 +10,10 @@ from displayio import TileGrid
class AnchoredTileGrid(TileGrid):
"""
AnchoredTileGrid extends TileGrid and allows placing the TileGrid
relative to an arbitrary anchor point.
"""
def __init__(self, bitmap, **kwargs):
super().__init__(bitmap, **kwargs)
self._anchor_point = (0, 0)
@ -18,6 +25,10 @@ class AnchoredTileGrid(TileGrid):
@property
def anchor_point(self):
"""
The anchor point. tuple containing x and y values ranging
from 0 to 1.
"""
return self._anchor_point
@anchor_point.setter
@ -35,11 +46,9 @@ class AnchoredTileGrid(TileGrid):
@anchored_position.setter
def anchored_position(self, new_position: Tuple[int, int]) -> None:
self._anchored_position = new_position
# Calculate (x,y) position
if (self._anchor_point is not None) and (self._anchored_position is not None):
new_x = int(new_position[0]
- round(self._anchor_point[0] * (self.tile_width * self.width)))
if (self._anchor_point is not None) and (self._anchored_position is not None):
# Calculate (x,y) position
self.x = int(
new_position[0]
- round(self._anchor_point[0] * (self.tile_width * self.width))

52
TFT_Spirit_Board/shared/spirit_board.py
View file

@ -1,11 +1,16 @@
"""
SpiritBoard helper class
"""
import math
import os
import random
import time
import displayio
# pylint: disable=import-error
from anchored_tilegrid import AnchoredTileGrid
class SpiritBoard(displayio.Group):
"""
DisplayIO Based SpiritBoard
@ -13,7 +18,6 @@ class SpiritBoard(displayio.Group):
Holds and manages everything needed to draw the spirit board and planchette, as well
as move the planchette around to output messages from the spirits.
"""
# Mapping of letters and words on the board to their pixel coordinates.
# Points are centered on the target letter.
# Words can contain a list of points, the planchette will move between them.
@ -44,13 +48,16 @@ class SpiritBoard(displayio.Group):
# board image file
self.spirit_board_odb = displayio.OnDiskBitmap("spirit_board_480x320.bmp")
self.spirit_board_tilegrid = displayio.TileGrid(bitmap=self.spirit_board_odb, pixel_shader=self.spirit_board_odb.pixel_shader)
self.spirit_board_tilegrid = displayio.TileGrid(
bitmap=self.spirit_board_odb, pixel_shader=self.spirit_board_odb.pixel_shader)
self.append(self.spirit_board_tilegrid)
# planchette image file
self.planchette_odb = displayio.OnDiskBitmap("planchette_v1.bmp")
self.planchette_odb.pixel_shader.make_transparent(0)
self.planchette_tilegrid = AnchoredTileGrid(bitmap=self.planchette_odb, pixel_shader=self.planchette_odb.pixel_shader)
self.planchette_tilegrid = AnchoredTileGrid(
bitmap=self.planchette_odb, pixel_shader=self.planchette_odb.pixel_shader)
# AnchoredTileGrid is used so that we can move the planchette
# relative to the cetner of the window.
@ -66,15 +73,15 @@ class SpiritBoard(displayio.Group):
display.root_group = self
@staticmethod
def dist(pointA, pointB):
def dist(point_a, point_b):
"""
Calculate the distance between two points.
:param tuple pointA: x,y pair of the first point
:param pointB: x,y pair of the second point
:param tuple point_a: x,y pair of the first point
:param point_b: x,y pair of the second point
:return: the distance between the two points
"""
return math.sqrt((pointB[0] - pointA[0]) ** 2 + (pointB[1] - pointA[1]) ** 2)
return math.sqrt((point_b[0] - point_a[0]) ** 2 + (point_b[1] - point_a[1]) ** 2)
def slide_planchette(self, target_location, delay=0.1, step_size=4):
"""
@ -114,12 +121,14 @@ class SpiritBoard(displayio.Group):
# variables used to calculate where the next point
# between where we are at and where we are going is.
distance_ratio = step_size / distance
one_minus_distance_ratio = (1 - distance_ratio)
one_minus_distance_ratio = 1 - distance_ratio
# calculate the next point
next_point = (
round(one_minus_distance_ratio * current_location[0] + distance_ratio * target_location[0]),
round(one_minus_distance_ratio * current_location[1] + distance_ratio * target_location[1])
round(one_minus_distance_ratio * current_location[0]
+ distance_ratio * target_location[0]),
round(one_minus_distance_ratio * current_location[1]
+ distance_ratio * target_location[1])
)
# print(current_location)
# print(next_point)
@ -149,12 +158,14 @@ class SpiritBoard(displayio.Group):
# distance ratio variables used to calculate next point
distance_ratio = step_size / distance
one_minus_distance_ratio = (1 - distance_ratio)
one_minus_distance_ratio = 1 - distance_ratio
# calculate the next point
next_point = (
round(one_minus_distance_ratio * current_location[0] + distance_ratio * target_location[0]),
round(one_minus_distance_ratio * current_location[1] + distance_ratio * target_location[1])
round(one_minus_distance_ratio * current_location[0]
+ distance_ratio * target_location[0]),
round(one_minus_distance_ratio * current_location[1]
+ distance_ratio * target_location[1])
)
# if we have not arrived at the target location yet
@ -219,7 +230,8 @@ class SpiritBoard(displayio.Group):
# if the word has only a single point
elif isinstance(SpiritBoard.LOCATIONS[word], tuple):
# slide the planchette to the point
self.slide_planchette(SpiritBoard.LOCATIONS[word], delay=0.02, step_size=step_size)
self.slide_planchette(SpiritBoard.LOCATIONS[word],
delay=0.02, step_size=step_size)
# pause at the point
time.sleep(0.5)
@ -230,7 +242,8 @@ class SpiritBoard(displayio.Group):
# loop over each character in the word
for character in word:
# slide the planchette to the current characters location
self.slide_planchette(SpiritBoard.LOCATIONS[character], delay=0.02, step_size=step_size)
self.slide_planchette(SpiritBoard.LOCATIONS[character],
delay=0.02, step_size=step_size)
# pause after we arrive
time.sleep(0.5)
@ -239,7 +252,8 @@ class SpiritBoard(displayio.Group):
if not skip_spaces and index < len(message_words) - 1:
# handle the space
# slide the planchette to the empty space location.
self.slide_planchette(SpiritBoard.LOCATIONS[" "], delay=0.02, step_size=step_size)
self.slide_planchette(SpiritBoard.LOCATIONS[" "],
delay=0.02, step_size=step_size)
# pause after we arrive
time.sleep(0.5)
@ -298,7 +312,7 @@ class SpiritBoard(displayio.Group):
# if the spirit_messages.txt file exists
if "spirit_messages.txt" in os.listdir("/"):
# open the file
with open("/spirit_messages.txt", "r") as f:
with open("/spirit_messages.txt", "r", encoding="utf-8") as f:
# split on newline and set the messages found into the context
messages = f.read().split("\n")
@ -311,7 +325,7 @@ class SpiritBoard(displayio.Group):
"messages to spirit_messages.txt.")
# if there are messages and we need to shuffle them
elif shuffle:
if shuffle:
# temporary list to hold them
shuffled_list = []