Selaa lähdekoodia

added probe setting and double2str

master
Wouter Horlings 7 vuotta sitten
vanhempi
commit
88205abb4d
2 muutettua tiedostoa jossa 3 lisäystä ja 5 poistoa
  1. +1
    -5
      OOequipment/subfiles/Channel.m
  2. +2
    -0
      OOequipment/subfiles/transferFunction.m

+ 1
- 5
OOequipment/subfiles/Channel.m Näytä tiedosto

@@ -121,7 +121,7 @@ classdef Channel
end
function ch = set.probe(ch,man)
ch.scope.write(['PROB',num2str(ch.channelnumber),':SET:ATT:MAN ', man]);
ch.scope.write(['PROB',num2str(ch.channelnumber),':SET:ATT:MAN ', double2str(man)]);
end
function data = waveform(ch,window)
@@ -162,9 +162,5 @@ classdef Channel
function c = MEAS(ch,string)
c = ch.scope.query(['MEAS',num2str(ch.channelnumber),':RES:ACT?',string]);
end
% function c = CHANsend(ch,string,in)
% c = ['CHAN',num2str(ch.channelnumber),':',string,' ',in];
% end
end
end

+ 2
- 0
OOequipment/subfiles/transferFunction.m Näytä tiedosto

@@ -13,6 +13,8 @@ function data = transferFunction(oscilloscope,functiongenerator,f_start,f_stop,a
functiongenerator.waveform = 'SINUSOID';
oscilloscope.enable_channels;
oscilloscope.trigger.source = 'CH1';
oscilloscope.ch1.probe = 1;
oscilloscope.ch2.probe = 1;
emptydata = zeros(n_measurements,n_steps);
data = struct('magnitude',emptydata,'phase',emptydata,'frequency',f_array,'measurements',n_measurements,'steps',n_steps);
for j = 1:n_measurements


Loading…
Peruuta
Tallenna