Commit 71f366bcaccdc579a4c46e18ab48b55dedce0634
1 parent
c96248899b
Exists in
master
rational resampler use a 0.8fs lpf when taps=None
Showing 2 changed files with 25 additions and 25 deletions Side-by-side Diff
sdr/fm_radio/fm_radio_comp_decim_lpf.grc
... | ... | @@ -289,7 +289,7 @@ |
289 | 289 | </param> |
290 | 290 | <param> |
291 | 291 | <key>_coordinate</key> |
292 | - <value>(1104, 192)</value> | |
292 | + <value>(1104, 728)</value> | |
293 | 293 | </param> |
294 | 294 | <param> |
295 | 295 | <key>_rotation</key> |
... | ... | @@ -332,7 +332,7 @@ |
332 | 332 | </param> |
333 | 333 | <param> |
334 | 334 | <key>cutoff_freq</key> |
335 | - <value>100e3</value> | |
335 | + <value>samp_rate*10/4</value> | |
336 | 336 | </param> |
337 | 337 | <param> |
338 | 338 | <key>decim</key> |
... | ... | @@ -407,7 +407,7 @@ |
407 | 407 | </param> |
408 | 408 | <param> |
409 | 409 | <key>cutoff_freq</key> |
410 | - <value>96e3</value> | |
410 | + <value>samp_rate</value> | |
411 | 411 | </param> |
412 | 412 | <param> |
413 | 413 | <key>decim</key> |
... | ... | @@ -1409,7 +1409,7 @@ |
1409 | 1409 | </param> |
1410 | 1410 | <param> |
1411 | 1411 | <key>taps</key> |
1412 | - <value></value> | |
1412 | + <value>1</value> | |
1413 | 1413 | </param> |
1414 | 1414 | <param> |
1415 | 1415 | <key>type</key> |
... | ... | @@ -1468,7 +1468,7 @@ |
1468 | 1468 | </param> |
1469 | 1469 | <param> |
1470 | 1470 | <key>taps</key> |
1471 | - <value></value> | |
1471 | + <value>1</value> | |
1472 | 1472 | </param> |
1473 | 1473 | <param> |
1474 | 1474 | <key>type</key> |
... | ... | @@ -1487,7 +1487,7 @@ |
1487 | 1487 | </param> |
1488 | 1488 | <param> |
1489 | 1489 | <key>bb_gain0</key> |
1490 | - <value>20</value> | |
1490 | + <value>30</value> | |
1491 | 1491 | </param> |
1492 | 1492 | <param> |
1493 | 1493 | <key>bw0</key> |
... | ... | @@ -1511,7 +1511,7 @@ |
1511 | 1511 | </param> |
1512 | 1512 | <param> |
1513 | 1513 | <key>if_gain0</key> |
1514 | - <value>20</value> | |
1514 | + <value>30</value> | |
1515 | 1515 | </param> |
1516 | 1516 | <param> |
1517 | 1517 | <key>iq_balance_mode0</key> |
... | ... | @@ -1519,7 +1519,7 @@ |
1519 | 1519 | </param> |
1520 | 1520 | <param> |
1521 | 1521 | <key>gain0</key> |
1522 | - <value>20</value> | |
1522 | + <value>30</value> | |
1523 | 1523 | </param> |
1524 | 1524 | <param> |
1525 | 1525 | <key>ant10</key> |
1526 | 1526 | |
1527 | 1527 | |
1528 | 1528 | |
1529 | 1529 | |
... | ... | @@ -2914,19 +2914,19 @@ |
2914 | 2914 | </connection> |
2915 | 2915 | <connection> |
2916 | 2916 | <source_block_id>low_pass_filter_0_0</source_block_id> |
2917 | - <sink_block_id>qtgui_freq_sink_x_0</sink_block_id> | |
2917 | + <sink_block_id>audio_sink_0</sink_block_id> | |
2918 | 2918 | <source_key>0</source_key> |
2919 | - <sink_key>1</sink_key> | |
2919 | + <sink_key>0</sink_key> | |
2920 | 2920 | </connection> |
2921 | 2921 | <connection> |
2922 | 2922 | <source_block_id>low_pass_filter_0_0</source_block_id> |
2923 | - <sink_block_id>qtgui_sink_x_1_0</sink_block_id> | |
2923 | + <sink_block_id>qtgui_freq_sink_x_0</sink_block_id> | |
2924 | 2924 | <source_key>0</source_key> |
2925 | - <sink_key>0</sink_key> | |
2925 | + <sink_key>1</sink_key> | |
2926 | 2926 | </connection> |
2927 | 2927 | <connection> |
2928 | - <source_block_id>rational_resampler_xxx_0</source_block_id> | |
2929 | - <sink_block_id>audio_sink_0</sink_block_id> | |
2928 | + <source_block_id>low_pass_filter_0_0</source_block_id> | |
2929 | + <sink_block_id>qtgui_sink_x_1_0</sink_block_id> | |
2930 | 2930 | <source_key>0</source_key> |
2931 | 2931 | <sink_key>0</sink_key> |
2932 | 2932 | </connection> |
sdr/fm_radio/fm_radio_comp_decim_lpf.py
... | ... | @@ -3,7 +3,7 @@ |
3 | 3 | ################################################## |
4 | 4 | # GNU Radio Python Flow Graph |
5 | 5 | # Title: Fm Radio Comp Decim Lpf |
6 | -# Generated: Sat Mar 18 10:30:17 2017 | |
6 | +# Generated: Sat Mar 18 11:55:19 2017 | |
7 | 7 | ################################################## |
8 | 8 | |
9 | 9 | if __name__ == '__main__': |
10 | 10 | |
11 | 11 | |
... | ... | @@ -77,22 +77,22 @@ |
77 | 77 | self.rtlsdr_source_0.set_dc_offset_mode(0, 0) |
78 | 78 | self.rtlsdr_source_0.set_iq_balance_mode(0, 0) |
79 | 79 | self.rtlsdr_source_0.set_gain_mode(False, 0) |
80 | - self.rtlsdr_source_0.set_gain(20, 0) | |
81 | - self.rtlsdr_source_0.set_if_gain(20, 0) | |
82 | - self.rtlsdr_source_0.set_bb_gain(20, 0) | |
80 | + self.rtlsdr_source_0.set_gain(30, 0) | |
81 | + self.rtlsdr_source_0.set_if_gain(30, 0) | |
82 | + self.rtlsdr_source_0.set_bb_gain(30, 0) | |
83 | 83 | self.rtlsdr_source_0.set_antenna('', 0) |
84 | 84 | self.rtlsdr_source_0.set_bandwidth(0, 0) |
85 | 85 | |
86 | 86 | self.rational_resampler_xxx_0_0 = filter.rational_resampler_ccc( |
87 | 87 | interpolation=1, |
88 | 88 | decimation=4, |
89 | - taps=None, | |
89 | + taps=(1, ), | |
90 | 90 | fractional_bw=None, |
91 | 91 | ) |
92 | 92 | self.rational_resampler_xxx_0 = filter.rational_resampler_fff( |
93 | 93 | interpolation=1, |
94 | 94 | decimation=10, |
95 | - taps=None, | |
95 | + taps=(1, ), | |
96 | 96 | fractional_bw=None, |
97 | 97 | ) |
98 | 98 | self.qtgui_freq_sink_x_0_0 = qtgui.freq_sink_f( |
99 | 99 | |
... | ... | @@ -182,9 +182,9 @@ |
182 | 182 | self._qtgui_freq_sink_x_0_win = sip.wrapinstance(self.qtgui_freq_sink_x_0.pyqwidget(), Qt.QWidget) |
183 | 183 | self.top_grid_layout.addWidget(self._qtgui_freq_sink_x_0_win, 13,0) |
184 | 184 | self.low_pass_filter_0_0 = filter.fir_filter_fff(10, firdes.low_pass( |
185 | - 1, samp_rate*10, 96e3, 1e3, firdes.WIN_HAMMING, 6.76)) | |
185 | + 1, samp_rate*10, samp_rate, 1e3, firdes.WIN_HAMMING, 6.76)) | |
186 | 186 | self.low_pass_filter_0 = filter.fir_filter_ccf(4, firdes.low_pass( |
187 | - 1, samp_rate*10*4, 100e3, 1e3, firdes.WIN_HAMMING, 6.76)) | |
187 | + 1, samp_rate*10*4, samp_rate*10/4, 1e3, firdes.WIN_HAMMING, 6.76)) | |
188 | 188 | self.audio_sink_0 = audio.sink(int(samp_rate), '', True) |
189 | 189 | self.analog_wfm_rcv_0_0 = analog.wfm_rcv( |
190 | 190 | quad_rate=samp_rate*10, |
191 | 191 | |
... | ... | @@ -203,8 +203,8 @@ |
203 | 203 | self.connect((self.analog_wfm_rcv_0_0, 0), (self.low_pass_filter_0_0, 0)) |
204 | 204 | self.connect((self.analog_wfm_rcv_0_0, 0), (self.qtgui_freq_sink_x_0_0, 1)) |
205 | 205 | self.connect((self.low_pass_filter_0, 0), (self.analog_wfm_rcv_0_0, 0)) |
206 | + self.connect((self.low_pass_filter_0_0, 0), (self.audio_sink_0, 0)) | |
206 | 207 | self.connect((self.low_pass_filter_0_0, 0), (self.qtgui_freq_sink_x_0, 1)) |
207 | - self.connect((self.rational_resampler_xxx_0, 0), (self.audio_sink_0, 0)) | |
208 | 208 | self.connect((self.rational_resampler_xxx_0, 0), (self.qtgui_freq_sink_x_0, 0)) |
209 | 209 | self.connect((self.rational_resampler_xxx_0_0, 0), (self.analog_wfm_rcv_0, 0)) |
210 | 210 | self.connect((self.rtlsdr_source_0, 0), (self.low_pass_filter_0, 0)) |
... | ... | @@ -223,8 +223,8 @@ |
223 | 223 | self.rtlsdr_source_0.set_sample_rate(self.samp_rate*10*4) |
224 | 224 | self.qtgui_freq_sink_x_0_0.set_frequency_range(0, self.samp_rate*10) |
225 | 225 | self.qtgui_freq_sink_x_0.set_frequency_range(0, self.samp_rate) |
226 | - self.low_pass_filter_0_0.set_taps(firdes.low_pass(1, self.samp_rate*10, 96e3, 1e3, firdes.WIN_HAMMING, 6.76)) | |
227 | - self.low_pass_filter_0.set_taps(firdes.low_pass(1, self.samp_rate*10*4, 100e3, 1e3, firdes.WIN_HAMMING, 6.76)) | |
226 | + 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)) | |
227 | + 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)) | |
228 | 228 | |
229 | 229 | def get_freq(self): |
230 | 230 | return self.freq |