From 9d3a3f3f306af5f1fbd39e537e10392f03f5b27d Mon Sep 17 00:00:00 2001 From: Kevin O'Connor Date: Sat, 30 Jan 2021 00:01:23 -0500 Subject: serialhdl: Update callers to decide serial fd type Don't try to detect a "real serial port" in serialhdl.py. Instead, have the callers invoke either connect_uart(), connect_file(), or connect_pipe(). Signed-off-by: Kevin O'Connor --- klippy/console.py | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) (limited to 'klippy/console.py') diff --git a/klippy/console.py b/klippy/console.py index b787111f..ab501d9a 100755 --- a/klippy/console.py +++ b/klippy/console.py @@ -30,8 +30,10 @@ help_txt = """ re_eval = re.compile(r'\{(?P[^}]*)\}') class KeyboardReader: - def __init__(self, ser, reactor): - self.ser = ser + def __init__(self, reactor, serialport, baud): + self.serialport = serialport + self.baud = baud + self.ser = serialhdl.SerialReader(reactor) self.reactor = reactor self.start_time = reactor.monotonic() self.clocksync = clocksync.ClockSync(self.reactor) @@ -52,7 +54,10 @@ class KeyboardReader: def connect(self, eventtime): self.output(help_txt) self.output("="*20 + " attempting to connect " + "="*20) - self.ser.connect() + if self.baud: + self.ser.connect_uart(self.serialport, self.baud) + else: + self.ser.connect_pipe(self.serialport) msgparser = self.ser.get_msgparser() message_count = len(msgparser.get_messages()) version, build_versions = msgparser.get_version_info() @@ -205,8 +210,7 @@ def main(): logging.basicConfig(level=logging.DEBUG) r = reactor.Reactor() - ser = serialhdl.SerialReader(r, serialport, baud) - kbd = KeyboardReader(ser, r) + kbd = KeyboardReader(r, serialport, baud) try: r.run() except KeyboardInterrupt: -- cgit v1.2.3-70-g09d2