From 5f6544e9391c461ab8fbc07ed6649bd5833afb39 Mon Sep 17 00:00:00 2001 From: Marijn Doeve Date: Sun, 4 Sep 2022 16:51:59 +0200 Subject: [PATCH] Small Changes --- Makefile | 5 +++++ pyproject.toml | 2 +- src/projectorpi/extron.py | 14 +++++++------- src/projectorpi/projector.py | 2 +- 4 files changed, 14 insertions(+), 9 deletions(-) create mode 100644 Makefile diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..f754bc5 --- /dev/null +++ b/Makefile @@ -0,0 +1,5 @@ +.PHONY: publish +publish: + poetry publish --build --repository gitea +clean: + find . -type f -name "*.py[co]" -delete -or -type d -name "__pycache__" -delete -or -type -name "dist" -delete \ No newline at end of file diff --git a/pyproject.toml b/pyproject.toml index 4c96fd6..766d437 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "ProjectorPi" -version = "0.1.1" +version = "0.1.2" description = "" authors = ["Marijn Doeve "] license = "GPL-3.0-or-later" diff --git a/src/projectorpi/extron.py b/src/projectorpi/extron.py index 0004141..f6cc0a1 100644 --- a/src/projectorpi/extron.py +++ b/src/projectorpi/extron.py @@ -1,6 +1,4 @@ -# w == escape -# | == carriage return -from types import LambdaType +import sys from typing import Callable from .serialdevice import SerialDevice @@ -42,12 +40,14 @@ class ExtronSerial(SerialDevice): response = super().send_command(command) if response and response[0] == "E": - print(response, self.ERRORS.get(response, "Unknown")) + print( + f"{response}: {self.ERRORS.get(response, 'Unknown')}", file=sys.stderr + ) return response - def check_sleep(self) -> None: - res = self.send_command(C("PSAV")) + def check_sleep(self) -> str: + return self.send_command(C("PSAV")) def sleep(self) -> None: self.send_command(C("1PSAV")) @@ -59,7 +59,7 @@ class ExtronSerial(SerialDevice): self.send_command(f"{input}!") def is_sleeping(self) -> bool: - response = self.send_command(C("PSAV")) + response = self.check_sleep return bool(int(response)) diff --git a/src/projectorpi/projector.py b/src/projectorpi/projector.py index 50264ba..8af031f 100644 --- a/src/projectorpi/projector.py +++ b/src/projectorpi/projector.py @@ -16,7 +16,7 @@ class ProjectorSerial(SerialDevice): def send_command(self, command: str, device_id: str = "ZZ") -> str: assert device_id in ["01", "02", "03", "04", "05", "06", "ZZ"] - full_command = f"\x02AD{device_id};{command}\x03" + full_command = f"{STX}AD{device_id};{command}{ETX}" return super().send_command(full_command)