From 71f366bcaccdc579a4c46e18ab48b55dedce0634 Mon Sep 17 00:00:00 2001
From: mer0m <baptiste.marechal@femto-st.fr>
Date: Sat, 18 Mar 2017 11:56:54 +0100
Subject: [PATCH] rational resampler use a 0.8fs lpf when taps=None

---
 sdr/fm_radio/fm_radio_comp_decim_lpf.grc | 28 ++++++++++++++--------------
 sdr/fm_radio/fm_radio_comp_decim_lpf.py  | 22 +++++++++++-----------
 2 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/sdr/fm_radio/fm_radio_comp_decim_lpf.grc b/sdr/fm_radio/fm_radio_comp_decim_lpf.grc
index 85bdb26..82a0830 100644
--- a/sdr/fm_radio/fm_radio_comp_decim_lpf.grc
+++ b/sdr/fm_radio/fm_radio_comp_decim_lpf.grc
@@ -289,7 +289,7 @@
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(1104, 192)</value>
+      <value>(1104, 728)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -332,7 +332,7 @@
     </param>
     <param>
       <key>cutoff_freq</key>
-      <value>100e3</value>
+      <value>samp_rate*10/4</value>
     </param>
     <param>
       <key>decim</key>
@@ -407,7 +407,7 @@
     </param>
     <param>
       <key>cutoff_freq</key>
-      <value>96e3</value>
+      <value>samp_rate</value>
     </param>
     <param>
       <key>decim</key>
@@ -1409,7 +1409,7 @@
     </param>
     <param>
       <key>taps</key>
-      <value></value>
+      <value>1</value>
     </param>
     <param>
       <key>type</key>
@@ -1468,7 +1468,7 @@
     </param>
     <param>
       <key>taps</key>
-      <value></value>
+      <value>1</value>
     </param>
     <param>
       <key>type</key>
@@ -1487,7 +1487,7 @@
     </param>
     <param>
       <key>bb_gain0</key>
-      <value>20</value>
+      <value>30</value>
     </param>
     <param>
       <key>bw0</key>
@@ -1511,7 +1511,7 @@
     </param>
     <param>
       <key>if_gain0</key>
-      <value>20</value>
+      <value>30</value>
     </param>
     <param>
       <key>iq_balance_mode0</key>
@@ -1519,7 +1519,7 @@
     </param>
     <param>
       <key>gain0</key>
-      <value>20</value>
+      <value>30</value>
     </param>
     <param>
       <key>ant10</key>
@@ -2914,19 +2914,19 @@
   </connection>
   <connection>
     <source_block_id>low_pass_filter_0_0</source_block_id>
-    <sink_block_id>qtgui_freq_sink_x_0</sink_block_id>
+    <sink_block_id>audio_sink_0</sink_block_id>
     <source_key>0</source_key>
-    <sink_key>1</sink_key>
+    <sink_key>0</sink_key>
   </connection>
   <connection>
     <source_block_id>low_pass_filter_0_0</source_block_id>
-    <sink_block_id>qtgui_sink_x_1_0</sink_block_id>
+    <sink_block_id>qtgui_freq_sink_x_0</sink_block_id>
     <source_key>0</source_key>
-    <sink_key>0</sink_key>
+    <sink_key>1</sink_key>
   </connection>
   <connection>
-    <source_block_id>rational_resampler_xxx_0</source_block_id>
-    <sink_block_id>audio_sink_0</sink_block_id>
+    <source_block_id>low_pass_filter_0_0</source_block_id>
+    <sink_block_id>qtgui_sink_x_1_0</sink_block_id>
     <source_key>0</source_key>
     <sink_key>0</sink_key>
   </connection>
diff --git a/sdr/fm_radio/fm_radio_comp_decim_lpf.py b/sdr/fm_radio/fm_radio_comp_decim_lpf.py
index 3cfdcff..e8ccdb5 100755
--- a/sdr/fm_radio/fm_radio_comp_decim_lpf.py
+++ b/sdr/fm_radio/fm_radio_comp_decim_lpf.py
@@ -3,7 +3,7 @@
 ##################################################
 # GNU Radio Python Flow Graph
 # Title: Fm Radio Comp Decim Lpf
-# Generated: Sat Mar 18 10:30:17 2017
+# Generated: Sat Mar 18 11:55:19 2017
 ##################################################
 
 if __name__ == '__main__':
@@ -77,22 +77,22 @@ class fm_radio_comp_decim_lpf(gr.top_block, Qt.QWidget):
         self.rtlsdr_source_0.set_dc_offset_mode(0, 0)
         self.rtlsdr_source_0.set_iq_balance_mode(0, 0)
         self.rtlsdr_source_0.set_gain_mode(False, 0)
-        self.rtlsdr_source_0.set_gain(20, 0)
-        self.rtlsdr_source_0.set_if_gain(20, 0)
-        self.rtlsdr_source_0.set_bb_gain(20, 0)
+        self.rtlsdr_source_0.set_gain(30, 0)
+        self.rtlsdr_source_0.set_if_gain(30, 0)
+        self.rtlsdr_source_0.set_bb_gain(30, 0)
         self.rtlsdr_source_0.set_antenna('', 0)
         self.rtlsdr_source_0.set_bandwidth(0, 0)
           
         self.rational_resampler_xxx_0_0 = filter.rational_resampler_ccc(
                 interpolation=1,
                 decimation=4,
-                taps=None,
+                taps=(1, ),
                 fractional_bw=None,
         )
         self.rational_resampler_xxx_0 = filter.rational_resampler_fff(
                 interpolation=1,
                 decimation=10,
-                taps=None,
+                taps=(1, ),
                 fractional_bw=None,
         )
         self.qtgui_freq_sink_x_0_0 = qtgui.freq_sink_f(
@@ -182,9 +182,9 @@ class fm_radio_comp_decim_lpf(gr.top_block, Qt.QWidget):
         self._qtgui_freq_sink_x_0_win = sip.wrapinstance(self.qtgui_freq_sink_x_0.pyqwidget(), Qt.QWidget)
         self.top_grid_layout.addWidget(self._qtgui_freq_sink_x_0_win, 13,0)
         self.low_pass_filter_0_0 = filter.fir_filter_fff(10, firdes.low_pass(
-        	1, samp_rate*10, 96e3, 1e3, firdes.WIN_HAMMING, 6.76))
+        	1, samp_rate*10, samp_rate, 1e3, firdes.WIN_HAMMING, 6.76))
         self.low_pass_filter_0 = filter.fir_filter_ccf(4, firdes.low_pass(
-        	1, samp_rate*10*4, 100e3, 1e3, firdes.WIN_HAMMING, 6.76))
+        	1, samp_rate*10*4, samp_rate*10/4, 1e3, firdes.WIN_HAMMING, 6.76))
         self.audio_sink_0 = audio.sink(int(samp_rate), '', True)
         self.analog_wfm_rcv_0_0 = analog.wfm_rcv(
         	quad_rate=samp_rate*10,
@@ -203,8 +203,8 @@ class fm_radio_comp_decim_lpf(gr.top_block, Qt.QWidget):
         self.connect((self.analog_wfm_rcv_0_0, 0), (self.low_pass_filter_0_0, 0))    
         self.connect((self.analog_wfm_rcv_0_0, 0), (self.qtgui_freq_sink_x_0_0, 1))    
         self.connect((self.low_pass_filter_0, 0), (self.analog_wfm_rcv_0_0, 0))    
+        self.connect((self.low_pass_filter_0_0, 0), (self.audio_sink_0, 0))    
         self.connect((self.low_pass_filter_0_0, 0), (self.qtgui_freq_sink_x_0, 1))    
-        self.connect((self.rational_resampler_xxx_0, 0), (self.audio_sink_0, 0))    
         self.connect((self.rational_resampler_xxx_0, 0), (self.qtgui_freq_sink_x_0, 0))    
         self.connect((self.rational_resampler_xxx_0_0, 0), (self.analog_wfm_rcv_0, 0))    
         self.connect((self.rtlsdr_source_0, 0), (self.low_pass_filter_0, 0))    
@@ -223,8 +223,8 @@ class fm_radio_comp_decim_lpf(gr.top_block, Qt.QWidget):
         self.rtlsdr_source_0.set_sample_rate(self.samp_rate*10*4)
         self.qtgui_freq_sink_x_0_0.set_frequency_range(0, self.samp_rate*10)
         self.qtgui_freq_sink_x_0.set_frequency_range(0, self.samp_rate)
-        self.low_pass_filter_0_0.set_taps(firdes.low_pass(1, self.samp_rate*10, 96e3, 1e3, firdes.WIN_HAMMING, 6.76))
-        self.low_pass_filter_0.set_taps(firdes.low_pass(1, self.samp_rate*10*4, 100e3, 1e3, firdes.WIN_HAMMING, 6.76))
+        self.low_pass_filter_0_0.set_taps(firdes.low_pass(1, self.samp_rate*10, self.samp_rate, 1e3, firdes.WIN_HAMMING, 6.76))
+        self.low_pass_filter_0.set_taps(firdes.low_pass(1, self.samp_rate*10*4, self.samp_rate*10/4, 1e3, firdes.WIN_HAMMING, 6.76))
 
     def get_freq(self):
         return self.freq
-- 
2.16.4