rahix/openflexure-microscope-server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add timeout support

Browse source
This commit is contained in:
Joel Collins 2020-05-26 13:18:09 +01:00
parent 677b08d509
commit 81546a1c8d
1 changed files with 7 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

7
openflexure_microscope/stage/sangaboard/extensible_serial_instrument.py
View file

@ -78,6 +78,7 @@ class ExtensibleSerialInstrument(object):
then we don't warn when ports are opened multiple times. then we don't warn when ports are opened multiple times.
""" """
with self.communications_lock: with self.communications_lock:
logging.debug(f"Opening port {port}")
if hasattr(self, "_ser") and self._ser.isOpen(): if hasattr(self, "_ser") and self._ser.isOpen():
if not quiet: if not quiet:
logging.warning("Attempted to open an already-open port!") logging.warning("Attempted to open an already-open port!")
@ -133,9 +134,12 @@ class ExtensibleSerialInstrument(object):
assert ( assert (
self._ser.isOpen() self._ser.isOpen()
), "Attempted to write to the serial port before it was opened. Perhaps you need to call the 'open' method first?" ), "Attempted to write to the serial port before it was opened. Perhaps you need to call the 'open' method first?"
logging.debug("Encoding message...")
data = query_string + self.termination_character data = query_string + self.termination_character
data = data.encode() data = data.encode()
logging.debug(f"Writing message: {data}")
self._ser.write(data) self._ser.write(data)
logging.debug("Write successful")
def flush_input_buffer(self): def flush_input_buffer(self):
"""Make sure there's nothing waiting to be read, and clear the buffer if there is.""" """Make sure there's nothing waiting to be read, and clear the buffer if there is."""
@ -145,6 +149,7 @@ class ExtensibleSerialInstrument(object):
def readline(self, timeout=None): def readline(self, timeout=None):
"""Read one line from the serial port.""" """Read one line from the serial port."""
self._ser.timeout = timeout
with self.communications_lock: with self.communications_lock:
return ( return (
self._ser.readline() self._ser.readline()
@ -192,7 +197,9 @@ class ExtensibleSerialInstrument(object):
""" """
with self.communications_lock: with self.communications_lock:
self.flush_input_buffer() self.flush_input_buffer()
logging.debug(f"Writing query: {queryString}")
self.write(queryString) self.write(queryString)
logging.debug("Waiting for query response...")
if self.ignore_echo == True: # Needs Implementing for a multiline read! if self.ignore_echo == True: # Needs Implementing for a multiline read!
first_line = self.readline(timeout).strip() first_line = self.readline(timeout).strip()
if first_line == queryString: if first_line == queryString: