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

various fixes on mb11/dil5

Browse Source
This commit is contained in:
zolliker
2022-06-07 11:45:25 +02:00
parent 68e2e06905
commit 9c7b6aeb94
5 changed files with 146 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
secop_psi/triton.py
View File

@ -29,7 +29,8 @@ import secop_psi.mercury as mercury
actions = Enum(none=0, condense=1, circulate=2, collect=3)
open_close = Mapped(CLOSE=False, OPEN=True)
actions_map = Mapped(NONE=actions.none, COND=actions.condense, COLL=actions.collect)
actions_map = Mapped(STOP=actions.none, COND=actions.condense, COLL=actions.collect)
actions_map.mapping['NONE'] = actions.none # when writing, STOP is used instead of NONE
class Action(MercuryChannel, Writable):
@ -49,15 +50,18 @@ class Action(MercuryChannel, Writable):
return self.change('SYS:DR:ACTN', value, actions_map)
# actions:
# NONE (no action)
# COND (condense mixture)
# COLL (collect mixture)
# STOP (go to NONE)
#
# not yet used (would need a subclass of Action):
# CLDN (cool down)
# PCL (precool automation)
# COND (condense mixture)
# PCOND (pause pre-cool (not condense?) automation
# RCOND (resume pre-cool (not condense?) automation
# PCOND (pause pre-cool (not condense?) automation)
# RCOND (resume pre-cool (not condense?) automation)
# WARM (warm-up)
# COLL (collect mixture)
# EPCL (empty pre-coll automation)
# STOP
class Valve(MercuryChannel, Writable):
@ -173,6 +177,7 @@ class FlowMeter(MercuryChannel, Readable):
class TemperatureSensor(mercury.TemperatureSensor):
# TODO: excitation, enable
# TODO: switch on/off filter, check
filter_time = Parameter('filter time', FloatRange(1, 200, unit='sec'), readonly=False)
dwell_time = Parameter('dwell time', FloatRange(1, 200, unit='sec'), readonly=False)
pause_time = Parameter('pause time', FloatRange(3, 200, unit='sec'), readonly=False)
@ -199,4 +204,4 @@ class TemperatureSensor(mercury.TemperatureSensor):
class TemperatureLoop(mercury.TemperatureLoop):
pass # TODO: switch on/off filter, check
pass