diff --git a/PyExpLabSys/drivers/mks_g_series.py b/PyExpLabSys/drivers/mks_g_series.py index 23c05f3f..3018348b 100644 --- a/PyExpLabSys/drivers/mks_g_series.py +++ b/PyExpLabSys/drivers/mks_g_series.py @@ -4,11 +4,14 @@ import time import logging import serial +import sys + from PyExpLabSys.common.supported_versions import python2_and_3 LOGGER = logging.getLogger(__name__) LOGGER.addHandler(logging.NullHandler()) python2_and_3(__file__) + class MksGSeries(): """ Driver for G-series flow controllers from MKS """ def __init__(self, port='/dev/ttyUSB0'): @@ -35,7 +38,10 @@ def comm(self, command, addr): self.ser.write(com_string) time.sleep(0.1) reply = self.ser.read(self.ser.inWaiting()) - reply = reply.decode() + try: #some MFC communication gives UnicodeDecodeError + reply = reply.decode() + except UnicodeDecodeError: + return 'could not decode reply' if len(reply) == 0: LOGGER.warning('No such device') else: @@ -100,8 +106,9 @@ def purge(self, t=1, addr=254): self.comm(command1, addr) print('PURGING') time.sleep(abs(t)) - self.comm(command2, addr) print('DONE PURGING') + self.comm(command2, addr) + print('NORMAL MODE') def read_flow(self, addr=254): """ Read the flow """ diff --git a/machines/rasppi89/socket_server.py b/machines/rasppi89/socket_server.py index 4a2b47e0..2905f46f 100644 --- a/machines/rasppi89/socket_server.py +++ b/machines/rasppi89/socket_server.py @@ -25,7 +25,7 @@ def run(self): #print qsize while qsize > 0: element = self.pushsocket.queue.get() - mfc = element.keys()[0] + mfc = list(element.keys())[0] print(element[mfc]) print('Queue: ' + str(qsize)) value, addr = element[mfc], self.mfcs[mfc] @@ -57,7 +57,7 @@ def run(self): i = 0 MFCs = {} -MKS = mks.Mks_G_Series(port=port) +MKS = mks.MksGSeries(port=port) for i in range(1, 8): time.sleep(2) print('!')