aboutsummaryrefslogtreecommitdiff
path: root/qolab/hardware/scope
diff options
context:
space:
mode:
authorEugeniy E. Mikhailov <evgmik@gmail.com>2024-07-19 00:15:25 -0400
committerEugeniy E. Mikhailov <evgmik@gmail.com>2024-07-19 00:15:25 -0400
commit6391d30ef0248faea90a8ea2e7975e576040aa0f (patch)
treee8541d8b32c72a065eb1ba0f8a6680bd885d267c /qolab/hardware/scope
parent146852c85b46b3dc9b94ea0fb4f8b5b02e1c953d (diff)
downloadqolab-6391d30ef0248faea90a8ea2e7975e576040aa0f.tar.gz
qolab-6391d30ef0248faea90a8ea2e7975e576040aa0f.zip
update
Diffstat (limited to 'qolab/hardware/scope')
-rw-r--r--qolab/hardware/scope/rigolds1054z.py16
1 files changed, 1 insertions, 15 deletions
diff --git a/qolab/hardware/scope/rigolds1054z.py b/qolab/hardware/scope/rigolds1054z.py
index 8a7d9a5..0286381 100644
--- a/qolab/hardware/scope/rigolds1054z.py
+++ b/qolab/hardware/scope/rigolds1054z.py
@@ -182,17 +182,6 @@ class RigolDS1054z(ScopeSCPI):
self.write(f":WAVeform:STOP {stp}")
qstr = ":WAVeform:DATA?"
try:
- """
- All this caraziness with tuning chunk_size
- is because Rigol usbtmc connection is bugy.
- It present itself as high speed device over USB,
- but set incompatible packet size of 64
- while the USB standard dictates 512.
- In linux dmesg complains:
- kernel: ... bulk endpoint 0x3 has invalid maxpacket 64
-
- Seel
-
wfRawChunk = self.query_binary_values(
qstr,
datatype="b",
@@ -230,8 +219,7 @@ class RigolDS1054z(ScopeSCPI):
print(f"final {chunk_size=}")
if True:
- return wfRaw
-
+ return wfRaw, errorFreeChunkSize, errorProneChunkSize
(
sparsing,
Npnts,
@@ -357,7 +345,6 @@ class RigolDS1054z(ScopeSCPI):
return tr
-
if __name__ == "__main__":
import pyvisa
@@ -380,4 +367,3 @@ if __name__ == "__main__":
print("------ Header ends -------------")
ch1 = scope.getTrace(1)
traces = scope.getAllTraces()
-