Merge Python Branch into Main #1

Merged
hagi merged 45 commits from python into main 2022-12-30 19:15:27 +00:00
3 changed files with 77 additions and 19 deletions
Showing only changes of commit bbd54aefef - Show all commits

View file

@ -1,7 +1,10 @@
from blunderboard.boardreader import BoardReader
from blunderboard.movegenerator import MoveGenerator
from time import sleep
def main():
reader = BoardReader()
reader.scan()
reader.print()
reader = BoardReader(MoveGenerator())
while True:
reader.scan()
sleep(0.1)

View file

@ -1,3 +1,4 @@
from blunderboard.movegenerator import MoveGenerator
import RPi.GPIO as gpio
@ -8,8 +9,9 @@ class BoardReader:
def __init__(
self,
rows=default_row_gpios,
columns=default_column_gpios,
move_generator: MoveGenerator,
rows: list[int] = default_row_gpios,
columns: list[int] = default_column_gpios,
gpio_mode=default_gpio_mode,
):
gpio.setmode(gpio_mode)
@ -17,27 +19,66 @@ class BoardReader:
gpio.setup(rows, gpio.OUT, initial=gpio.LOW)
self.columns = columns
self.rows = rows
self.board: list[list[str]] = []
for i in range(8):
self.board.append([" "] * 8)
self.board = self._empty_board()
self.move_generator = move_generator
def __del__(self):
gpio.cleanup()
def scan(self) -> None:
for i, row in enumerate(self.rows):
gpio.output(row, gpio.HIGH)
for j, column in enumerate(self.columns):
if gpio.input(column):
self.board[i][j] = "x"
else:
self.board[i][j] = " "
gpio.output(row, gpio.LOW)
def _empty_board(self) -> list[list[str]]:
board = []
for i in range(8):
board.append([" "] * 8)
return board
def print(self) -> None:
def _initial_board(self) -> list[list[str]]:
board = []
for i in range(2):
board.append(["x"] * 8)
for i in range(2, 6):
board.append([" "] * 8)
for i in range(6, 8):
board.append(["x"] * 8)
return board
def _is_initial_board(self, board) -> bool:
initial_board = self._initial_board()
for i, row in enumerate(board):
for j, field in enumerate(row):
if field != initial_board[i][j]:
return False
return True
def scan(self) -> None:
board = self._initial_board()
for i, row_gpio in enumerate(self.rows):
gpio.output(row_gpio, gpio.HIGH)
for j, column_gpio in enumerate(self.columns):
if gpio.input(column_gpio):
board[i][j] = "x"
else:
board[i][j] = " "
gpio.output(row_gpio, gpio.LOW)
if not self._is_initial_board(self.board) and self._is_initial_board(board):
self.move_generator.reset()
self.board = board
return
for i, row in enumerate(board):
for j, field in enumerate(row):
if field == " " and self.board[i][j] == "x":
self.move_generator.take(i, j)
for i, row in enumerate(board):
for j, field in enumerate(row):
if field == "x" and self.board[i][j] == " ":
self.move_generator.put(i, j)
self.board = board
def _print(self, board) -> None:
print(" a b c d e f g h")
print(" +---------------+")
for i, row in reversed(list(enumerate(self.board))):
for i, row in reversed(list(enumerate(board))):
print("%d|" % (i + 1), end="")
for j, field in enumerate(row):
print(field, end="")
@ -47,3 +88,6 @@ class BoardReader:
print(" ", end="")
print(" +---------------+")
print(" a b c d e f g h")
def print(self) -> None:
self._print(self.board)

View file

@ -0,0 +1,11 @@
class MoveGenerator:
columns = "abcdefgh"
def reset(self) -> None:
print("reset")
def put(self, row: int, column: int) -> None:
print("put %c%d" % (self.columns[column], row + 1))
def take(self, row: int, column: int) -> None:
print("take %c%d" % (self.columns[column], row + 1))