diff --git a/MOD2-files/LabManual_EC2017.pdf b/MOD2-files/LabManual_EC2017.pdf index b6ddc0f..efd160c 100644 Binary files a/MOD2-files/LabManual_EC2017.pdf and b/MOD2-files/LabManual_EC2017.pdf differ diff --git a/MOD2-files/LabManual_EC2017_Hueting_MATLAB.docx b/MOD2-files/LabManual_EC2017_Hueting_MATLAB.docx index 2521867..da697d8 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/Bodeplot.mlx b/OOequipment/Bodeplot.mlx index 2e1b6e9..8d33f02 100644 Binary files a/OOequipment/Bodeplot.mlx and b/OOequipment/Bodeplot.mlx differ diff --git a/OOequipment/FourierFilterAnalysis.mlx b/OOequipment/FourierFilterAnalysis.mlx index d040f33..401c698 100644 Binary files a/OOequipment/FourierFilterAnalysis.mlx and b/OOequipment/FourierFilterAnalysis.mlx differ diff --git a/OOequipment/FourierHarmonics.mlx b/OOequipment/FourierHarmonics.mlx index f503d54..6421023 100644 Binary files a/OOequipment/FourierHarmonics.mlx and b/OOequipment/FourierHarmonics.mlx differ diff --git a/OOequipment/Waveform.mlx b/OOequipment/Waveform.mlx index 5254c1c..4f1428c 100644 Binary files a/OOequipment/Waveform.mlx and b/OOequipment/Waveform.mlx differ diff --git a/OOequipment/subfiles/Bodeplot_script.m b/OOequipment/subfiles/Bodeplot_script.m index b754f55..54ce0e3 100644 --- a/OOequipment/subfiles/Bodeplot_script.m +++ b/OOequipment/subfiles/Bodeplot_script.m @@ -1,6 +1,4 @@ -tic data = transferFunction(oscilloscope,functiongenerator,f_start,f_stop,amplitude,n_steps); -toc figure ax(1)=subplot(2,1,1); semilogx(data.frequency,20*log10(data.magnitude)); diff --git a/OOequipment/subfiles/FourierHarmonics_script.m b/OOequipment/subfiles/FourierHarmonics_script.m index 5025289..456d107 100644 --- a/OOequipment/subfiles/FourierHarmonics_script.m +++ b/OOequipment/subfiles/FourierHarmonics_script.m @@ -14,7 +14,7 @@ epdpvhv = epdhv + vhv; maxamp=max(ehv); mA=ceil(maxamp); - +clear ax figure(1); set(clf,'PaperType','A4'); set(clf,'Color',[1,1,1]); diff --git a/OOequipment/subfiles/FunctionGenerator.m b/OOequipment/subfiles/FunctionGenerator.m index 9f77c7c..d17bfa2 100644 --- a/OOequipment/subfiles/FunctionGenerator.m +++ b/OOequipment/subfiles/FunctionGenerator.m @@ -1,5 +1,5 @@ classdef FunctionGenerator < Equipment -%% FUNCTION_GENERATOR Control a function generator. +% FUNCTION_GENERATOR Control a function generator. % fg = FUNCTION_GENERATOR('IP', PORT, GPIB_CHAN) connects % to a function generator on IPv4 address 'IP', on port % 'PORT' and GPIO channel 'GPIB_CHAN', using the Equipment @@ -20,7 +20,7 @@ classdef FunctionGenerator < Equipment methods function fg = FunctionGenerator(ipAddress,port,channel) - %% FUNCTION_GENERATOR Control a function generator. + % FUNCTION_GENERATOR Control a function generator. % fg = FUNCTION_GENERATOR('IP', PORT, GPIB_CHAN) connects % to a function generator on IPv4 address 'IP', on port % 'PORT' and GPIO channel 'GPIB_CHAN', using the Equipment