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 --- scripts/spi_flash/spi_flash.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'scripts') diff --git a/scripts/spi_flash/spi_flash.py b/scripts/spi_flash/spi_flash.py index 5376dc2d..137adf5a 100644 --- a/scripts/spi_flash/spi_flash.py +++ b/scripts/spi_flash/spi_flash.py @@ -777,9 +777,11 @@ class SDCardSPI: class MCUConnection: def __init__(self, k_reactor, device, baud, board_cfg): self.reactor = k_reactor + self.serial_device = device + self.baud = baud # TODO: a change in baudrate will cause an issue, come up # with a method for handling it gracefully - self._serial = serialhdl.SerialReader(self.reactor, device, baud) + self._serial = serialhdl.SerialReader(self.reactor) self.clocksync = clocksync.ClockSync(self.reactor) self.board_config = board_cfg self.fatfs = None @@ -817,7 +819,7 @@ class MCUConnection: endtime = eventtime + 60. while True: try: - self._serial.connect() + self._serial.connect_uart(self.serial_device, self.baud) self.clocksync.connect(self._serial) except Exception: curtime = self.reactor.monotonic() -- cgit v1.2.3-70-g09d2