graphes added

signal/matlab/ScriptDFT.m

@@ -2,15 +2,17 @@ clc;
 clear all;
 close all;
 
-F1 = 85000;
+
-% F1 = 85005.9;
+F1 = 85005.9;
-F2 = 90000;
-%F3 = 95000;
 F3 = 94986.8;
-F4 = 100000;
-%F5 = 115000;
 F5 = 115015.9;
+F4 = 100000;
+F2 = 90000;
 F6 = 120000;
+% 
+% F1 = 85000;
+% F5 = 115000;
+% F3 = 95000;
 
 ChebFac0 = 1;
 ChebFac1 = 3.0332e-6;
@@ -39,7 +41,7 @@ res=sim('Simul6PistoletsDFT.slx');
 
 
 
-%plot(res.Echant.Data);
+plot(res.Continu.Data);
 
 F=linspace(0, Fe-Fe/M, M);
 % mauvais_echantillon = res.Echant.Data; 
@@ -53,26 +55,30 @@ F=linspace(0, Fe-Fe/M, M);
 % fourier = abs(fft(filteredSignal)/M);
 
 
-fourier=abs(fft(res.Echant.Data)/M);
+% fourier=abs(fft(res.Echant.Data)/M);
 
 %res=sim('SimulDFT.slx');
 %fourier=fft(res.Sinus_Echantillon.Data)/M;
 %fourier = real(fourier * (1i));
+
+% figure(1)
+% bode(tf(1,[ChebFac4, ChebFac3, ChebFac2, ChebFac1, ChebFac0]));
+% figure(2)
 % bode(tf(F,arrayfun(@(x) chebychev(x), F)));
 
 % grid;
 % stem(F, fourier, 'o');
 % set(gca, 'YScale', 'log');
-plot(res.Echant);
+% plot(res.Echant);
 %plot(res.Sinus_Continu); 
 %hold on; % permet de superposer la courbe à suivre
 % plot(res.Sinus_Echantillon,'o');
-
+% 
-function filtre = chebychev(p)
+% function filtre = chebychev(p)
-    ChebFac0 = 1;
+%     ChebFac0 = 1;
-    ChebFac1 = 3.0332e-6;
+%     ChebFac1 = 3.0332e-6;
-    ChebFac2 = 1.162e-11;
+%     ChebFac2 = 1.162e-11;
-    ChebFac3 = 7.6663e-18;
+%     ChebFac3 = 7.6663e-18;
-    ChebFac4 = 1.7483e-23;
+%     ChebFac4 = 1.7483e-23;
-    filtre = 1 / (ChebFac4 * p^4 + ChebFac3 * p^3 + ChebFac2 * p^2 + ChebFac1 * p + ChebFac0);
+%     filtre = 1 / (ChebFac4 * p^4 + ChebFac3 * p^3 + ChebFac2 * p^2 + ChebFac1 * p + ChebFac0);
-end
+% end

signal/matlab/slprj/sim/varcache/Simul6PistoletsDFT/tmwinternal/simulink_cache.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <MF0 version="1.1" packageUris="http://schema.mathworks.com/mf0/SlCache/19700101">
-  <slcache.FileAttributes type="slcache.FileAttributes" uuid="ff96ea0b-c4c1-4804-8a4c-c2928fa73624">
+  <slcache.FileAttributes type="slcache.FileAttributes" uuid="f5752a9c-8252-41c4-ba42-26d70cc914e8">
-    <checksum>pmTiLxkS7fwMuApKXllVww==</checksum>
+    <checksum>Jm7etaswd1ggbl3Ygswmbg==</checksum>
   </slcache.FileAttributes>
 </MF0>