aboutsummaryrefslogtreecommitdiff
path: root/qolab
diff options
context:
space:
mode:
authorEugeniy E. Mikhailov <evgmik@gmail.com>2022-01-02 20:18:07 -0500
committerEugeniy E. Mikhailov <evgmik@gmail.com>2022-01-02 20:18:07 -0500
commit5f74a829717652d333f8f34926e374c146d9ebdc (patch)
treea35dc808cfbbf7e9ce00ca8fc7906395cafb5b1d /qolab
parent91c48890c68fb05ae090185d2b919e010cf65f2e (diff)
downloadqolab-5f74a829717652d333f8f34926e374c146d9ebdc.tar.gz
qolab-5f74a829717652d333f8f34926e374c146d9ebdc.zip
srs_sr865a now has auxilarly input and output properties
Diffstat (limited to 'qolab')
-rw-r--r--qolab/hardware/lockin/srs_sr865a.py12
1 files changed, 11 insertions, 1 deletions
diff --git a/qolab/hardware/lockin/srs_sr865a.py b/qolab/hardware/lockin/srs_sr865a.py
index 727c54e..e6ecf65 100644
--- a/qolab/hardware/lockin/srs_sr865a.py
+++ b/qolab/hardware/lockin/srs_sr865a.py
@@ -13,7 +13,7 @@ class SRS_SR865A(LockinSCPI):
super().__init__(resource, *args, **kwds)
self.config['Device model']='SRS SR865A'
self.resource.read_termination='\n'
- self.deviceProperties.extend(['TimeBaseMode'])
+ self.deviceProperties.extend(['TimeBaseMode', 'AuxOut1', 'AuxOut2', 'AuxOut3', 'AuxOut4'])
FreqInt = SCPI_PROPERTY(scpi_prfx='FreqInt', ptype=float, doc='Internal LO frequency')
FreqExt = SCPI_PROPERTY(scpi_prfx='FreqExt', ptype=float, doc='External LO frequency', no_setter=True)
@@ -50,6 +50,16 @@ class SRS_SR865A(LockinSCPI):
3: 24dB/Oct
""")
+ AuxOut1 = SCPI_PROPERTY(scpi_prfx=['AUXV? 0', 'AUXV 0,{}'], ptype=float, doc='Voltage at Auxilarly output 1')
+ AuxOut2 = SCPI_PROPERTY(scpi_prfx=['AUXV? 1', 'AUXV 1,{}'], ptype=float, doc='Voltage at Auxilarly output 2')
+ AuxOut3 = SCPI_PROPERTY(scpi_prfx=['AUXV? 2', 'AUXV 2,{}'], ptype=float, doc='Voltage at Auxilarly output 3')
+ AuxOut4 = SCPI_PROPERTY(scpi_prfx=['AUXV? 3', 'AUXV 3,{}'], ptype=float, doc='Voltage at Auxilarly output 4')
+
+ AuxIn1 = SCPI_PROPERTY(scpi_prfx=['OAUX? 0', ''], ptype=float, doc='Voltage at Auxilarly input 1', no_setter=True)
+ AuxIn2 = SCPI_PROPERTY(scpi_prfx=['OAUX? 1', ''], ptype=float, doc='Voltage at Auxilarly input 2', no_setter=True)
+ AuxIn3 = SCPI_PROPERTY(scpi_prfx=['OAUX? 2', ''], ptype=float, doc='Voltage at Auxilarly input 3', no_setter=True)
+ AuxIn4 = SCPI_PROPERTY(scpi_prfx=['OAUX? 3', ''], ptype=float, doc='Voltage at Auxilarly input 4', no_setter=True)
+
if __name__ == '__main__':
import pyvisa
print("testing")