diff options
| author | Piotr Krysik <ptrkrysik@gmail.com> | 2016-01-06 22:21:09 +0100 |
|---|---|---|
| committer | Piotr Krysik <ptrkrysik@gmail.com> | 2016-01-06 22:21:09 +0100 |
| commit | aa43fae4e2eeeb6334b0529c8689a8b8cc104d89 (patch) | |
| tree | b6876c4065790667b2fb632b57d85d1bdff8bd9e /python/receiver | |
| parent | 2751d137d801784c8fe3e204cf458d43edc76265 (diff) | |
Fixed all hierarchical blocks in the project
by adding a hier_block class that solves incompatibility between GNU Radio >=3.7.9 and <=3.7.8
and inheriting all hierarchical blocks from it.
This commit fixes #135
Diffstat (limited to 'python/receiver')
| -rw-r--r-- | python/receiver/fcch_detector.py | 4 | ||||
| -rw-r--r-- | python/receiver/gsm_input.py | 4 | ||||
| -rw-r--r-- | python/receiver/gsm_wideband_input.py | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/python/receiver/fcch_detector.py b/python/receiver/fcch_detector.py index 70a3459..2f2a4ab 100644 --- a/python/receiver/fcch_detector.py +++ b/python/receiver/fcch_detector.py @@ -15,10 +15,10 @@ from gnuradio import gr from gnuradio.filter import firdes import grgsm -class fcch_detector(gr.hier_block2): +class fcch_detector(grgsm.hier_block): def __init__(self, OSR=4): - gr.hier_block2.__init__( + grgsm.hier_block.__init__( self, "FCCH bursts detector", gr.io_signature(1, 1, gr.sizeof_gr_complex*1), gr.io_signature(1, 1, gr.sizeof_gr_complex*1), diff --git a/python/receiver/gsm_input.py b/python/receiver/gsm_input.py index 191f950..2de2f03 100644 --- a/python/receiver/gsm_input.py +++ b/python/receiver/gsm_input.py @@ -13,10 +13,10 @@ from gnuradio.filter import firdes from distutils.version import LooseVersion as version import grgsm -class gsm_input(gr.hier_block2): +class gsm_input(grgsm.hier_block): def __init__(self, ppm=0, osr=4, fc=940e6, samp_rate_in=1e6): - gr.hier_block2.__init__( + grgsm.hier_block.__init__( self, "GSM input adaptor", gr.io_signature(1, 1, gr.sizeof_gr_complex*1), gr.io_signature(1, 1, gr.sizeof_gr_complex*1), diff --git a/python/receiver/gsm_wideband_input.py b/python/receiver/gsm_wideband_input.py index 3138885..9dee08d 100644 --- a/python/receiver/gsm_wideband_input.py +++ b/python/receiver/gsm_wideband_input.py @@ -14,10 +14,10 @@ from gnuradio.filter import firdes import grgsm.arfcn as arfcn import grgsm -class gsm_wideband_input(gr.hier_block2): +class gsm_wideband_input(grgsm.hier_block): def __init__(self, ppm=0, osr=4, fc=925.2e6, samp_rate_in=20e6, ca=[]): self.num_streams = len(ca) - gr.hier_block2.__init__( + grgsm.hier_block.__init__( self, "GSM wideband input adaptor", gr.io_signature(1, 1, gr.sizeof_gr_complex*1), gr.io_signature(self.num_streams, self.num_streams, gr.sizeof_gr_complex*1), |