fixes for uniax device

2021-06-11 16:45:45 +02:00
parent 6c4bb78f97
commit b30bd308a9
11 changed files with 456 additions and 33 deletions
--- a/secop/lib/asynconn.py
+++ b/secop/lib/asynconn.py
@ -251,7 +251,9 @@ class AsynSerial(AsynConn):
            if not fullname.startswith(name):
                raise ConfigError('illegal parity: %s' % parity)
            options['parity'] = name[0]
-        if 'timeout' not in options:
+        if 'timeout' in options:
+            options['timeout'] = float(self.timeout)
+        else:
            options['timeout'] = self.timeout
        try:
            self.connection = Serial(dev, **options)