From e3b652ddf393ab6d6d31131b461ca8820379bdcd Mon Sep 17 00:00:00 2001 From: Piotr Krysik Date: Sat, 2 Jan 2016 09:14:27 +0100 Subject: [PATCH] Another approach to fix for problem #135 with message inputs of hierarhical blocks, caused by incompatibility introduced in GNU Radio 3.7.9. --- python/misc_utils/clock_offset_corrector.py | 3 ++- python/receiver/gsm_input.py | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/python/misc_utils/clock_offset_corrector.py b/python/misc_utils/clock_offset_corrector.py index 6eb0ef7..403b513 100644 --- a/python/misc_utils/clock_offset_corrector.py +++ b/python/misc_utils/clock_offset_corrector.py @@ -10,6 +10,7 @@ from gnuradio import blocks from gnuradio import filter from gnuradio import gr from gnuradio.filter import firdes +from distutils.version import LooseVersion as version import grgsm import math @@ -21,7 +22,7 @@ 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': + if version(gr.version()) >= version('3.7.9'): self.message_port_register_hier_in("ppm_in") else: self.message_port_register_hier_out("ppm_in") diff --git a/python/receiver/gsm_input.py b/python/receiver/gsm_input.py index c55b823..191f950 100644 --- a/python/receiver/gsm_input.py +++ b/python/receiver/gsm_input.py @@ -10,6 +10,7 @@ from gnuradio import filter from gnuradio import gr from gnuradio.filter import firdes +from distutils.version import LooseVersion as version import grgsm class gsm_input(gr.hier_block2): @@ -37,7 +38,7 @@ class gsm_input(gr.hier_block2): ################################################## # Blocks ################################################## - if gr.version() >= '3.7.9': + if version(gr.version()) >= version('3.7.9'): self.message_port_register_hier_in("ppm_in") else: self.message_port_register_hier_out("ppm_in")