diff --git a/cfg/waba1_cfg.py b/cfg/waba1_cfg.py index 38c613f7..227d9dfb 100644 --- a/cfg/waba1_cfg.py +++ b/cfg/waba1_cfg.py @@ -1,4 +1,4 @@ -Node('linse-waba1.psi.ch', +Node('waba1.psi.ch', 'thermofisher water bath with pt-100 sensor via spi', 'tcp://5000', ) diff --git a/cfg/waba2_cfg.py b/cfg/waba2_cfg.py index 3ee99e86..b837243c 100644 --- a/cfg/waba2_cfg.py +++ b/cfg/waba2_cfg.py @@ -1,17 +1,26 @@ Node('waba2.psi.ch', - 'single waterbath no 2', + 'thermofisher water bath with pt-100 sensor via spi', 'tcp://5000', ) -IO('io_waba', 'serial:///dev/ttyUSB0?baudrate=19200') +Mod('io', + 'frappy_psi.thermofisher.IO', + 'connection for ThermoFisher A10', + uri='serial:///dev/ttyUSB0?baudrate=19200', + ) + +Mod('T', + 'frappy_psi.thermofisher.TemperatureLoop', + 'bath temperature', + io='io', + target=Param(max=100), + tolerance=0.5, + settling_time=20, + ) Mod('Ts', - 'frappy_psi.thermofisher.TemperatureLoopA10', - 'thermofisher water bath', - io='io_waba', - control_active=0, - target=25, - tolerance=0.1, - settling_time=20, - meaning = ['temperature', 10], - ) + 'frappy_psi.raspberry.PtSensor', + 'pt sensor via spi', + nominal = 100, + chip_select = 'D22', +) diff --git a/cfg/waba3_cfg.py b/cfg/waba3_cfg.py index 47338020..94eda3b9 100644 --- a/cfg/waba3_cfg.py +++ b/cfg/waba3_cfg.py @@ -1,17 +1,26 @@ Node('waba3.psi.ch', - 'single waterbath no 3', + 'thermofisher water bath with pt-100 sensor via spi', 'tcp://5000', ) -IO('io_waba', 'serial:///dev/ttyUSB0?baudrate=19200') +Mod('io', + 'frappy_psi.thermofisher.IO', + 'connection for ThermoFisher A10', + uri='serial:///dev/ttyUSB0?baudrate=19200', + ) + +Mod('T', + 'frappy_psi.thermofisher.TemperatureLoop', + 'bath temperature', + io='io', + target=Param(max=100), + tolerance=0.5, + settling_time=20, + ) Mod('Ts', - 'frappy_psi.thermofisher.TemperatureLoopA10', - 'thermofisher water bath', - io='io_waba', - control_active=0, - target=25, - tolerance=0.1, - settling_time=20, - meaning = ['temperature', 10], - ) + 'frappy_psi.raspberry.PtSensor', + 'pt sensor via spi', + nominal = 100, + chip_select = 'D22', +) diff --git a/cfg/waba4_cfg.py b/cfg/waba4_cfg.py index 587cabd7..79bd7584 100644 --- a/cfg/waba4_cfg.py +++ b/cfg/waba4_cfg.py @@ -1,17 +1,26 @@ Node('waba4.psi.ch', - 'single waterbath no 4', + 'thermofisher water bath with pt-100 sensor via spi', 'tcp://5000', ) -IO('io_waba', 'serial:///dev/ttyUSB0?baudrate=19200') +Mod('io', + 'frappy_psi.thermofisher.IO', + 'connection for ThermoFisher A10', + uri='serial:///dev/ttyUSB0?baudrate=19200', + ) + +Mod('T', + 'frappy_psi.thermofisher.TemperatureLoop', + 'bath temperature', + io='io', + target=Param(max=100), + tolerance=0.5, + settling_time=20, + ) Mod('Ts', - 'frappy_psi.thermofisher.TemperatureLoopA10', - 'thermofisher water bath', - io='io_waba', - control_active=0, - target=25, - tolerance=0.1, - settling_time=20, - meaning = ['temperature', 10], - ) + 'frappy_psi.raspberry.PtSensor', + 'pt sensor via spi', + nominal = 100, + chip_select = 'D22', +) diff --git a/cfg/waba5_cfg.py b/cfg/waba5_cfg.py index a27b9af9..96d1fde3 100644 --- a/cfg/waba5_cfg.py +++ b/cfg/waba5_cfg.py @@ -1,17 +1,26 @@ Node('waba5.psi.ch', - 'single waterbath no 5', + 'thermofisher water bath with pt-100 sensor via spi', 'tcp://5000', ) -IO('io_waba', 'serial:///dev/ttyUSB0?baudrate=19200') +Mod('io', + 'frappy_psi.thermofisher.IO', + 'connection for ThermoFisher A10', + uri='serial:///dev/ttyUSB0?baudrate=19200', + ) + +Mod('T', + 'frappy_psi.thermofisher.TemperatureLoop', + 'bath temperature', + io='io', + target=Param(max=100), + tolerance=0.5, + settling_time=20, + ) Mod('Ts', - 'frappy_psi.thermofisher.TemperatureLoopA10', - 'thermofisher water bath', - io='io_waba', - control_active=0, - target=25, - tolerance=0.1, - settling_time=20, - meaning = ['temperature', 10], - ) + 'frappy_psi.raspberry.PtSensor', + 'pt sensor via spi', + nominal = 100, + chip_select = 'D22', +)