From 10abb322467c7490d53d6e09e8908d099f657e97 Mon Sep 17 00:00:00 2001 From: "Eugeniy E. Mikhailov" Date: Tue, 7 Dec 2021 12:27:56 -0500 Subject: fixes in scpi commands queries return values --- qolab/hardware/scpi.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/qolab/hardware/scpi.py b/qolab/hardware/scpi.py index 71ab556..a9c6061 100644 --- a/qolab/hardware/scpi.py +++ b/qolab/hardware/scpi.py @@ -47,16 +47,16 @@ class SCPIinstr: self.write("*ESE") def query_event_status_enable(self): - self.query("*ESE?") + return self.query("*ESE?") def query_event_status_register(self): - self.query("*ESR?") + return self.query("*ESR?") def set_wait_until_finished(self): - self.query("*OPC") + self.write("*OPC") def wait_until_finished(self): - self.query("*OPC?") + return self.query("*OPC?") def reset(self): self.write("*RST") @@ -65,13 +65,13 @@ class SCPIinstr: self.write("*SRE") def query_service_request_enable(self): - self.query("*SRE?") + return self.query("*SRE?") def query_status_byte(self): - self.query("*STB?") + return self.query("*STB?") def self_test_result(self): - self.query("*TST?") + return self.query("*TST?") def wait(self): self.write("*WAI") -- cgit v1.2.3