summaryrefslogtreecommitdiff
path: root/gr-analog
diff options
context:
space:
mode:
authorJosh Morman <jmorman@perspectalabs.com>2020-12-17 11:10:05 -0500
committerMarcus Müller <marcus@hostalia.de>2020-12-18 22:36:14 +0100
commit3207374679508769fa561f5d68db8c916d1fe5ad (patch)
treea0817455dc7819b02463133c649ca21fd7b39ff2 /gr-analog
parent96a15f6b0d52f116ee9546be63dce90c4b90238f (diff)
global replace of filter.firdes.WIN_ with fft.window.WIN_
Signed-off-by: Josh Morman <jmorman@perspectalabs.com>
Diffstat (limited to 'gr-analog')
-rw-r--r--gr-analog/python/analog/nbfm_rx.py2
-rw-r--r--gr-analog/python/analog/wfm_rcv.py2
-rw-r--r--gr-analog/python/analog/wfm_rcv_fmdet.py8
3 files changed, 6 insertions, 6 deletions
diff --git a/gr-analog/python/analog/nbfm_rx.py b/gr-analog/python/analog/nbfm_rx.py
index 2d27423748..129a4e9f01 100644
--- a/gr-analog/python/analog/nbfm_rx.py
+++ b/gr-analog/python/analog/nbfm_rx.py
@@ -66,7 +66,7 @@ class nbfm_rx(gr.hier_block2):
quad_rate, # sampling rate
2.7e3, # Audio LPF cutoff
0.5e3, # Transition band
- filter.firdes.WIN_HAMMING) # filter type
+ fft.window.WIN_HAMMING) # filter type
print("len(audio_taps) =", len(audio_taps))
diff --git a/gr-analog/python/analog/wfm_rcv.py b/gr-analog/python/analog/wfm_rcv.py
index 48501d47af..e3adc2deed 100644
--- a/gr-analog/python/analog/wfm_rcv.py
+++ b/gr-analog/python/analog/wfm_rcv.py
@@ -57,7 +57,7 @@ class wfm_rcv(gr.hier_block2):
quad_rate, # sampling rate
audio_rate / 2 - width_of_transition_band,
width_of_transition_band,
- filter.firdes.WIN_HAMMING)
+ fft.window.WIN_HAMMING)
# input: float; output: float
self.audio_filter = filter.fir_filter_fff(audio_decimation, audio_coeffs)
diff --git a/gr-analog/python/analog/wfm_rcv_fmdet.py b/gr-analog/python/analog/wfm_rcv_fmdet.py
index 27a416aa1c..703f39fce3 100644
--- a/gr-analog/python/analog/wfm_rcv_fmdet.py
+++ b/gr-analog/python/analog/wfm_rcv_fmdet.py
@@ -60,7 +60,7 @@ class wfm_rcv_fmdet(gr.hier_block2):
demod_rate, # sampling rate
15000 ,
width_of_transition_band,
- filter.firdes.WIN_HAMMING)
+ fft.window.WIN_HAMMING)
# input: float; output: float
self.audio_filter = filter.fir_filter_fff(audio_decimation, audio_coeffs)
@@ -78,7 +78,7 @@ class wfm_rcv_fmdet(gr.hier_block2):
-19020,
-18980,
width_of_transition_band,
- filter.firdes.WIN_HAMMING)
+ fft.window.WIN_HAMMING)
#print "len stereo carrier filter = ",len(stereo_carrier_filter_coeffs)
#print "stereo carrier filter ", stereo_carrier_filter_coeffs
@@ -94,7 +94,7 @@ class wfm_rcv_fmdet(gr.hier_block2):
38000-15000 / 2,
38000+15000 / 2,
width_of_transition_band,
- filter.firdes.WIN_HAMMING)
+ fft.window.WIN_HAMMING)
#print "len stereo dsbsc filter = ",len(stereo_dsbsc_filter_coeffs)
#print "stereo dsbsc filter ", stereo_dsbsc_filter_coeffs
@@ -115,7 +115,7 @@ class wfm_rcv_fmdet(gr.hier_block2):
57000 - 1500,
57000 + 1500,
width_of_transition_band,
- filter.firdes.WIN_HAMMING)
+ fft.window.WIN_HAMMING)
#print "len stereo dsbsc filter = ",len(stereo_dsbsc_filter_coeffs)
#print "stereo dsbsc filter ", stereo_dsbsc_filter_coeffs
# construct overlap add filter system from coefficients for stereo carrier