fix meanings and SEA vti mapping

- tt:value (VTI temperatures from SEA) should not be sample T
- VTI meaning must be ['temperature_regulation',20]
- stick ts meaning must be ['temperature', 30]

Change-Id: Ib6d662bb27d898958c62c02878d9551161cbc8c2
This commit is contained in:
zolliker 2024-09-27 15:19:29 +02:00
parent 7ee219ce7a
commit 6c2b1ea355
75 changed files with 85 additions and 13 deletions

View File

@ -44,6 +44,7 @@ Mod('ts_high',
Mod('ts',
'frappy_psi.parmod.SwitchDriv',
'automatically switching between ts_low and ts_high',
meaning=['temperature', 40],
value=Param(unit='K'),
low='ts_low',
high='ts_high',

View File

@ -11,6 +11,7 @@ Mod('sea_main',
Mod('tt',
'frappy_psi.sea.SeaDrivable', '',
meaning=['temperature', 20],
io='sea_main',
sea_object='tt',
)

View File

@ -12,6 +12,7 @@ Mod('sea_main',
Mod('tt',
'frappy_psi.sea.SeaDrivable', '',
io='sea_main',
meaning=['temperature', 20],
sea_object='tt',
)

View File

@ -12,5 +12,6 @@ Mod('sea_main',
Mod('tt',
'frappy_psi.sea.SeaDrivable', '',
io='sea_main',
meaning=['temperature', 20],
sea_object='tt',
)

View File

@ -7,13 +7,14 @@ Mod('sea_main',
config = 'ccrpe.config',
service = 'main',
)
Mod('tt',
Mod('ts',
'frappy_psi.sea.SeaDrivable', '',
io='sea_main',
meaning=['temperature', 20],
sea_object='tt',
rel_paths=['.', 'tm'],
rel_paths=['ts', 'set'],
)
Mod('ts',
Mod('tm',
'frappy_psi.sea.SeaReadable', '',
io='sea_main',
sea_object='tt',

View File

@ -9,18 +9,19 @@ Mod('sea_main',
service='main',
)
Mod('tt',
Mod('ts',
'frappy_psi.sea.SeaDrivable', '',
io='sea_main',
meaning=['temperature', 20],
sea_object='tt',
rel_paths=['.', 'tm'],
rel_paths=['ts', 'set'],
)
Mod('ts',
Mod('tm',
'frappy_psi.sea.SeaReadable', '',
io='sea_main',
sea_object='tt',
rel_paths=['ts'],
rel_paths=['tm'],
)
Mod('te',

View File

@ -12,5 +12,6 @@ Mod('sea_main',
Mod('tt',
'frappy_psi.sea.SeaDrivable', '',
io='sea_main',
meaning=['temperature', 20],
sea_object='tt',
)

View File

@ -12,5 +12,6 @@ Mod('sea_main',
Mod('tt',
'frappy_psi.sea.SeaDrivable', '',
io='sea_main',
meaning=['temperature', 20],
sea_object='tt',
)

View File

@ -11,5 +11,6 @@ Mod('sea_main',
Mod('te',
'frappy_psi.sea.SeaDrivable', '',
io = 'sea_main',
meaning=['temperature', 20],
sea_object = 'te',
)

View File

@ -12,6 +12,7 @@ Mod('sea_main',
Mod('tt',
'frappy_psi.sea.SeaDrivable', '',
io='sea_main',
meaning=['temperature', 20],
sea_object='tt',
)

View File

@ -13,7 +13,8 @@ Mod('ts',
'frappy_psi.sea.SeaDrivable', '',
io='sea_main',
sea_object='tt',
rel_paths=['.', 'ts'],
meaning=['temperature', 20],
rel_paths=['ts', 'set'],
)
Mod('t2',

View File

@ -12,8 +12,9 @@ Mod('sea_main',
Mod('ts',
'frappy_psi.sea.SeaDrivable', '',
io='sea_main',
meaning=['temperature', 20],
sea_object='tt',
rel_paths=['.', 'ts'],
rel_paths=['ts', 'set'],
)
Mod('t2',

View File

@ -12,6 +12,7 @@ Mod('sea_main',
Mod('tt',
'frappy_psi.sea.SeaDrivable', '',
io='sea_main',
meaning=['temperature_regulation', 20],
sea_object='tt',
rel_paths=['tm', 'set', 'dblctrl'],
)

View File

@ -12,6 +12,7 @@ Mod('sea_main',
Mod('tt',
'frappy_psi.sea.SeaDrivable', '',
io='sea_main',
meaning=['temperature_regulation', 20],
sea_object='tt',
rel_paths=['tm', 'set', 'dblctrl'],
)

View File

@ -12,6 +12,7 @@ Mod('sea_main',
Mod('tt',
'frappy_psi.sea.SeaDrivable', '',
io='sea_main',
meaning=['temperature_regulation', 20],
sea_object='tt',
rel_paths=['tm', 'set', 'dblctrl'],
)

View File

@ -12,6 +12,7 @@ Mod('sea_main',
Mod('tt',
'frappy_psi.sea.SeaDrivable', '',
io='sea_main',
meaning=['temperature_regulation', 20],
sea_object='tt',
rel_paths=['tm', 'set', 'dblctrl'],
)

View File

@ -12,6 +12,7 @@ Mod('sea_main',
Mod('tt',
'frappy_psi.sea.SeaDrivable', '',
io='sea_main',
meaning=['temperature_regulation', 20],
sea_object='tt',
rel_paths=['tm', 'set', 'dblctrl'],
)

View File

@ -12,6 +12,7 @@ Mod('sea_main',
Mod('tt',
'frappy_psi.sea.SeaDrivable', '',
io='sea_main',
meaning=['temperature_regulation', 20],
sea_object='tt',
rel_paths=['tm', 'set', 'dblctrl'],
)

View File

@ -12,8 +12,9 @@ Mod('sea_main',
Mod('tt',
'frappy_psi.sea.SeaDrivable', '',
io='sea_main',
meaning=['temperature_regulation', 20],
sea_object='tt',
rel_paths=['.', 'tt'],
rel_paths=['tt', 'set'],
)
Mod('T_ccr',

View File

@ -12,6 +12,7 @@ Mod('sea_main',
Mod('tt',
'frappy_psi.sea.SeaDrivable', '',
io='sea_main',
meaning=['temperature_regulation', 20],
sea_object='tt',
rel_paths=['tm', 'set', 'dblctrl'],
)

View File

@ -12,6 +12,7 @@ Mod('sea_main',
Mod('tt',
'frappy_psi.sea.SeaDrivable', '',
io='sea_main',
meaning=['temperature_regulation', 20],
sea_object='tt',
rel_paths=['tm', 'set', 'dblctrl'],
)

View File

@ -12,6 +12,7 @@ Mod('sea_main',
Mod('ts',
'frappy_psi.sea.SeaDrivable', '',
io='sea_main',
meaning=['temperature_regulation', 20],
sea_object='tt',
rel_paths=['ts', 'set']
)

View File

@ -13,6 +13,7 @@ Mod('th',
'frappy_psi.sea.SeaReadable',
'sample heater temperature',
io='sea_main',
meaning=['temperature_regulation', 20],
sea_object='tt',
rel_paths=['ts', 'setsamp']
)

View File

@ -12,6 +12,7 @@ Mod('sea_main',
Mod('tt',
'frappy_psi.sea.SeaDrivable', '',
io='sea_main',
meaning=['temperature_regulation', 20],
sea_object='tt',
rel_paths=['tm', 'set', 'dblctrl'],
)

View File

@ -10,6 +10,7 @@ Mod('sea_main',
Mod('tt',
'frappy_psi.sea.SeaDrivable', '',
io = 'sea_main',
meaning=['temperature_regulation', 20],
sea_object = 'tt',
rel_paths=['tm', 'set', 'dblctrl'],
)

View File

@ -12,6 +12,7 @@ Mod('sea_main',
Mod('tt',
'frappy_psi.sea.SeaDrivable', '',
io='sea_main',
meaning=['temperature_regulation', 20],
sea_object='tt',
rel_paths=['tm', 'set', 'dblctrl'],
)

View File

@ -12,6 +12,7 @@ Mod('sea_main',
Mod('tt',
'frappy_psi.sea.SeaDrivable', '',
io='sea_main',
meaning=['temperature_regulation', 20],
sea_object='tt',
rel_paths=['tm', 'set', 'dblctrl'],
)

View File

@ -12,6 +12,7 @@ Mod('sea_main',
Mod('tt',
'frappy_psi.sea.SeaDrivable', '',
io='sea_main',
meaning=['temperature_regulation', 20],
sea_object='tt',
rel_paths=['tm', 'set', 'dblctrl'],
)

View File

@ -12,6 +12,7 @@ Mod('sea_main',
Mod('tt',
'frappy_psi.sea.SeaDrivable', '',
io='sea_main',
meaning=['temperature_regulation', 20],
sea_object='tt',
rel_paths=['tm', 'set', 'dblctrl', 'voltage'],
extra_modules=['manualpower'],

View File

@ -12,6 +12,7 @@ Mod('sea_main',
Mod('tt',
'frappy_psi.sea.SeaDrivable', '',
io='sea_main',
meaning=['temperature_regulation', 20],
sea_object='tt',
rel_paths=['tm', 'set', 'dblctrl'],
)

View File

@ -16,6 +16,7 @@ Mod('sea_main',
Mod('tt',
'frappy_psi.sea.SeaDrivable', '',
meaning=['temperature_regulation', 20],
io='sea_main',
sea_object='tt',
rel_paths=['tm', 'set', 'dblctrl'],

View File

@ -12,6 +12,7 @@ Mod('sea_main',
Mod('tt',
'frappy_psi.sea.SeaDrivable', '',
io='sea_main',
meaning=['temperature_regulation', 20],
sea_object='tt',
rel_paths=['tm', 'set', 'dblctrl'],
)

View File

@ -25,6 +25,7 @@ Mod('ips',
Mod('T_stat',
'frappy_psi.mercury.TemperatureAutoFlow',
'static heat exchanger temperature',
meaning=['temperature_regulation', 20],
output_module='htr_stat',
needle_valve='p_stat',
slot='DB6.T1',

View File

@ -23,6 +23,7 @@ Mod('ips',
Mod('T_stat',
'frappy_psi.mercury.TemperatureAutoFlow',
'static heat exchanger temperature',
meaning=['temperature_regulation', 20],
output_module='htr_stat',
needle_valve='p_stat',
slot='DB6.T1',

View File

@ -12,6 +12,7 @@ Mod('sea_main',
Mod('tt',
'frappy_psi.sea.SeaDrivable', '',
io='sea_main',
meaning=['temperature_regulation', 20],
sea_object='tt',
rel_paths=['tm', 'set', 'dblctrl'],
)

View File

@ -12,6 +12,7 @@ Mod('sea_main',
Mod('tt',
'frappy_psi.sea.SeaDrivable', '',
io='sea_main',
meaning=['temperature_regulation', 20],
sea_object='tt',
rel_paths=['tm', 'set', 'dblctrl'],
)

View File

@ -12,6 +12,7 @@ Mod('sea_main',
Mod('tt',
'frappy_psi.sea.SeaDrivable', '',
io='sea_main',
meaning=['temperature_regulation', 20],
sea_object='tt',
rel_paths=['tm', 'set', 'dblctrl'],
)

View File

@ -12,6 +12,7 @@ Mod('sea_main',
Mod('tt',
'frappy_psi.sea.SeaDrivable', '',
io = 'sea_main',
meaning=['temperature_regulation', 20],
sea_object = 'tt',
rel_paths=['tm', 'set', 'dblctrl'],
)

View File

@ -11,6 +11,7 @@ Mod('sea_main',
Mod('tt',
'frappy_psi.sea.SeaDrivable', '',
meaning=['temperature', 20],
sea_object='tt',
io='sea_main',
)

View File

@ -12,6 +12,7 @@ Mod('sea_main',
Mod('tt',
'frappy_psi.sea.SeaDrivable', '',
io='sea_main',
meaning=['temperature_regulation', 20],
sea_object='tt',
rel_paths=['tm', 'set', 'dblctrl'],
)

View File

@ -18,6 +18,7 @@ Mod('itc2',
Mod('T_stat',
'frappy_psi.mercury.TemperatureAutoFlow',
'static heat exchanger temperature',
meaning=['temperature_regulation', 20],
output_module='htr_stat',
needle_valve='p_stat',
slot='DB6.T1',

View File

@ -11,6 +11,7 @@ Mod('sea_stick',
Mod('ts',
'frappy_psi.sea.SeaDrivable', '',
meaning=['temperature', 30],
io='sea_stick',
sea_object='ts',
)

View File

@ -11,6 +11,7 @@ Mod('sea_stick',
Mod('ts',
'frappy_psi.sea.SeaDrivable', '',
meaning=['temperature', 30],
io='sea_stick',
sea_object='ts',
)

View File

@ -11,6 +11,7 @@ Mod('sea_stick',
Mod('ts',
'frappy_psi.sea.SeaDrivable', '',
meaning=['temperature', 30],
io='sea_stick',
sea_object='ts',
)

View File

@ -30,7 +30,7 @@ Mod('htr_mix',
Mod('ts',
'frappy_psi.picontrol.PI',
'softloop controlled Temperature mixing chamber',
meaning=['temperature', 20],
meaning=['temperature', 30],
input_module = 'T_mix',
output_module = 'htr_mix',
control_active = 1,

View File

@ -5,6 +5,7 @@ Node('triton.psi.ch',
Mod('T_mix',
'frappy_psi.triton.TemperatureLoop',
'mix. chamber temperature',
meaning=['temperature', 30],
slot='T5',
output_module='htr_mix',
io='triton',

View File

@ -33,7 +33,7 @@ Mod('htr_sample',
Mod('T_sample',
'frappy_psi.softcal.SoftPiLoop',
'sample T',
meaning=['temperature', 20],
meaning=['temperature', 30],
rawsensor='res_sample',
output_module='htr_sample',
p=1,

View File

@ -11,6 +11,7 @@ Mod('sea_stick',
Mod('ts',
'frappy_psi.sea.SeaDrivable', '',
meaning=['temperature', 30],
io='sea_stick',
sea_object='ts',
)

View File

@ -11,6 +11,7 @@ Mod('sea_stick',
Mod('ts',
'frappy_psi.sea.SeaReadable', '',
meaning=['temperature', 30],
io='sea_stick',
sea_object='tt',
json_file='ma6.config.json',

View File

@ -11,6 +11,7 @@ Mod('sea_stick',
Mod('ts',
'frappy_psi.sea.SeaReadable', '',
meaning=['temperature', 30],
io='sea_stick',
sea_object='tt',
json_file='ma10.config.json',

View File

@ -11,6 +11,7 @@ Mod('sea_stick',
Mod('ts',
'frappy_psi.sea.SeaReadable', '',
meaning=['temperature', 30],
io='sea_stick',
sea_object='tt',
json_file='ill1.config.json',

View File

@ -11,6 +11,7 @@ Mod('sea_stick',
Mod('ts',
'frappy_psi.sea.SeaReadable', '',
meaning=['temperature', 30],
io='sea_stick',
sea_object='tt',
json_file='ill2.config.json',

View File

@ -11,6 +11,7 @@ Mod('sea_stick',
Mod('ts',
'frappy_psi.sea.SeaReadable', '',
meaning=['temperature', 30],
io='sea_stick',
sea_object='tt',
json_file='ill3.config.json',

View File

@ -11,6 +11,7 @@ Mod('sea_stick',
Mod('ts',
'frappy_psi.sea.SeaReadable', '',
meaning=['temperature', 30],
io='sea_stick',
sea_object='tt',
json_file='ill4.config.json',

View File

@ -11,6 +11,7 @@ Mod('sea_stick',
Mod('ts',
'frappy_psi.sea.SeaReadable', '',
meaning=['temperature', 30],
io='sea_stick',
sea_object='tt',
json_file='ill5.config.json',

View File

@ -11,6 +11,7 @@ Mod('sea_stick',
Mod('ts',
'frappy_psi.sea.SeaReadable', '',
meaning=['temperature', 30],
io='sea_stick',
sea_object='tt',
json_file='ill5.config.json',

View File

@ -11,6 +11,7 @@ Mod('sea_stick',
Mod('ts',
'frappy_psi.sea.SeaReadable', '',
meaning=['temperature', 30],
io='sea_stick',
sea_object='tt',
json_file='ma02.config.json',

View File

@ -11,6 +11,7 @@ Mod('sea_stick',
Mod('ts',
'frappy_psi.sea.SeaReadable', '',
meaning=['temperature', 30],
io='sea_stick',
sea_object='tt',
json_file='ma10.config.json',

View File

@ -21,6 +21,7 @@ Mod('tsam',
Mod('ts',
'frappy_psi.parmod.Converging',
'virtual stick T',
meaning=['temperature', 30],
unit='K',
read='tsam.value',
write='tsam.setsamp',

View File

@ -11,6 +11,7 @@ Mod('sea_stick',
Mod('ts',
'frappy_psi.sea.SeaReadable', '',
meaning=['temperature', 30],
io='sea_stick',
sea_object='tt',
json_file='ma15.config.json',

View File

@ -21,6 +21,7 @@ Mod('tsam',
Mod('ts',
'frappy_psi.parmod.Converging',
'drivable stick T using setsamp',
meaning=['temperature', 30],
unit='K',
read='tsam.value',
write='tsam.setsamp',

View File

@ -11,6 +11,7 @@ Mod('sea_stick',
Mod('ts',
'frappy_psi.sea.SeaReadable', '',
meaning=['temperature', 30],
io='sea_stick',
sea_object='tt',
json_file='ma7_piezo.config.json',

View File

@ -11,6 +11,7 @@ Mod('sea_stick',
Mod('ts',
'frappy_psi.sea.SeaReadable', '',
meaning=['temperature', 30],
io='sea_stick',
sea_object='tt',
json_file='ma7.config.json',

View File

@ -11,6 +11,7 @@ Mod('sea_stick',
Mod('ts',
'frappy_psi.sea.SeaReadable', '',
meaning=['temperature', 30],
io='sea_stick',
sea_object='tt',
json_file='ori1.config.json',

View File

@ -11,6 +11,7 @@ Mod('sea_stick',
Mod('ts',
'frappy_psi.sea.SeaReadable', '',
meaning=['temperature', 30],
io='sea_stick',
sea_object='tt',
json_file='ori3.config.json',

View File

@ -11,6 +11,7 @@ Mod('sea_stick',
Mod('ts',
'frappy_psi.sea.SeaReadable', '',
meaning=['temperature', 30],
io='sea_stick',
sea_object='tt',
json_file='ori4.config.json',

View File

@ -11,6 +11,7 @@ Mod('sea_stick',
Mod('ts',
'frappy_psi.sea.SeaReadable', '',
meaning=['temperature', 30],
io='sea_stick',
sea_object='tt',
json_file='ori6.config.json',

View File

@ -11,6 +11,7 @@ Mod('sea_stick',
Mod('ts',
'frappy_psi.sea.SeaReadable', '',
meaning=['temperature', 30],
io='sea_stick',
sea_object='tt',
json_file='ori7.config.json',

View File

@ -21,6 +21,7 @@ Mod('tsam',
Mod('ts',
'frappy_psi.parmod.Converging',
'drivable stick T using setsamp',
meaning=['temperature', 30],
unit='K',
read='tsam.value',
write='tsam.setsamp',

View File

@ -11,6 +11,7 @@ Mod('sea_stick',
Mod('ts',
'frappy_psi.sea.SeaDrivable', '',
meaning=['temperature', 30],
io='sea_stick',
sea_object='ts',
)

View File

@ -12,6 +12,7 @@ Mod('sea_stick',
Mod('ts',
'frappy_psi.sea.SeaReadable',
'sample temperature',
meaning=['temperature', 30],
io = 'sea_stick',
sea_object = 'tt',
json_file = 'ill5pgas5.config.json',

View File

@ -17,6 +17,7 @@ Mod('warmup',
Mod('ts',
'frappy_psi.sea.SeaReadable', '',
meaning=['temperature', 30],
io='sea_stick',
sea_object='tt',
json_file='ori4.config.json',

View File

@ -18,6 +18,7 @@ Mod('warmup',
Mod('ts',
'frappy_psi.sea.SeaReadable', '',
meaning=['temperature', 30],
sea_object='tt',
json_file='ori4.config.json',
rel_paths=['ts'],

View File

@ -19,7 +19,7 @@ Mod('itc1_',
Mod('T_sample',
'frappy_psi.mercury.TemperatureLoop',
'T at sample stick sensor',
meaning=['temperature', 20],
meaning=['temperature', 30],
io='itc1_',
slot='MB1.T1',
)

View File

@ -11,6 +11,7 @@ Mod('sea_stick',
Mod('ts',
'frappy_psi.sea.SeaReadable', '',
meaning=['temperature', 30],
io='sea_stick',
sea_object='tt',
json_file='variox.config.json',