diff --git a/OOequipment/subfiles/Channel.m b/OOequipment/subfiles/Channel.m index 9cd7a32..092e5ab 100644 --- a/OOequipment/subfiles/Channel.m +++ b/OOequipment/subfiles/Channel.m @@ -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 \ No newline at end of file diff --git a/OOequipment/subfiles/transferFunction.m b/OOequipment/subfiles/transferFunction.m index e93d6ba..8964acb 100644 --- a/OOequipment/subfiles/transferFunction.m +++ b/OOequipment/subfiles/transferFunction.m @@ -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