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

Added support for a fully mocked device

Browse source
This commit is contained in:
jtc42 2019-06-28 12:52:55 +01:00
parent eaa37f70e0
commit 4733b250ed
12 changed files with 283 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -28,6 +28,7 @@ from serial import STOPBITS_ONE, STOPBITS_ONE_POINT_FIVE, STOPBITS_TWO
import io
import time
import warnings
import logging
class ExtensibleSerialInstrument(object):
"""
@ -58,8 +59,11 @@ class ExtensibleSerialInstrument(object):
"""
Set up the serial port and so on.
"""
logging.info("Updating BSI port settings")
self.port_settings.update(kwargs)
logging.info("Opening BSI connection to port {}".format(port))
self.open(port, False) # Eventually this shouldn't rely on init...
logging.info("Opened BSI connection to port {}".format(port))
def open(self, port=None, quiet=True):
"""Open communications with the serial port.
@ -81,11 +85,13 @@ class ExtensibleSerialInstrument(object):
def close(self):
"""Release the serial port"""
logging.debug("Closing serial connection")
with self.communications_lock:
try:
self._ser.close()
except Exception as e:
print("The serial port didn't close cleanly:", e)
logging.debug("Connection closed")
def __del__(self):
"""Close the port when the object is deleted

2
openflexure_microscope/stage/sangaboard/sangaboard.py
View file

@ -12,6 +12,7 @@ import time
from .extensible_serial_instrument import ExtensibleSerialInstrument, OptionalModule, QueriedProperty, EIGHTBITS, PARITY_NONE, STOPBITS_ONE
import re
import warnings
import logging
class Sangaboard(ExtensibleSerialInstrument):
"""Class managing serial communications with a Sangaboard
@ -68,6 +69,7 @@ class Sangaboard(ExtensibleSerialInstrument):
"""
super(Sangaboard, self).__init__(port, **kwargs)
try:
logging.debug("Running firmware checks")
# Request firmware version from the board
self.firmware = self.query("version",timeout=2).rstrip()
# The slightly complicated regexp below will match the version string,