From 6e499128a0fc1f2f2abbea87f69f1dcc30088ae9 Mon Sep 17 00:00:00 2001 From: gac-S_Changer Date: Mon, 13 Mar 2017 16:52:55 +0100 Subject: [PATCH] Script execution --- script/test/onewire.py | 32 ++++++++++++++++++++------------ 1 file changed, 20 insertions(+), 12 deletions(-) diff --git a/script/test/onewire.py b/script/test/onewire.py index 3b9fbeb..7250009 100644 --- a/script/test/onewire.py +++ b/script/test/onewire.py @@ -5,10 +5,10 @@ class Detector(ReadonlyRegisterBase): self.sn = None self.status = None self.type = None - self.det1 = None - self.det2 = None - self.det3 = None - self.det4 = None + self.i1 = None + self.i2 = None + self.i3 = None + self.i4 = None @@ -52,14 +52,22 @@ class Esera(TcpDevice): tokens = msg.split() #LST|1_OWD1|3AF361270000009E|S_0|DS2413| if tokens[1] > 1: - int index = int(tokens[1].split("_")[1][3:]) - print "Index = " , index - if index < len(self.detectors): - det = self.detectors[index] - det.name = tokens[1] - def.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 + index = int(tokens[1].split("_")[1][3:]) + print "Index = " , index + if index < len(self.detectors): + det = self.detectors[index] + det.name = 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("|") + if len(tokens)>1: + for det in self.detectors: + if det.name is not None and msg.startswith(det.name): + index = int(tokens[0][len(det.name+1):len(det.name)+2]) + print "i=" , i + input = tokens[1] except: print >> sys.stderr, traceback.format_exc() getLogger().log(traceback.format_exc())