commit 3be74a732b3fc4de0f99249e8bca975fee760210
author ptrkrysik <ptrkrysik@gmail.com> Sat Dec 13 10:11:00 2014 +0100
committer ptrkrysik <ptrkrysik@gmail.com> Sat Dec 13 10:11:00 2014 +0100
tree 81731b4d5022ce40f8b0983c310c42f7d1a6838f
parent 0cd9ef0a801eeab7f501d012006f379b86c887a1

Changed grgsm install directories and prefixes from "gsm" to "grgsm". The old prefix caused conflicts with libraries already available.

python/receiver/fcch_burst_tagger.py

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 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):
     """

python/receiver/fcch_detector.py

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 @@
         ##################################################
         # 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)

python/receiver/gsm_input.py

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 @@
         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,