improve drivers for PPMS auxiliary equipment

This commit is contained in:
l_samenv 2020-12-04 13:33:08 +01:00
parent 569c0a3399
commit d9650d7fc7
2 changed files with 4 additions and 7 deletions

View File

@ -21,18 +21,15 @@
"""WAVE FUNCTION LECROY XX: SIGNAL GENERATOR"""
from secop.core import Readable, Parameter, Override, Command, FloatRange, TupleOf, \
HasIodev, StringIO, Done, Attached, IntRange, BoolType, EnumType,StringType
HasIodev, StringIO, Done, Attached, IntRange, BoolType, EnumType,StringType, Module
class Channel(HasIodev, Writable):
class Channel(Module):
properties = {
'channel':Property('choose channel to manipulate',IntRange(1,2)),
}
parameters = {
'value': Override('exc_freq_int',
FloatRange(unit='Hz'),
poll=True, default=1000),
'target': Override('frequency set',
'freq': Parameter('frequency',
FloatRange(1e-6,20e6,unit='Hz'),
poll=True, initwrite=True, default=1000),
'amp': Parameter('exc_volt_int',

View File

@ -62,7 +62,7 @@ class XY(HasIodev, Readable):
'phase': Parameter('Reference phase control', FloatRange(-360,360,unit='deg'), poll=True, readonly=False, initwrite=True, default=0),
'vmode' : Parameter('Voltage input configuration', IntRange(0,3), readonly=False, default=3),
# 'dac': Parameter ('output DAC channel value', datatype=TupleOf(IntRange(1,4), FloatRange(0.00,5000,unit='mV')), poll=True, readonly=False, initwrite=True, default=(3,0)),
'dac': Parameter ('output DAC channel value', FloatRange(0.00,5000,unit='mV'), poll=True, readonly=False, initwrite=True, default=0),
'dac': Parameter ('output DAC channel value', FloatRange(-10000,10000,unit='mV'), poll=True, readonly=False, initwrite=True, default=0),
}
commands = {
'aphase': Command('auto phase'),