Merge branch 'uniax' into wip

Conflicts: cfg/uniax.cfg secop/core.py secop_psi/trinamic.py
2021-09-21 16:52:15 +02:00
parent 8f1375aa31 e98f81a7c9
commit 8bbf65f6e8
11 changed files with 480 additions and 35 deletions
--- a/secop/persistent.py
+++ b/secop/persistent.py
@ -88,7 +88,7 @@ class PersistentMixin(HasAccessibles):
        try:
            with open(self.persistentFile, 'r') as f:
                self.persistentData = json.load(f)
-        except FileNotFoundError:
+        except Exception:
            self.persistentData = {}
        writeDict = {}
        for pname in self.parameters: