Increase default modbusRTU timeout, fix espec get_cascade_power

Myles Metzler · Myles Metzler · commit 1de8cbad8184 · 2017-02-15T14:34:57.000-05:00
diff --git a/chamberconnectlibrary/espec.py b/chamberconnectlibrary/espec.py
@@ -476,7 +476,9 @@ def set_cascade_deviation(self, N, value):
         self.client.write_temp_ptc(self.get_cascade_ctl(self.temp, exclusive=False), **value)
 
     def get_cascade_power(self, N):
-        raise NotImplementedError
+        if self.lpd[N] != self.temp:
+            raise ValueError(self.cs_exmsg)
+        return self.get_loop_power(self.temp, exclusive=False)
 
     def set_cascade_power(self, N, value):
         raise NotImplementedError
diff --git a/chamberconnectlibrary/modbus.py b/chamberconnectlibrary/modbus.py
@@ -189,7 +189,7 @@ def __init__(self, address, port, **kwargs):
             bytesize=databits,
             parity=kwargs.get('parity', 'N'),
             stopbits=stopbits,
-            timeout=kwargs.get('timeout', 1)
+            timeout=kwargs.get('timeout', 2)
         )
 
     def __del__(self):

Original file line number	Diff line number	Diff line change
`@@ -189,7 +189,7 @@ def __init__(self, address, port, **kwargs):`
`189`	`189`	`bytesize=databits,`
`190`	`190`	`parity=kwargs.get('parity', 'N'),`
`191`	`191`	`stopbits=stopbits,`
`192`		`- timeout=kwargs.get('timeout', 1)`
	`192`	`+ timeout=kwargs.get('timeout', 2)`
`193`	`193`	`)`
`194`	`194`
`195`	`195`	`def __del__(self):`