diff --git a/MOD2-files/LabManual_EC2017_Hueting_MATLAB.docx b/MOD2-files/LabManual_EC2017_Hueting_MATLAB.docx index c783446..2521867 100644 Binary files a/MOD2-files/LabManual_EC2017_Hueting_MATLAB.docx and b/MOD2-files/LabManual_EC2017_Hueting_MATLAB.docx differ diff --git a/OOequipment/Experiment5.zip b/OOequipment/Experiment5.zip new file mode 100644 index 0000000..fc87230 Binary files /dev/null and b/OOequipment/Experiment5.zip differ diff --git a/OOequipment/RC_TransferFunction.mlx b/OOequipment/RC_TransferFunction.mlx index 8c32111..3f2eeff 100644 Binary files a/OOequipment/RC_TransferFunction.mlx and b/OOequipment/RC_TransferFunction.mlx differ diff --git a/OOequipment/RLC_TransferFunction.mlx b/OOequipment/RLC_TransferFunction.mlx index a86fb6d..a516c35 100644 Binary files a/OOequipment/RLC_TransferFunction.mlx and b/OOequipment/RLC_TransferFunction.mlx differ diff --git a/OOequipment/subfiles/bodePlot.m b/OOequipment/debug/bodePlot.m similarity index 100% rename from OOequipment/subfiles/bodePlot.m rename to OOequipment/debug/bodePlot.m diff --git a/OOequipment/subfiles/transferFunction.m b/OOequipment/subfiles/transferFunction.m index 131bf52..078c9ef 100644 --- a/OOequipment/subfiles/transferFunction.m +++ b/OOequipment/subfiles/transferFunction.m @@ -8,11 +8,12 @@ function data = transferFunction(oscilloscope,functiongenerator,f_start,f_stop,a oscilloscope.enable_channels; oscilloscope.trigger.source = 'CH1'; emptydata = zeros(n_measurements,n_steps); - data = struct('magnitude',emptydata,'phase',emptydata,'frequency',f_array); + data = struct('magnitude',emptydata,'phase',emptydata,'frequency',f_array,'measurements',n_measurements,'steps',n_steps); for j = 1:n_measurements for i = 1:n_steps % fprintf('Measurement %i of %i - Frequency: %.2f Hertz\n',i,n_steps,f_array(i)); functiongenerator.frequency = f_array(i); + oscilloscope.run; oscilloscope.auto; wavedata = oscilloscope.waveform(1:2,'DEF','SAMP'); [data.phase(j,i),data.magnitude(j,i)] = phamag(wavedata.ch1,wavedata.ch2,wavedata.length,f_array(i),wavedata.sampletime);