diff --git a/OOequipment/Oscilloscope.m b/OOequipment/Oscilloscope.m index c50f3f0..e879c0a 100644 --- a/OOequipment/Oscilloscope.m +++ b/OOequipment/Oscilloscope.m @@ -25,21 +25,21 @@ classdef Oscilloscope < Equipment end end - function data = waveform(ch,cha) - ch.scope.clear; - ch.scope.write('CHAN1:TYPE HRES'); - ch.scope.write('FORM REAL'); - ch.scope.write('FORM:BORD MSBF'); - ch.scope.write('CHAN1:DATA:POIN DEF'); - ch.scope.write('SING'); - header = str2num(ch.scope.query('CHAN1:DATA:HEAD?')); - ch.scope.write_unsafe('CHAN1:DATA?'); - prefixstring = fscanf(ch.scope.tcp,'%c',2); - prefixlength = str2double(prefixstring(2)); - datalength = fscanf(ch.scope.tcp,'%c',prefixlength); - data = fread(ch.scope.tcp,header(3),'float'); - flushinput(ch.scope.tcp); - end +% function data = waveform(ch,cha) +% ch.scope.clear; +% ch.scope.write('CHAN1:TYPE HRES'); +% ch.scope.write('FORM REAL'); +% ch.scope.write('FORM:BORD MSBF'); +% ch.scope.write('CHAN1:DATA:POIN DEF'); +% ch.scope.write('SING'); +% header = str2num(ch.scope.query('CHAN1:DATA:HEAD?')); +% ch.scope.write_unsafe('CHAN1:DATA?'); +% prefixstring = fscanf(ch.scope.tcp,'%c',2); +% prefixlength = str2double(prefixstring(2)); +% datalength = fscanf(ch.scope.tcp,'%c',prefixlength); +% data = fread(ch.scope.tcp,header(3),'float'); +% flushinput(ch.scope.tcp); +% end end end