Filter Wizard: fix auto-calculation of HB rates for mismatched BBPLLs

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

Author: Tim Harder

AD9361_Filter_Wizard/AD9361_Filter_Wizard.m

@@ -185,18 +185,63 @@ function AD9361_Filter_Wizard_OpeningFcn(hObject, eventdata, handles, varargin)
 % sanity check the DAC divider value and alter it if necessary, note that if
 % it's altered then the PLL and calibration dividers must be updated as well
 if isfield(handles, 'input_tx') && isfield(handles, 'input_rx')
-    ADC_rate = handles.input_rx.Rdata * handles.input_rx.FIR * ...
-        handles.input_rx.HB1 * handles.input_rx.HB2 * handles.input_rx.HB3;
-    DAC_rate = handles.input_tx.Rdata * handles.input_tx.FIR * ...
-        handles.input_tx.HB1 * handles.input_tx.HB2 * handles.input_tx.HB3;
-    DAC_div = ADC_rate / DAC_rate;
-    if ~(handles.input_tx.DAC_div == DAC_div)
-        handles.input_tx.DAC_div = DAC_div;
+    if (handles.input_rx.PLL_rate ~= handles.input_tx.PLL_rate)
+        rhb1 = handles.input_tx.HB1;
+        rhb2 = handles.input_tx.HB2;
+        if handles.input_tx.HB3 == 3
+            rhb3 = 3;
+        elseif handles.input_tx.HB3 == 2
+            rhb3 = 2;
+        else
+            rhb3 = 1;
+        end
+        handles.input_rx.HB1 = rhb1;
+        handles.input_rx.HB2 = rhb2;
+        handles.input_rx.HB3 = rhb3;
+
+        ADC_rate = handles.input_rx.Rdata * handles.input_rx.FIR * ...
+            handles.input_rx.HB1 * handles.input_rx.HB2 * handles.input_rx.HB3;
+        DAC_rate = handles.input_tx.Rdata * handles.input_tx.FIR * ...
+            handles.input_tx.HB1 * handles.input_tx.HB2 * handles.input_tx.HB3;
+        DAC_div = ADC_rate / DAC_rate;
+        if ~(handles.input_tx.DAC_div == DAC_div)
+            if (DAC_div == 1 || DAC_div == 2)
+                handles.input_tx.DAC_div = DAC_div;
+                handles.input_tx.PLL_mult = handles.input_rx.PLL_mult;
+                filter_type = get(handles.filter_type, 'Value');
+                set(handles.filter_type, 'Value', 0);
+                handles.input_tx.caldiv = default_caldiv(handles);
+                set(handles.filter_type, 'Value', filter_type);
+            end
+        end
+
+        handles.input_rx.PLL_mult = fastest_FIR([64 32 16 8 4 2 1], handles.MAX_BBPLL_FREQ, handles.MIN_BBPLL_FREQ, ...
+            handles.input_rx.Rdata * handles.input_rx.FIR * handles.input_rx.HB1 * handles.input_rx.HB2 * handles.input_rx.HB3 * handles.input_rx.DAC_div);
         handles.input_tx.PLL_mult = handles.input_rx.PLL_mult;
-        filter_type = get(handles.filter_type, 'Value');
-        set(handles.filter_type, 'Value', 0);
-        handles.input_tx.caldiv = default_caldiv(handles);
-        set(handles.filter_type, 'Value', filter_type);
+
+        if handles.input_rx.PLL_mult > 64
+            X = ['Date rate = ', num2str(tohwTx.TXSAMP), ' Hz. Tx BBPLL is too high for Rx to match.'];
+            disp(X);
+        end
+
+        handles.input_rx.PLL_rate = handles.input_rx.Rdata * handles.input_rx.FIR * handles.input_rx.HB1 * ...
+            handles.input_rx.HB2 * handles.input_rx.HB3 * handles.input_rx.PLL_mult;
+    else
+        ADC_rate = handles.input_rx.Rdata * handles.input_rx.FIR * ...
+            handles.input_rx.HB1 * handles.input_rx.HB2 * handles.input_rx.HB3;
+        DAC_rate = handles.input_tx.Rdata * handles.input_tx.FIR * ...
+            handles.input_tx.HB1 * handles.input_tx.HB2 * handles.input_tx.HB3;
+        DAC_div = ADC_rate / DAC_rate;
+        if ~(handles.input_tx.DAC_div == DAC_div)
+            if (DAC_div == 1 || DAC_div == 2)
+                handles.input_tx.DAC_div = DAC_div;
+                handles.input_tx.PLL_mult = handles.input_rx.PLL_mult;
+                filter_type = get(handles.filter_type, 'Value');
+                set(handles.filter_type, 'Value', 0);
+                handles.input_tx.caldiv = default_caldiv(handles);
+                set(handles.filter_type, 'Value', filter_type);
+            end
+        end
     end
 end
 

AD9361_Filter_Wizard/cook_input.m

@@ -205,14 +205,6 @@
 
 cooked = input;
 
-function rate = fastest_FIR(rates, max, min, mult)
-for i = 1:length(rates)
-    if max >= mult * rates(i) && min <= mult * rates(i)
-        break;
-    end
-end
-rate = rates(i);
-
 function caldiv = default_caldiv(input)
 if strcmp(input.RxTx, 'Rx')
     wnom = 1.4 * input.Fstop; % Rx

AD9361_Filter_Wizard/fastest_FIR.m

@@ -0,0 +1,41 @@
+%  Copyright 2015(c) Analog Devices, Inc.
+%
+%  All rights reserved.
+%
+%  Redistribution and use in source and binary forms, with or without modification,
+%  are permitted provided that the following conditions are met:
+%      - Redistributions of source code must retain the above copyright
+%        notice, this list of conditions and the following disclaimer.
+%      - Redistributions in binary form must reproduce the above copyright
+%        notice, this list of conditions and the following disclaimer in
+%        the documentation and/or other materials provided with the
+%        distribution.
+%      - Neither the name of Analog Devices, Inc. nor the names of its
+%        contributors may be used to endorse or promote products derived
+%        from this software without specific prior written permission.
+%      - The use of this software may or may not infringe the patent rights
+%        of one or more patent holders.  This license does not release you
+%        from the requirement that you obtain separate licenses from these
+%        patent holders to use this software.
+%      - Use of the software either in source or binary form or filter designs
+%        resulting from the use of this software, must be connected to, run
+%        on or loaded to an Analog Devices Inc. component.
+%
+%  THIS SOFTWARE IS PROVIDED BY ANALOG DEVICES "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
+%  INCLUDING, BUT NOT LIMITED TO, NON-INFRINGEMENT, MERCHANTABILITY AND FITNESS FOR A
+%  PARTICULAR PURPOSE ARE DISCLAIMED.
+%
+%  IN NO EVENT SHALL ANALOG DEVICES BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+%  EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, INTELLECTUAL PROPERTY
+%  RIGHTS, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+%  BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+%  STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
+%  THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+function rate = fastest_FIR(rates, max, min, mult)
+for i = 1:length(rates)
+    if max >= mult * rates(i) && min <= mult * rates(i)
+        break;
+    end
+end
+rate = rates(i);