Take into account :WAVEFORM:YREF? when scaling/shifting data

This fixes a bug wherein retrieved data has the wrong vertical offset.
nsdecicco · Sep 18, 2017 · 037b044 · 037b044
1 parent ead0a7a
commit 037b044
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/getscopedat.m b/getscopedat.m
@@ -105,6 +105,7 @@
     %Acquire Y origin and Y increment Values
     yorg = str2double(query(eval(obj_name),':WAVEFORM:YOR?'));
     yinc = str2double(query(eval(obj_name),':WAVEFORM:YINC?'));
+    yref = str2double(query(eval(obj_name),':WAVEFORM:YREF?'));
 
     %Setup the Scope for proper output format
     fprintf(eval(obj_name), 'WAVEFORM:FORMAT BYTE');
@@ -120,7 +121,7 @@
 
     %Adjust data and time variables with x/y increments/origins
     t = t1 * xinc + xorg;
-    data = data1 * yinc + yorg;
+    data = (data1-yref) * yinc + yorg;
 
     plot(t,data);
 

diff --git a/usbgetscopedat.m b/usbgetscopedat.m
@@ -105,6 +105,7 @@
     %Acquire Y origin and Y increment Values
     yorg = str2double(query(eval(obj_name),':WAVEFORM:YOR?'));
     yinc = str2double(query(eval(obj_name),':WAVEFORM:YINC?'));
+    yref = str2double(query(eval(obj_name),':WAVEFORM:YREF?'));
 
     %Setup the Scope for proper output format
     fprintf(eval(obj_name), 'WAVEFORM:FORMAT BYTE');
@@ -120,7 +121,7 @@
 
     %Adjust data and time variables with x/y increments/origins
     t = t1 * xinc + xorg;
-    data = data1 * yinc + yorg;
+    data = (data1-yref) * yinc + yorg;
 
     plot(t,data);