aboutsummaryrefslogtreecommitdiff
path: root/qolab/hardware/daq
diff options
context:
space:
mode:
authorEugeniy E. Mikhailov <evgmik@gmail.com>2022-06-14 22:55:36 -0400
committerEugeniy E. Mikhailov <evgmik@gmail.com>2022-06-14 22:55:36 -0400
commit8f105c24e5b42bb321daf2b66d5c3fedcebfb246 (patch)
tree9bb3fd2df50b5d92b5c95751af34999d8b73ba1d /qolab/hardware/daq
parente3a75169865ad47148586ad99b75ceffdd6345be (diff)
downloadqolab-8f105c24e5b42bb321daf2b66d5c3fedcebfb246.tar.gz
qolab-8f105c24e5b42bb321daf2b66d5c3fedcebfb246.zip
proper inheritance of the parent deviceProperties
Diffstat (limited to 'qolab/hardware/daq')
-rw-r--r--qolab/hardware/daq/__init__.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/qolab/hardware/daq/__init__.py b/qolab/hardware/daq/__init__.py
index d0798c6..89543a6 100644
--- a/qolab/hardware/daq/__init__.py
+++ b/qolab/hardware/daq/__init__.py
@@ -7,7 +7,7 @@ class DAQ(BasicInstrument):
self.config['Device type']='DAQ'
self.config['Device model'] = 'Generic DAQ Without Hardware interface'
self.config['FnamePrefix'] = 'daq'
- self.deviceProperties = {'AnalogInputsNum', 'AnalogOutputsNum' }
+ self.deviceProperties.update({'AnalogInputsNum', 'AnalogOutputsNum'})
# this is device dependent
self.AnalogInputsNum=0