diff --git a/cfg/dil5_statemachine_cfg.py b/cfg/dil5_statemachine_cfg.py index ba166a4..b850f06 100644 --- a/cfg/dil5_statemachine_cfg.py +++ b/cfg/dil5_statemachine_cfg.py @@ -1,7 +1,11 @@ +turbo_uri = '/dev/serial/by-path/platform-fd500000.pcie-pci-0000:01:00.0-usb-0:1.1:1.0-port0' +press_uri = '/dev/serial/by-path/platform-fd500000.pcie-pci-0000:01:00.0-usb-0:1.2:1.0-port0' +itc_uri = '/dev/serial/by-path/platform-fd500000.pcie-pci-0000:01:00.0-usb-0:1.3:1.0-port0' -Node('LOGO.psi.ch', - 'LOGO', - interface='tcp://5010', + +Node('dil5.psi.ch', + 'dil5 with state machine for condensing and removing', + interface='tcp://5000', secondary = ['ws://8010'] ) @@ -153,36 +157,62 @@ Mod('p5max', vm_address ="VW14", ) -""" + Mod('io_ls273', 'frappy_psi.ls372.StringIO', 'io for Ls372', - uri = 'localhost:2089', + uri='serial:///dev/ttyACM1?baudrate=57600+parity=odd+bytesize=7+stopbits=1', ) Mod('sw', 'frappy_psi.ls372.Switcher', 'channel switcher', io = 'io_ls273', ) -Mod('res1', - 'frappy_psi.ls372.ResChannel', - 'resistivity chan 1', - vexc = '2mV', +Mod('T_mix', + 'frappy_psi.ls372.TemperatureLoop', + 'mix temperature chan 5', + channel = 5, + switcher = 'sw', +) + +Mod('T_ivc', + 'frappy_psi.ls372.TemperatureLoop', + 'mix temperature chan 2', + channel = 2, + switcher = 'sw', +) + +Mod('T_still', + 'frappy_psi.ls372.TemperatureLoop', + 'mix temperature chan 3', + channel = 3, + switcher = 'sw', +) + +Mod('T_sorb', + 'frappy_psi.ls372.TemperatureLoop', + 'mix temperature chan 1', channel = 1, switcher = 'sw', ) -""" + +Mod('T_cp', + 'frappy_psi.ls372.TemperatureLoop', + 'mix temperature chan 4', + channel = 4, + switcher = 'sw', +) Mod('io_pfeiffer', 'frappy_psi.pfeiffer_new.PfeifferProtocol', '', - uri='serial:///dev/ttyUSB0?baudrate=9600+parity=none+bytesize=8+stopbits=1', + uri=f'serial://{press_uri}?baudrate=9600+parity=none+bytesize=8+stopbits=1', ) Mod('io_turbo', 'frappy_psi.pfeiffer_new.PfeifferProtocol', '', - uri='serial:///dev/ttyUSB1?baudrate=9600+parity=none+bytesize=8+stopbits=1', + uri=f'serial://{turbo_uri}?baudrate=9600+parity=none+bytesize=8+stopbits=1', ) Mod('p3', @@ -278,6 +308,47 @@ Mod('MV9', 'Manual Valve MV9' ) +Mod('itc', + 'frappy_psi.mercury.IO', + 'connection to MercuryiTC', + uri=f'serial://{itc_uri}?baudrate=115200+parity=none+bytesize=8+stopbits=1', +) + +Mod('T_still_wup', + 'frappy_psi.mercury.TemperatureLoop', + 'still warmup temperature', + slot='MB1.T1', + io='itc', +) + +Mod('T_one_K', + 'frappy_psi.mercury.TemperatureLoop', + '1 K plate warmup temperature', + slot='DB5.T1', + io='itc', +) + +Mod('T_mix_wup', + 'frappy_psi.mercury.TemperatureLoop', + 'mix. chamber warmup temperature', + slot='DB6.T1', + io='itc', +) + +Mod('T_ivc_wup', + 'frappy_psi.mercury.TemperatureLoop', + 'IVC warmup temperature', + slot='DB7.T1', + io='itc', +) + +Mod('T_cond', + 'frappy_psi.mercury.TemperatureLoop', + 'condenser temperature', + slot='DB8.T1', + io='itc', +) + Mod('stateMachine', 'frappy_psi.dilution_statemachine.DIL5', 'Statemachine', @@ -287,6 +358,7 @@ Mod('stateMachine', dump_valve = "V4", circulate_pump = "pump", compressor = "compressor", + turbopump = "turbopump", condenseline_valve = "V1", circuitshort_valve = "V2",