diff options
Diffstat (limited to 'python')
| -rw-r--r-- | python/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | python/__init__.py | 2 | ||||
| -rw-r--r-- | python/misc_utils/clock_offset_corrector.py | 6 | ||||
| -rw-r--r-- | python/receiver/fcch_burst_tagger.py | 2 | ||||
| -rw-r--r-- | python/receiver/fcch_detector.py | 4 | ||||
| -rw-r--r-- | python/receiver/gsm_input.py | 4 |
6 files changed, 10 insertions, 10 deletions
diff --git a/python/CMakeLists.txt b/python/CMakeLists.txt index 1689ee5..2b6a543 100644 --- a/python/CMakeLists.txt +++ b/python/CMakeLists.txt @@ -37,7 +37,7 @@ GR_PYTHON_INSTALL( receiver/fcch_detector.py receiver/chirpz.py receiver/clock_offset_control.py - misc_utils/clock_offset_corrector.py DESTINATION ${GR_PYTHON_DIR}/gsm + misc_utils/clock_offset_corrector.py DESTINATION ${GR_PYTHON_DIR}/grgsm ) ######################################################################## diff --git a/python/__init__.py b/python/__init__.py index 326f54c..9dd531a 100644 --- a/python/__init__.py +++ b/python/__init__.py @@ -42,7 +42,7 @@ if _RTLD_GLOBAL != 0: # import swig generated symbols into the gsm namespace -from gsm_swig import * +from grgsm_swig import * # import any pure python here diff --git a/python/misc_utils/clock_offset_corrector.py b/python/misc_utils/clock_offset_corrector.py index 9063082..e87e243 100644 --- a/python/misc_utils/clock_offset_corrector.py +++ b/python/misc_utils/clock_offset_corrector.py @@ -10,7 +10,7 @@ from gnuradio import blocks from gnuradio import filter from gnuradio import gr from gnuradio.filter import firdes -import gsm +import grgsm import math class clock_offset_corrector(gr.hier_block2): @@ -38,8 +38,8 @@ 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 = gsm.controlled_rotator_cc(0,samp_rate_out) - self.gsm_controlled_const_source_f_0 = gsm.controlled_const_source_f(ppm) + 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) self.blocks_multiply_const_vxx_0_0 = blocks.multiply_const_vff((1.0e-6*samp_rate_in/samp_rate_out, )) self.blocks_multiply_const_vxx_0 = blocks.multiply_const_vff((fc/samp_rate_out*(2*math.pi)/1e6, )) diff --git a/python/receiver/fcch_burst_tagger.py b/python/receiver/fcch_burst_tagger.py index 1d254fe..fdea81c 100644 --- a/python/receiver/fcch_burst_tagger.py +++ b/python/receiver/fcch_burst_tagger.py @@ -23,7 +23,7 @@ from numpy import * #from pylab import * from gnuradio import gr import pmt -from gsm.chirpz import ZoomFFT +from grgsm.chirpz import ZoomFFT class fcch_burst_tagger(gr.sync_block): """ diff --git a/python/receiver/fcch_detector.py b/python/receiver/fcch_detector.py index 627dd00..70a3459 100644 --- a/python/receiver/fcch_detector.py +++ b/python/receiver/fcch_detector.py @@ -13,7 +13,7 @@ from gnuradio import blocks from gnuradio import gr from gnuradio.filter import firdes -import gsm +import grgsm class fcch_detector(gr.hier_block2): @@ -38,7 +38,7 @@ class fcch_detector(gr.hier_block2): ################################################## # Blocks ################################################## - self.gsm_fcch_burst_tagger_0 = gsm.fcch_burst_tagger(OSR) + self.gsm_fcch_burst_tagger_0 = grgsm.fcch_burst_tagger(OSR) self.blocks_threshold_ff_0_0 = blocks.threshold_ff(0, 0, 0) self.blocks_threshold_ff_0 = blocks.threshold_ff(int((138)*samp_rate/f_symb), int((138)*samp_rate/f_symb), 0) self.blocks_multiply_conjugate_cc_0 = blocks.multiply_conjugate_cc(1) diff --git a/python/receiver/gsm_input.py b/python/receiver/gsm_input.py index ffc7782..16df5c3 100644 --- a/python/receiver/gsm_input.py +++ b/python/receiver/gsm_input.py @@ -10,7 +10,7 @@ from gnuradio import filter from gnuradio import gr from gnuradio.filter import firdes -import gsm +import grgsm class gsm_input(gr.hier_block2): @@ -40,7 +40,7 @@ class gsm_input(gr.hier_block2): self.ppm_in = None;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 = gsm.clock_offset_corrector( + self.gsm_clock_offset_corrector_0 = grgsm.clock_offset_corrector( fc=936.6e6, ppm=0, samp_rate_in=samp_rate_in, |