more merges from gerrit

Change-Id: I13441cd8889dd39f74a2dd1a85e75a1b76bb93c8
2022-03-08 10:52:14 +01:00
parent 10018b8cad
commit 34b93adef0
20 changed files with 1423 additions and 340 deletions
--- a/secop_demo/modules.py
+++ b/secop_demo/modules.py
@ -133,6 +133,7 @@ class MagneticField(Drivable):
    status = Parameter(datatype=TupleOf(EnumType(Status), StringType()))

    def initModule(self):
+        super().initModule()
        self._state = Enum('state', idle=1, switch_on=2, switch_off=3, ramp=4).idle
        self._heatswitch = self.DISPATCHER.get_module(self.heatswitch)
        _thread = threading.Thread(target=self._thread)
@ -235,6 +236,7 @@ class SampleTemp(Drivable):
                     )

    def initModule(self):
+        super().initModule()
        _thread = threading.Thread(target=self._thread)
        _thread.daemon = True
        _thread.start()