From 535c7b99b43baf50272c71fcaf52b10f1a707175 Mon Sep 17 00:00:00 2001 From: Kevin O'Connor Date: Sun, 27 Nov 2016 17:45:58 -0500 Subject: serialhdl: Make SerialReader.connect() blocking Use the greenlet mechanism to wait for the connection to come up in the serial connect() method. This simplifies the calling code. Signed-off-by: Kevin O'Connor --- klippy/console.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'klippy/console.py') diff --git a/klippy/console.py b/klippy/console.py index 21cd5f4d..94476007 100755 --- a/klippy/console.py +++ b/klippy/console.py @@ -18,9 +18,14 @@ class KeyboardReader: util.set_nonblock(self.fd) self.pins = None self.data = "" - self.reactor.register_fd(self.fd, self.process_kbd) + reactor.register_fd(self.fd, self.process_kbd) + self.connect_timer = reactor.register_timer(self.connect, reactor.NOW) self.local_commands = { "PINS": self.set_pin_map, "SET": self.set_var } self.eval_globals = {} + def connect(self, eventtime): + self.ser.connect() + self.reactor.unregister_timer(self.connect_timer) + return self.reactor.NEVER def update_evals(self, eventtime): f = self.ser.msgparser.config.get('CLOCK_FREQ', 1) c = self.ser.get_clock(eventtime) @@ -101,7 +106,6 @@ def main(): logging.basicConfig(level=logging.DEBUG) r = reactor.Reactor() ser = serialhdl.SerialReader(r, serialport, baud) - ser.connect() kbd = KeyboardReader(ser, r) try: r.run() -- cgit v1.2.3-70-g09d2