From 3a527f8e5883003890fefd0dc032d04d5ad07dfc Mon Sep 17 00:00:00 2001 From: Piotr Krysik Date: Fri, 1 Jan 2016 16:01:26 +0100 Subject: [PATCH] Fix for problem #135 with hierarhical blocks due to incompatibility introduced in GNU Radio 3.7.9 --- python/misc_utils/clock_offset_corrector.py | 5 ++++- python/receiver/gsm_input.py | 6 +++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/python/misc_utils/clock_offset_corrector.py b/python/misc_utils/clock_offset_corrector.py index e87e243..6eb0ef7 100644 --- a/python/misc_utils/clock_offset_corrector.py +++ b/python/misc_utils/clock_offset_corrector.py @@ -21,6 +21,10 @@ class clock_offset_corrector(gr.hier_block2): gr.io_signature(1, 1, gr.sizeof_gr_complex*1), gr.io_signature(1, 1, gr.sizeof_gr_complex*1), ) + if gr.version() >= '3.7.9': + self.message_port_register_hier_in("ppm_in") + else: + self.message_port_register_hier_out("ppm_in") ################################################## # Parameters @@ -37,7 +41,6 @@ class clock_offset_corrector(gr.hier_block2): ################################################## # Blocks ################################################## - self.ppm_in = None;self.message_port_register_hier_out("ppm_in") self.gsm_controlled_rotator_cc_0 = grgsm.controlled_rotator_cc(0,samp_rate_out) self.gsm_controlled_const_source_f_0 = grgsm.controlled_const_source_f(ppm) self.fractional_resampler_xx_0 = filter.fractional_resampler_cc(0, samp_rate_in/samp_rate_out) diff --git a/python/receiver/gsm_input.py b/python/receiver/gsm_input.py index 47edcc5..c55b823 100644 --- a/python/receiver/gsm_input.py +++ b/python/receiver/gsm_input.py @@ -37,7 +37,11 @@ class gsm_input(gr.hier_block2): ################################################## # Blocks ################################################## - self.ppm_in = None;self.message_port_register_hier_out("ppm_in") + if gr.version() >= '3.7.9': + self.message_port_register_hier_in("ppm_in") + else: + self.message_port_register_hier_out("ppm_in") + self.low_pass_filter_0_0 = filter.fir_filter_ccf(1, firdes.low_pass( 1, samp_rate_out, 125e3, 5e3, firdes.WIN_HAMMING, 6.76)) self.gsm_clock_offset_corrector_0 = grgsm.clock_offset_corrector(