From c1403763f461e3e9409178de66abc9b6e6c053b4 Mon Sep 17 00:00:00 2001 From: Oksana Shliakhtun Date: Tue, 13 Aug 2024 15:49:10 +0200 Subject: [PATCH] . Change-Id: If177029157edbd6123e9f41883dbb6c639a68852 --- cfg/QnwTC1_cfg.py | 2 +- cfg/TFA10_cfg.py | 2 +- cfg/sim921_cfg.py | 2 +- frappy_psi/bridge.py | 10 ++++++---- 4 files changed, 9 insertions(+), 7 deletions(-) diff --git a/cfg/QnwTC1_cfg.py b/cfg/QnwTC1_cfg.py index a453358..dc969d3 100644 --- a/cfg/QnwTC1_cfg.py +++ b/cfg/QnwTC1_cfg.py @@ -6,7 +6,7 @@ Node('QnwTC1test.psi.ch', Mod('io', 'frappy_psi.qnw.QnwIO', 'connection for Quantum northwest', - uri='tcp://ldmcc01-ts:3004', + uri='tcp://ldm-fi-ts:3001', ) Mod('T', diff --git a/cfg/TFA10_cfg.py b/cfg/TFA10_cfg.py index 14cfd2d..667e1c5 100644 --- a/cfg/TFA10_cfg.py +++ b/cfg/TFA10_cfg.py @@ -6,7 +6,7 @@ Node('TFA10.psi.ch', Mod('io', 'frappy_psi.thermofisher.ThermFishIO', 'connection for ThermoFisher A10', - uri='tcp://ldmse-d910-ts:3001', + uri='tcp://ldm-fi-ts:3002', ) Mod('T', diff --git a/cfg/sim921_cfg.py b/cfg/sim921_cfg.py index 32f8ae4..05202b0 100644 --- a/cfg/sim921_cfg.py +++ b/cfg/sim921_cfg.py @@ -6,7 +6,7 @@ Node('bridge.psi.ch', Mod('io', 'frappy_psi.bridge.BridgeIO', 'communication to sim900', - uri='serial:///dev/cu.usbserial-14240', + uri='serial:///dev/cu.usbserial-14340', ) Mod('res1', diff --git a/frappy_psi/bridge.py b/frappy_psi/bridge.py index 0d95e80..605bef3 100644 --- a/frappy_psi/bridge.py +++ b/frappy_psi/bridge.py @@ -65,13 +65,14 @@ class Base(HasIO): class Resistance(Base, Readable): value = Parameter('resistance', datatype=FloatRange, unit='ohm') - output_offset = Parameter('temperature deviation', datatype=FloatRange, unit='Ohm') + output_offset = Parameter('resistance deviation', datatype=FloatRange, unit='Ohm', readonly=False) phase_hold = Parameter('phase hold', EnumType('phase hold', off=0, on=1)) RES_RANGE = ['20mOhm', '200mOhm', '2Ohm', '20Ohm', '200Ohm', '2kOhm', '20kOhm', '200kOhm', '2MOhm', '20MOhm'] irange = Parameter('resistance range index', EnumType('resistance range index', - {name: idx for idx, name in enumerate(RES_RANGE)}), readonly=False) + {name: idx for idx, name in enumerate(RES_RANGE)}), + readonly=False) range = Parameter('resistance range value', FloatRange(2e-2, 2e7), unit='Om', readonly=False) TIME_CONST = ['0.3s', '1s', '3s', '10s', '30s', '100s', '300s'] @@ -81,8 +82,9 @@ class Resistance(Base, Readable): tc = Parameter('time constant value', FloatRange(1e-1, 3e2), unit='s', readonly=False) EXCT_RANGE = ['0', '3uV', '10uV', '30uV', '100uV', '300uV', '1mV', '3mV', '10mV', '30mV'] - iexct = Parameter('excitation index', EnumType('excitation index range', - {name: idx for idx, name in enumerate(EXCT_RANGE, start=-1)}), readonly=False) + iexct = Parameter('excitation index', + EnumType('excitation index range', {name: idx for idx, name in enumerate(EXCT_RANGE, start=-1)}), + readonly=False) exct = Parameter('excitation value', FloatRange(0, 3e-2), unit='s', default=300, readonly=False) autorange = Parameter('autorange_on', EnumType('autorange', off=0, on=1),