From d2d1e8997968bb2d2003b556fa938b92211c5aa8 Mon Sep 17 00:00:00 2001 From: root Date: Fri, 25 Nov 2011 20:50:49 +0100 Subject: Exception safe timeout modification in IPCOMM.enumerate --- Phytron.py | 32 +++++++++++++++++--------------- 1 file changed, 17 insertions(+), 15 deletions(-) diff --git a/Phytron.py b/Phytron.py index a87fa96..f577f92 100644 --- a/Phytron.py +++ b/Phytron.py @@ -310,28 +310,30 @@ class IPCOMM: return self.axisByID[int(nameOrID)] def enumerate(self, axes=0x10, names=None): - # Use a only short timeout for enumeration. if isinstance(axes, int): axes = range(axes) + # Use a only short timeout for enumeration. oldtimeout = self.conn.timeout self.conn.timeout = 0.05 self.axisByID.clear() self.axisByName.clear() - for i,ID in enumerate(axes): - try: - if self.execute(ID, 'IS?').ID == ID: - if ((isinstance(names, dict) and names.haskey(ID)) or (isinstance(names, list) and i < len(names))) and names[i].isalpha(): - if isinstance(names, dict): - axisname = names[ID] + try: + for i,ID in enumerate(axes): + try: + if self.execute(ID, 'IS?').ID == ID: + if ((isinstance(names, dict) and names.haskey(ID)) or (isinstance(names, list) and i < len(names))) and names[i].isalpha(): + if isinstance(names, dict): + axisname = names[ID] + else: + axisname = names[i] + axis = self.axisByName[str(axisname)] = Axis(self, ID, axisname) else: - axisname = names[i] - axis = self.axisByName[str(axisname)] = Axis(self, ID, axisname) - else: - axis = Axis(self, ID) - self.axisByID[ID] = axis - except ReceiveTimeout: - continue - self.conn.timeout = oldtimeout + axis = Axis(self, ID) + self.axisByID[ID] = axis + except ReceiveTimeout: + continue + finally: + self.conn.timeout = oldtimeout def send(self, data): self.conn.write('\x02' + data + ':' + ('%02X' % checksum(data + ':')) + '\x03') -- cgit v1.2.3