From 9daa9285e29e1baa66830dc6c9baed56c21f4c2f Mon Sep 17 00:00:00 2001 From: "Eugeniy E. Mikhailov" Date: Wed, 17 Jul 2024 21:27:21 -0400 Subject: refactor power supply to avoid circular loads --- qolab/hardware/power_supply/__init__.py | 43 +++------------------------------ 1 file changed, 3 insertions(+), 40 deletions(-) (limited to 'qolab/hardware/power_supply/__init__.py') diff --git a/qolab/hardware/power_supply/__init__.py b/qolab/hardware/power_supply/__init__.py index 6635584..76b812c 100644 --- a/qolab/hardware/power_supply/__init__.py +++ b/qolab/hardware/power_supply/__init__.py @@ -1,42 +1,5 @@ -from qolab.hardware.scpi import SCPIinstr -from qolab.hardware.basic import BasicInstrument +"""Power supplies.""" +from .keysight_e3612a import KeysightE3612A -class PowerSupply(BasicInstrument): - """Base class for a Power Supply. - - Contains minimal set of methods to be implemented by a Power Supply. - - Intended to be used as a parent for hardware aware power supplies. - """ - - def __init__(self, *args, **kwds): - BasicInstrument.__init__(self, *args, **kwds) - self.config["Device type"] = "PowerSupply" - self.config["Device model"] = ( - "Generic Power Supply generator Without Hardware interface" - ) - self.config["FnamePrefix"] = "power_supply" - self.deviceProperties.update({}) - - -class PowerSupplySCPI(SCPIinstr, PowerSupply): - """SCPI aware power supply. - - Intended to be used as a parent for hardware aware power supplies. - - Example - ------- - - >>> rm = pyvisa.ResourceManager() - >>> PowerSupplySCPI(rm.open_resource('TCPIP::192.168.0.2::INSTR')) - - or - - >>> PowerSupplySCPI(rm.open_resource('USB0::10893::4354::MY61001869::0::INSTR')) - """ - - def __init__(self, resource, *args, **kwds): - SCPIinstr.__init__(self, resource) - PowerSupply.__init__(self, *args, **kwds) - self.config["DeviceId"] = str.strip(self.idn) +__all__ = ["KeysightE3612A"] -- cgit v1.2.3