From 6023425f8db0df9be996e418c53d2634f36054b9 Mon Sep 17 00:00:00 2001 From: "Eugeniy E. Mikhailov" Date: Tue, 20 Jun 2023 10:15:20 -0400 Subject: good enough draft of hp_34401 functions --- qolab/hardware/multimeter/hp_34401.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'qolab/hardware/multimeter') diff --git a/qolab/hardware/multimeter/hp_34401.py b/qolab/hardware/multimeter/hp_34401.py index 326c162..206cbbe 100644 --- a/qolab/hardware/multimeter/hp_34401.py +++ b/qolab/hardware/multimeter/hp_34401.py @@ -80,12 +80,12 @@ class HP_34401(MultimeterSCPI): return self.getReadingWithSettingFunction('"CURRent:DC"', '"CURR"') def getAac(self): return self.getReadingWithSettingFunction('"CURRent:AC"', '"CURR:AC"') - - - # Vdc = SCPI_PROPERTY(scpi_prfx='SENSe:FUNCtion "VOLTage:DC"; :SYSTem:REMote\n read', ptype=float, doc='Report DC Voltage', no_setter=True) - # Vac = SCPI_PROPERTY(scpi_prfx='SENSe:FUNCtion "VOLTage:AC"; :SYSTem:REMote\n read', ptype=float, doc='Report AC Voltage', no_setter=True) - # Adc = SCPI_PROPERTY(scpi_prfx='SENSe:FUNCtion "CURRent:DC"; :SYSTem:REMote\n read', ptype=float, doc='Report DC Current', no_setter=True) - # Aac = SCPI_PROPERTY(scpi_prfx='SENSe:FUNCtion "CURRent:AC"; :SYSTem:REMote\n read', ptype=float, doc='Report AC Current', no_setter=True) + def getResistance(self): + return self.getReadingWithSettingFunction('"RESistance"', '"RES"') + def getDiode(self): + return self.getReadingWithSettingFunction('"DIODe"', '"DIOD"') + def getFreq(self): + return self.getReadingWithSettingFunction('"FREQuency"', '"FREQ"') if __name__ == '__main__': -- cgit v1.2.3