diff options
| author | Eugeniy E. Mikhailov <evgmik@gmail.com> | 2022-06-14 22:55:36 -0400 |
|---|---|---|
| committer | Eugeniy E. Mikhailov <evgmik@gmail.com> | 2022-06-14 22:55:36 -0400 |
| commit | 8f105c24e5b42bb321daf2b66d5c3fedcebfb246 (patch) | |
| tree | 9bb3fd2df50b5d92b5c95751af34999d8b73ba1d /qolab/hardware/scope/__init__.py | |
| parent | e3a75169865ad47148586ad99b75ceffdd6345be (diff) | |
| download | qolab-8f105c24e5b42bb321daf2b66d5c3fedcebfb246.tar.gz qolab-8f105c24e5b42bb321daf2b66d5c3fedcebfb246.zip | |
proper inheritance of the parent deviceProperties
Diffstat (limited to 'qolab/hardware/scope/__init__.py')
| -rw-r--r-- | qolab/hardware/scope/__init__.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/qolab/hardware/scope/__init__.py b/qolab/hardware/scope/__init__.py index debe668..3bca8f0 100644 --- a/qolab/hardware/scope/__init__.py +++ b/qolab/hardware/scope/__init__.py @@ -19,7 +19,7 @@ class Scope(BasicInstrument): # deviceProperties must have 'get' and preferably 'set' methods available, # i.e. 'SampleRate' needs getSampleRate() and love to have setSampleRate(value) # they will be used to obtain config and set device according to it - self.deviceProperties = {'SampleRate', 'TimePerDiv', 'TrigDelay', 'TriggerMode', 'Roll', 'Run' }; + self.deviceProperties.update({'SampleRate', 'TimePerDiv', 'TrigDelay', 'TriggerMode', 'Roll', 'Run' }) # same is applied to channelProperties but we need setter/getter with channel number # i.e. VoltsPerDiv -> getChanVoltsPerDiv(chNum) and setSampleRate(chNum, value) self.channelProperties = {'VoltsPerDiv', 'VoltageOffset', } |