fix ppms with proxy
- proxy: remote parameter status should overddide datatype from ProxyModule.status - ppms: create PpmsDrivable instead of importing from (PpmsBase, Drivable). Order matters for status parameter! - update cfg files Change-Id: If8fc263cffb903d8b3c1a93a089dcac3597d13a0 Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/30512 Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de> Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch>
This commit is contained in:
@ -155,6 +155,10 @@ class PpmsBase(HasIO, Readable):
|
||||
raise HardwareError('bad reply %r to command %r' % (reply, command))
|
||||
|
||||
|
||||
class PpmsDrivable(Drivable, PpmsBase):
|
||||
pass
|
||||
|
||||
|
||||
class Channel(PpmsBase):
|
||||
"""channel base class"""
|
||||
|
||||
@ -283,7 +287,7 @@ class Level(PpmsBase):
|
||||
return literal_eval(self.communicate('LEVEL?'))[0]
|
||||
|
||||
|
||||
class Chamber(PpmsBase, Drivable):
|
||||
class Chamber(PpmsDrivable):
|
||||
"""sample chamber handling
|
||||
|
||||
value is an Enum, which is redundant with the status text
|
||||
@ -334,7 +338,7 @@ class Chamber(PpmsBase, Drivable):
|
||||
return self.read_target()
|
||||
|
||||
|
||||
class Temp(PpmsBase, Drivable):
|
||||
class Temp(PpmsDrivable):
|
||||
"""temperature"""
|
||||
|
||||
Status = Enum(
|
||||
@ -501,7 +505,7 @@ class Temp(PpmsBase, Drivable):
|
||||
self._stopped = True
|
||||
|
||||
|
||||
class Field(PpmsBase, Drivable):
|
||||
class Field(PpmsDrivable):
|
||||
"""magnetic field"""
|
||||
|
||||
Status = Enum(
|
||||
@ -639,7 +643,7 @@ class Field(PpmsBase, Drivable):
|
||||
self._stopped = True
|
||||
|
||||
|
||||
class Position(PpmsBase, Drivable):
|
||||
class Position(PpmsDrivable):
|
||||
"""rotator position"""
|
||||
|
||||
Status = Drivable.Status
|
||||
|
Reference in New Issue
Block a user