From 8e53b4346bef9ebc20af18be4793e6da50ffb770 Mon Sep 17 00:00:00 2001 From: Marijn Doeve Date: Sun, 5 Jun 2022 15:54:14 +0200 Subject: [PATCH] Reenable verbose --- extron.py | 4 ++-- projector.py | 4 ++-- serialdevice.py | 7 ++++++- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/extron.py b/extron.py index 2466a3b..fef40dd 100644 --- a/extron.py +++ b/extron.py @@ -31,10 +31,10 @@ class ExtronSerial(SerialDevice): # w == escape # | == carriage return - def __init__(self) -> None: + def __init__(self, verbose: bool = False) -> None: serial_port = "/dev/serial/by-id/usb-Extron_Product-if00" baudrate = 9600 - super().__init__(serial_port, baudrate) + super().__init__(serial_port, baudrate, verbose) def send_command(self, command: str, verbose: bool = False) -> str: response = super().send_command(command, verbose) diff --git a/projector.py b/projector.py index 8a94bd7..55b3dc5 100644 --- a/projector.py +++ b/projector.py @@ -5,11 +5,11 @@ ETX = chr(0x03) class ProjectorSerial(SerialDevice): - def __init__(self) -> None: + def __init__(self, verbose: bool = False) -> None: serial_port = "/dev/serial0" baudrate = 9600 - super().__init__(serial_port, baudrate) + super().__init__(serial_port, baudrate, verbose) def send_command( self, command: str, verbose: bool = False, device_id: str = "ZZ" diff --git a/serialdevice.py b/serialdevice.py index b8ef89f..f34d64f 100644 --- a/serialdevice.py +++ b/serialdevice.py @@ -3,11 +3,16 @@ from serial import Serial class SerialDevice: - def __init__(self, serial_port: str, baudrate: int = 9600) -> None: + def __init__( + self, serial_port: str, baudrate: int = 9600, verbose: bool = False + ) -> None: self.serial_port: str = serial_port self.baudrate = baudrate + self.verbose = verbose def send_command(self, command: str, verbose: bool = False) -> str: + verbose = verbose or self.verbose + with Serial(self.serial_port, self.baudrate, timeout=1) as s: if verbose: print("Send:", command)