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/power_supply | |
| parent | e3a75169865ad47148586ad99b75ceffdd6345be (diff) | |
| download | qolab-8f105c24e5b42bb321daf2b66d5c3fedcebfb246.tar.gz qolab-8f105c24e5b42bb321daf2b66d5c3fedcebfb246.zip | |
proper inheritance of the parent deviceProperties
Diffstat (limited to 'qolab/hardware/power_supply')
| -rw-r--r-- | qolab/hardware/power_supply/__init__.py | 2 | ||||
| -rw-r--r-- | qolab/hardware/power_supply/keysight_e3612a.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/qolab/hardware/power_supply/__init__.py b/qolab/hardware/power_supply/__init__.py index b1083cf..5ec4ab9 100644 --- a/qolab/hardware/power_supply/__init__.py +++ b/qolab/hardware/power_supply/__init__.py @@ -8,7 +8,7 @@ class PowerSupply(BasicInstrument): self.config['Device type']='PowerSupply' self.config['Device model'] = 'Generic Power Supply generator Without Hardware interface' self.config['FnamePrefix'] = 'power_supply' - self.deviceProperties = { } + self.deviceProperties.update({}) class PowerSupplySCPI(SCPIinstr, PowerSupply): """ diff --git a/qolab/hardware/power_supply/keysight_e3612a.py b/qolab/hardware/power_supply/keysight_e3612a.py index e106279..b241b30 100644 --- a/qolab/hardware/power_supply/keysight_e3612a.py +++ b/qolab/hardware/power_supply/keysight_e3612a.py @@ -9,7 +9,7 @@ class KeysightE3612A(PowerSupplySCPI): self.resource.read_termination='\n' self.config['Device model'] = 'Keysight E3612A' self.numberOfChannels = 3 - self.deviceProperties = {'OpMode', }; + self.deviceProperties.update({'OpMode'}) self.channelProperties = {'IsOn', 'Regulation', 'Vout', 'Vlimit', 'Iout', 'Ilimit', 'dV', 'dI', } self.deffaultChannelR = 47; # used if no empirical way to calculate it via Vout/Iout |