From ebe28d3f038883ddfa8612bb4519dd8b525026e5 Mon Sep 17 00:00:00 2001 From: gac-S_Changer Date: Mon, 13 Mar 2017 17:03:30 +0100 Subject: [PATCH] Closedown --- script/test/onewire.py | 25 +++++++++---------------- 1 file changed, 9 insertions(+), 16 deletions(-) diff --git a/script/test/onewire.py b/script/test/onewire.py index 7b3ec37..089f90c 100644 --- a/script/test/onewire.py +++ b/script/test/onewire.py @@ -7,10 +7,7 @@ class Detector(ReadonlyRegisterBase): self.sn = None self.status = None self.type = None - self.i1 = None - self.i2 = None - self.i3 = None - self.i4 = None + self.inputs = [] @@ -19,8 +16,6 @@ class Esera(TcpDevice): TcpDevice.__init__(self, name, server) self.setMode(self.Mode.FullDuplex) self.detectors = [] - for i in range(30): - self.detectors.append(Detector("Detector " + str(i+1))) def start(self): self.write("set,sys,run,1\n") @@ -40,7 +35,7 @@ class Esera(TcpDevice): self.flush() self.detectors = [] for i in range(30): - self.detectors.append(Detector()) + self.detectors.append(Detector("Detector " + str(i+1))) self.list() time.sleep(0.1) self.start() @@ -53,27 +48,25 @@ class Esera(TcpDevice): # print rx def onString(self, msg): + tokens = msg.split("|") try: - if msg[:3] == "LST": - tokens = msg.split() + if msg[:3] == "LST": #LST|1_OWD1|3AF361270000009E|S_0|DS2413| if tokens[1] > 1: - index = int(tokens[1].split("_")[1][3:]) - print "Index = " , index + index = int(tokens[1].split("_")[1][3:]) - 1 if index < len(self.detectors): det = self.detectors[index] det.id = tokens[1] det.sn= tokens[2] if len(tokens)>2 else None det.status = int(tokens[3][2:]) if len(tokens)>3 else None det.type = tokens[4] if len(tokens)>4 else None - else: - tokens = msg.split("|") + else: if len(tokens)>1: for det in self.detectors: if det.id is not None and msg.startswith(det.id): - index = int(tokens[0][len(det.id+1):len(det.id)+2]) - print "i=" , i - input = tokens[1] + index = int(tokens[0][len(det.id)+1:len(det.id)+2]) - 1 + if index < len(det.inputs): + det.inputs[index] = int(tokens[1]) except: print >> sys.stderr, traceback.format_exc() getLogger().log(traceback.format_exc())