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

secop_demo/modules: use distinct state codes for the phases

Browse Source 
Change-Id: Ic58939627bd23781078d9b1c24f08c8203f92d69
Reviewed-on: https://forge.frm2.tum.de/review/20219
Tested-by: JenkinsCodeReview <bjoern_pedersen@frm2.tum.de>
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
This commit is contained in:
Enrico Faulhaber
2019-03-25 10:37:55 +01:00
parent a255cfaa55
commit 7fdde39ce1
1 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
secop_demo/modules.py
View File

@ -117,6 +117,10 @@ class MagneticField(Drivable):
datatype=StringType(), export=False, datatype=StringType(), export=False,
), ),
} }
Status = Enum(Drivable.Status, PERSIST=101, PREPARE=301, RAMP=302, FINISH=303)
overrides = {
'status' : Override(datatype=TupleOf(EnumType(Status), StringType())),
}
def init_module(self): def init_module(self):
self._state = Enum('state', idle=1, switch_on=2, switch_off=3, ramp=4).idle self._state = Enum('state', idle=1, switch_on=2, switch_off=3, ramp=4).idle
@ -137,8 +141,15 @@ class MagneticField(Drivable):
def read_status(self, maxage=0): def read_status(self, maxage=0):
if self._state == self._state.enum.idle: if self._state == self._state.enum.idle:
return (self.Status.IDLE, '') return (self.Status.PERSIST, 'at field') if self.value else \
return (self.Status.BUSY, self._state.name) (self.Status.IDLE, 'zero field')
elif self._state == self._state.enum.switch_on:
return (self.Status.PREPARE, self._state.name)
elif self._state == self._state.enum.switch_off:
return (self.Status.FINISH, self._state.name)
elif self._state == self._state.enum.ramp:
return (self.Status.RAMP, self._state.name)
return (self.Status.ERROR, self._state.name)
def _thread(self): def _thread(self):
loopdelay = 1 loopdelay = 1