aboutsummaryrefslogtreecommitdiff
path: root/qolab/hardware/scope/rigolds1054z.py
diff options
context:
space:
mode:
Diffstat (limited to 'qolab/hardware/scope/rigolds1054z.py')
-rw-r--r--qolab/hardware/scope/rigolds1054z.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/qolab/hardware/scope/rigolds1054z.py b/qolab/hardware/scope/rigolds1054z.py
index 979c126..a97db67 100644
--- a/qolab/hardware/scope/rigolds1054z.py
+++ b/qolab/hardware/scope/rigolds1054z.py
@@ -331,7 +331,7 @@ class RigolDS1054z(ScopeSCPI):
tr.x = t
tr.y = wfVoltage
# restore scope to the before acquisition mode
- if old_trg_mode != "STOP":
+ if old_trg_status != "STOP":
self.run()
return tr
@@ -347,7 +347,7 @@ if __name__ == "__main__":
instr = rm.open_resource("USB0::0x1AB1::0x04CE::DS1ZA170502787::0::INSTR")
scope = RigolDS1054z(instr)
print(f"ID: {scope.idn}")
- print(f"TimePerDiv = scope.TimePerDiv")
+ print(f"TimePerDiv = {scope.TimePerDiv}")
# print(f'Ch1 mean: {scope.mean(1)}')
print(f"Ch1 available points: {scope.getAvailableNumberOfPoints(1)}")
print(f"Sample Rate: {scope.getSampleRate()}")