Export device, remove Daq and Curvefit toolbox dependencies

git-svn-id: http://svn.parisson.org/svn/CNAQ/trunk@118 5fc3e0e6-29bc-4d03-b52b-c088cb822bde

diff --git a/CNAQ.m b/CNAQ.m
index 7d69eaf59a386964ed1cf708685245335f8e1357..a452f3f703d3aa8b68744dd3411b9b4c9546e740 100644 (file)
--- a/CNAQ.m
+++ b/CNAQ.m
@@ -123,6 +123,9 @@ root_dir = 'E:\CNAQ';
 home_dir = uigetdir(root_dir, 'Choisissez votre dossier de travail');\r
 set(handles.home_dir_box,'String',home_dir);\r
 \r
+% Audio device number\r
+device = 0;\r
+\r
 % Get tools\r
 %cnaq_path = pwd;\r
 cnaq_path = root_dir;\r
@@ -170,7 +173,7 @@ set(handles.sig_type,'String','Sinus|Chirp');
 set(handles.voices_in,'String','1|1 2|1 2 3|1 2 3 4');\r
 set(handles.voices_out,'String','1|1 2|1 2 3|1 2 3 4');\r
 \r
-buffer = 2048;\r
+buffer = 4096;\r
 os_sep = '\';\r
 \r
 % ==============================================================\r
@@ -291,8 +294,8 @@ function get_home_dir_Callback(hObject, eventdata, handles)
 % MONITOR\r
 %============================================\r
     \r
-function in_on_off_Callback(hObject, eventdata, handles)\r
-    device = 0;\r
+function in_on_off_Callback(hObject, eventdata, handles, device)\r
+    %device = 0;\r
     buffer = 4096;\r
     window = hanning(buffer);\r
     f_s = get_fs(handles);\r
@@ -483,23 +486,25 @@ function gen_on_off_Callback(hObject, eventdata, handles)
         sig_out(:,i) = sig';\r
     end\r
     \r
-    % Matlab way...\r
-    ao = analogoutput('winsound', 0);\r
-    addchannel(ao, voices_out);\r
-    set(ao, 'StandardSampleRates', 'Off');\r
-    set(ao, 'SampleRate', f_s);\r
-    \r
-    if get(handles.gen_on_off,'Value') == 1\r
-        putdata(ao, sig_out);\r
-        start(ao);\r
-        set(handles.gen_on_off,'Value',0);\r
-    end\r
-    \r
-    %delete(ao);\r
+    % Matlab way (needs Data Acquisition Toolbox)\r
+%      ao = analogoutput('winsound', 0);\r
+%      addchannel(ao, voices_out);\r
+%      set(ao, 'StandardSampleRates', 'Off');\r
+%      set(ao, 'SampleRate', f_s);\r
+%      \r
+%      if get(handles.gen_on_off,'Value') == 1\r
+%          putdata(ao, sig_out);\r
+%          start(ao);\r
+%          set(handles.gen_on_off,'Value',0);\r
+%      end\r
+%      %delete(ao);\r
 \r
     % PA way but can't work with monitor !...\r
     % pa_wavplay(sig_out',f_s,0,'asio');\r
 \r
+    % Winsoud way...\r
+    sound(sig_out',f_s);\r
+\r
 \r
 %============================================\r
 % MESURE\r
@@ -512,8 +517,8 @@ function mes_type_CreateFcn(hObject, eventdata, handles)
         set(hObject,'BackgroundColor','white');\r
     end\r
 \r
-function mes_on_Callback(hObject, eventdata, handles)\r
-    device = 0;\r
+function mes_on_Callback(hObject, eventdata, handles, device)\r
+    %device = 0;\r
     nfft = 16384;\r
     f_min = str2double(get(handles.f_gen_min,'String'));\r
     f_max = str2double(get(handles.f_gen_max,'String'));\r

diff --git a/tools/plot_mes.m b/tools/plot_mes.m
index bd1d2f0e2b31be9d60c33a87d96af58050937b64..a71aff164806513fb544f2017d550041455faa12 100644 (file)
--- a/tools/plot_mes.m
+++ b/tools/plot_mes.m
@@ -39,7 +39,7 @@ f_min_ind = f_min_list(length(f_min_list));
 figure;\r
 subplot(2,1,1);\r
 spec_mes_log = 10*log10(abs(spec_mes));\r
-semilogx(f, smooth(spec_mes_log,7));\r
+semilogx(f, spec_mes_log);\r
 axis([f_min f_max min(spec_mes_log(f_min_ind:f_max_ind-1000))-6 max(spec_mes_log(f_min_ind:f_max_ind))+6]);\r
 xlabel('Fréquence (Hz)');\r
 ylabel('Amplitude (dB)');\r
@@ -50,7 +50,7 @@ subplot(2,1,2);
 angle_exc = angle(spec_exc);\r
 angle_mes = angle(spec_mes);\r
 ang = unwrap(angle_mes - angle_exc) + 2*pi;\r
-semilogx(f, smooth(ang,7));\r
+semilogx(f, ang);\r
 axis([f_min f_max min(ang(f_min_ind:f_max_ind)) max(ang(f_min_ind:f_max_ind))]);\r
 grid on;\r
 xlabel('Fréquence (Hz)');\r