From 8f105c24e5b42bb321daf2b66d5c3fedcebfb246 Mon Sep 17 00:00:00 2001 From: "Eugeniy E. Mikhailov" Date: Tue, 14 Jun 2022 22:55:36 -0400 Subject: proper inheritance of the parent deviceProperties --- qolab/hardware/scope/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'qolab/hardware/scope') 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', } -- cgit v1.2.3