| @@ -121,7 +121,7 @@ classdef Channel | |||||
| end | end | ||||
| function ch = set.probe(ch,man) | 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 | end | ||||
| function data = waveform(ch,window) | function data = waveform(ch,window) | ||||
| @@ -162,9 +162,5 @@ classdef Channel | |||||
| function c = MEAS(ch,string) | function c = MEAS(ch,string) | ||||
| c = ch.scope.query(['MEAS',num2str(ch.channelnumber),':RES:ACT?',string]); | c = ch.scope.query(['MEAS',num2str(ch.channelnumber),':RES:ACT?',string]); | ||||
| end | end | ||||
| % function c = CHANsend(ch,string,in) | |||||
| % c = ['CHAN',num2str(ch.channelnumber),':',string,' ',in]; | |||||
| % end | |||||
| end | end | ||||
| end | end | ||||
| @@ -13,6 +13,8 @@ function data = transferFunction(oscilloscope,functiongenerator,f_start,f_stop,a | |||||
| functiongenerator.waveform = 'SINUSOID'; | functiongenerator.waveform = 'SINUSOID'; | ||||
| oscilloscope.enable_channels; | oscilloscope.enable_channels; | ||||
| oscilloscope.trigger.source = 'CH1'; | oscilloscope.trigger.source = 'CH1'; | ||||
| oscilloscope.ch1.probe = 1; | |||||
| oscilloscope.ch2.probe = 1; | |||||
| emptydata = zeros(n_measurements,n_steps); | emptydata = zeros(n_measurements,n_steps); | ||||
| data = struct('magnitude',emptydata,'phase',emptydata,'frequency',f_array,'measurements',n_measurements,'steps',n_steps); | data = struct('magnitude',emptydata,'phase',emptydata,'frequency',f_array,'measurements',n_measurements,'steps',n_steps); | ||||
| for j = 1:n_measurements | for j = 1:n_measurements | ||||