Filter Wizard: pass caldiv from Filter Wizard to design functions

Signed-off-by: Tim Harder <timothy.harder@analog.com>

Author: Tim Harder

AD9361_Filter_Wizard/AD9361_Filter_Wizard.m

@@ -957,6 +957,7 @@ function create_filter(hObject, handles)
 filter_input.PLL_mult = sel.PLL_mult;
 filter_input.phEQ = sel.phEQ;
 filter_input.wnom = value2Hz(handles, handles.freq_units, str2double(get(handles.Fcutoff, 'String')));
+filter_input.caldiv = caldiv;
 filter_input.int_FIR = get(handles.Use_FIR, 'Value');
 filter_input.RFbw = RFbw;
 filter_input.converter_rate = converter_rate;
@@ -2812,7 +2813,6 @@ function Fcenter_CreateFcn(hObject, eventdata, handles)
     set(hObject,'BackgroundColor','white');
 end
 
-
 % --- Executes during object creation, after setting all properties.
 function results_Apass_CreateFcn(hObject, eventdata, handles)
 % hObject    handle to results_Apass (see GCBO)

AD9361_Filter_Wizard/internal_designrxfilters9361_default.m

@@ -49,6 +49,7 @@
 FIR_decim = a.FIR;
 HB_decim = a.HB1*a.HB2*a.HB3;
 PLL_multr = a.PLL_mult;
+caldiv = a.caldiv;
 
 Fadc = Fout * FIR_decim * HB_decim;
 clkPLL = Fadc * PLL_multr;
@@ -64,9 +65,6 @@
 
 % Define the analog filters
 if ~wnom
-    wnom = 1.4*Fpass;
-    div = ceil((clkPLL/wnom)*(log(2)/(2*pi)));
-    caldiv = min(max(div,3),511);
     wc = (clkPLL/caldiv)*(log(2)/(2*pi));
 else
     wc = wnom;
@@ -376,4 +374,4 @@
 tohwrx.CoefficientSize = length(h);
 tohwrx.Decimation = FIR_decim;
 tohwrx.Gain = gain;
-tohwrx.RFBandwidth = round(Fpass*2);
+tohwrx.RFBandwidth = round(Fpass*2);

AD9361_Filter_Wizard/internal_designrxfilters9361_sinc.m

@@ -61,10 +61,7 @@
 function result = internal_designrxfilters9361_sinc(input)
 
 if ~input.wnom
-    input.wnom = 1.4 * input.Fpass;
-    div = ceil((input.clkPLL/input.wnom)*(log(2)/(2*pi)));
-    caldiv = min(max(div,3),511);
-    wc = (input.clkPLL/caldiv)*(log(2)/(2*pi));
+    wc = (input.clkPLL/input.caldiv)*(log(2)/(2*pi));
 else
     wc = input.wnom;
 end

AD9361_Filter_Wizard/internal_designtxfilters9361_default.m

@@ -51,6 +51,7 @@
 HB_interp = a.HB1*a.HB2*a.HB3;
 DAC_mult = a.DAC_div;
 PLL_mult = a.PLL_mult;
+caldiv = a.caldiv;
 
 Fdac = Fin * FIR_interp * HB_interp;
 clkPLL = Fdac * DAC_mult * PLL_mult;
@@ -66,9 +67,6 @@
 
 % Define the analog filters
 if ~wnom
-    wnom = 1.6*Fpass;
-    div = ceil((clkPLL/wnom)*(log(2)/(2*pi)));
-    caldiv = min(max(div,3),511);
     wc = (clkPLL/caldiv)*(log(2)/(2*pi));
 else
     wc = wnom;
@@ -408,4 +406,4 @@
 tohwtx.CoefficientSize = length(h);
 tohwtx.Interp = FIR_interp;
 tohwtx.Gain = gain;
-tohwtx.RFBandwidth = round(Fpass*2);
+tohwtx.RFBandwidth = round(Fpass*2);

AD9361_Filter_Wizard/internal_designtxfilters9361_sinc.m

@@ -62,10 +62,7 @@
 function result = internal_designtxfilters9361_sinc(input)
 
 if ~input.wnom
-    input.wnom = 1.6*input.Fpass;
-    div = ceil((input.clkPLL/input.wnom)*(log(2)/(2*pi)));
-    caldiv = min(max(div,3),511);
-    wc = (input.clkPLL/caldiv)*(log(2)/(2*pi));
+    wc = (input.clkPLL/input.caldiv)*(log(2)/(2*pi));
 else
     wc = input.wnom;
 end