fixes on HasConvergence and HasOutputModule

- HasConvergence must inherit from HasStates
- control_active should have a default

Change-Id: Ic8b430003fdb746bf76782b74fa04e43c700c2e2
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/31023
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch>

frappy/mixins.py

@@ -65,7 +65,7 @@ class HasOutputModule(Writable):
     """
     # mandatory=False: it should be possible to configure a module with fixed control
     output_module = Attached(HasControlledBy, mandatory=False)
-    control_active = Parameter('control mode', BoolType())
+    control_active = Parameter('control mode', BoolType(), default=False)
 
     def initModule(self):
         super().initModule()

frappy_psi/convergence.py

@@ -21,10 +21,11 @@
 # *****************************************************************************
 
 from frappy.core import Parameter, FloatRange, BUSY, IDLE, WARN
+from frappy.states import HasStates
 from frappy.lib.statemachine import StateMachine, Retry, Stop
 
 
-class HasConvergence:
+class HasConvergence(HasStates):
     """mixin for convergence checks
 
     Implementation based on tolerance, settling time and timeout.