linse/frappy
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'wip' of gitlab.psi.ch:samenv/frappy into wip

Browse Source
This commit is contained in:
l_samenv
2023-05-11 10:42:38 +02:00
parent 087036922a c46947afd4
commit fa9525fd4c
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
frappy/modules.py
View File

@ -834,7 +834,7 @@ class Readable(Module):
value = Parameter('current value of the module', FloatRange()) value = Parameter('current value of the module', FloatRange())
status = Parameter('current status of the module', StatusType(Status), status = Parameter('current status of the module', StatusType(Status),
default=(StatusType.IDLE, '')) default=(StatusType.IDLE, ''))
pollinterval = Parameter('default poll interval', FloatRange(0.1, 120), pollinterval = Parameter('default poll interval', FloatRange(0.1, 120, unit='s'),
default=5, readonly=False, export=True) default=5, readonly=False, export=True)
def doPoll(self): def doPoll(self):

6
frappy_psi/phytron.py
View File

@ -69,9 +69,9 @@ class Motor(HasOffset, PersistentMixin, HasIO, Drivable):
encoder_tolerance = Parameter('', FloatRange(unit='deg'), readonly=False, default=0.01) encoder_tolerance = Parameter('', FloatRange(unit='deg'), readonly=False, default=0.01)
sign = PersistentParam('', IntRange(-1,1), readonly=False, default=1) sign = PersistentParam('', IntRange(-1,1), readonly=False, default=1)
encoder = Parameter('encoder reading', FloatRange(unit='deg')) encoder = Parameter('encoder reading', FloatRange(unit='deg'))
backlash = Parameter("""backlash compensation\n backlash = PersistentParam("""backlash compensation\n
offset for always approaching from the same side""", offset for always approaching from the same side""",
FloatRange(unit='deg'), readonly=False, default=0) FloatRange(unit='deg'), readonly=False, default=0)
target_min = Limit() target_min = Limit()
target_max = Limit() target_max = Limit()
alive_time = PersistentParam('alive time for detecting restarts', alive_time = PersistentParam('alive time for detecting restarts',