aboutsummaryrefslogtreecommitdiff
path: root/qolab/hardware
diff options
context:
space:
mode:
authorEugeniy E. Mikhailov <evgmik@gmail.com>2022-04-04 13:29:21 -0400
committerEugeniy E. Mikhailov <evgmik@gmail.com>2022-04-04 13:29:21 -0400
commit3369e67421884d7e376cdfeed3752c1a6f722614 (patch)
treeb4240f6e3fba7ff4c4a11125c22c24be22912fe9 /qolab/hardware
parent8ec5fd64a29a7189c581ac620c3a0028a8dd396c (diff)
downloadqolab-3369e67421884d7e376cdfeed3752c1a6f722614.tar.gz
qolab-3369e67421884d7e376cdfeed3752c1a6f722614.zip
proper labjack initialization
Diffstat (limited to 'qolab/hardware')
-rw-r--r--qolab/hardware/daq/labjack_ue9.py5
1 files changed, 2 insertions, 3 deletions
diff --git a/qolab/hardware/daq/labjack_ue9.py b/qolab/hardware/daq/labjack_ue9.py
index a467746..c232501 100644
--- a/qolab/hardware/daq/labjack_ue9.py
+++ b/qolab/hardware/daq/labjack_ue9.py
@@ -7,10 +7,10 @@ class LabJackUE9(DAQ):
This custom modification of the stock LabJack UE9 class provided by LabJack as ue9
"""
- def __init__(self, *args, debug = False, autoOpen = True, ethernet=False, ipAddress="192.168.1.209", **kargs):
+ def __init__(self, *args, debug = False, autoOpen = True, ethernet=False, ipAddress=None, **kargs):
"""
LabJack UE9 can be contacted via TCP, use
- QOL_UE9(ethernet=True, ipAddress="192.168.1.209")
+ LabJackUE9(ethernet=True, ipAddress="192.168.1.209")
"""
super().__init__(*args, **kargs)
self.config['Device model'] = 'LabJack UE9'
@@ -18,7 +18,6 @@ class LabJackUE9(DAQ):
self.AnalogOutputsNum=2
self.daq = ue9.UE9(debug=debug, autoOpen=autoOpen, ethernet=ethernet, ipAddress=ipAddress)
- # self.daq = ue9.UE9(debug=debug, autoOpen=autoOpen)
# For applying the proper calibration to readings.
c=self.daq.getCalibrationData()