Przeglądaj źródła

Waveformfunctie ook daadwerkelijk verwijderd

publish
Wouter Horlings 8 lat temu
rodzic
commit
5a4c58b415
1 zmienionych plików z 15 dodań i 15 usunięć
  1. +15
    -15
      OOequipment/Oscilloscope.m

+ 15
- 15
OOequipment/Oscilloscope.m Wyświetl plik

@@ -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



Ładowanie…
Anuluj
Zapisz