Removed wideband_input_adaptor

6 files changed, 0 insertions, 245 deletions

diff --git a/grc/gsm_block_tree.xml b/grc/gsm_block_tree.xml
index c2e1ee7..85a89c2 100644
--- a/grc/gsm_block_tree.xml
+++ b/grc/gsm_block_tree.xml
@@ -20,7 +20,6 @@
       <block>gsm_fcch_detector</block>
       <block>gsm_clock_offset_control</block>
       <block>gsm_input</block>
-      <block>gsm_wideband_input</block>
     </cat>
     <cat>
       <name>Logical channels demapping</name>
diff --git a/grc/receiver/CMakeLists.txt b/grc/receiver/CMakeLists.txt
index bbc086f..7b51226 100644
--- a/grc/receiver/CMakeLists.txt
+++ b/grc/receiver/CMakeLists.txt
@@ -19,7 +19,6 @@
 
 install(FILES
     gsm_input.xml
-    gsm_wideband_input.xml
     gsm_receiver.xml
     gsm_receiver_with_uplink.xml
     gsm_fcch_burst_tagger.xml
diff --git a/grc/receiver/gsm_wideband_input.xml b/grc/receiver/gsm_wideband_input.xml
deleted file mode 100644
index 54a2f76..0000000
--- a/grc/receiver/gsm_wideband_input.xml
+++ /dev/null
@@ -1,119 +0,0 @@
-<block>
-  <name>GSM Wideband Input Adaptor</name>
-  <key>gsm_wideband_input</key>
-  <category></category>
-  <import>import grgsm</import>
-  <make>grgsm.gsm_wideband_input(
-    ppm=$ppm,
-    osr=$osr,
-    fc=$fc,
-    samp_rate_in=$samp_rate_in,
-    ca=$cell_allocation,
-    band=$band,
-)</make>
-  <callback>set_ppm($ppm)</callback>
-  <callback>set_osr($osr)</callback>
-  <callback>set_fc($fc)</callback>
-  <callback>set_samp_rate_in($samp_rate_in)</callback>
-  <param>
-    <name>ppm</name>
-    <key>ppm</key>
-    <value>ppm</value>
-    <type>float</type>
-    <hide>part</hide>
-  </param>
-  <param>
-    <name>OSR</name>
-    <key>osr</key>
-    <value>osr</value>
-    <type>int</type>
-    <hide>part</hide>
-  </param>
-  <param>
-    <name>fc</name>
-    <key>fc</key>
-    <value>fc</value>
-    <type>float</type>
-    <hide>part</hide>
-  </param>
-  <param>
-    <name>Band</name>
-    <key>band</key>
-    <value>E-GSM</value>
-    <type>string</type>
-    <hide>part</hide>
-    <option>
-      <name>P-GSM (1-124)</name>
-      <key>P-GSM</key>
-    </option>
-    <option>
-      <name>DCS1800 (512-885)</name>
-      <key>DCS1900</key>
-    </option>
-    <option>
-      <name>PCS1900 (512-810)</name>
-      <key>PCS1900</key>
-    </option>
-    <option>
-      <name>E-GSM (975-1023)</name>
-      <key>E-GSM</key>
-    </option>
-    <option>
-      <name>R-GSM (955-1023)</name>
-      <key>R-GSM</key>
-    </option>
-    <option>
-      <name>GSM450 (259-293)</name>
-      <key>GSM450</key>
-    </option>
-    <option>
-      <name>GSM480 (306-340)</name>
-      <key>GSM480</key>
-    </option> 
-    <option>
-      <name>GSM850 (128-251)</name>
-      <key>GSM850</key>
-    </option>
-  </param>
-  <param>
-    <name>Cell allocation</name>
-    <key>cell_allocation</key>
-    <value>[]</value>
-    <type>float_vector</type>
-    <hide>part</hide>
-  </param>
-  <param>
-    <name>samp_rate_in</name>
-    <key>samp_rate_in</key>
-    <value>samp_rate_in</value>
-    <type>float</type>
-    <hide>part</hide>
-  </param>
-  <param>
-    <name>Num Streams</name>
-    <key>num_streams</key>
-    <value>1</value>
-    <type>int</type>
-    <hide>part</hide>
-  </param>
-  <check>$num_streams &gt;= 0</check>
-  <check>$cell_allocation and all(grgsm.arfcn.is_valid_arfcn(c, $band) for c in $cell_allocation)</check>
-  <sink>
-    <name>in</name>
-    <type>complex</type>
-    <vlen>1</vlen>
-  </sink>
-  <sink>
-    <name>ppm_in</name>
-    <type>message</type>
-    <optional>True</optional>
-  </sink>
-  <source>
-    <name>out</name>
-    <type>complex</type>
-    <vlen>1</vlen>
-    <nports>$num_streams</nports>
-  </source>
-  <doc>Piotr Krysik
-Adaptor of input stream for the GSM receiver. Contains frequency offset corrector and resampler to correct carrier frequency and sampling frequency offsets. At the end it has LP filter for filtering of a GSM channel.</doc>
-</block>
diff --git a/python/CMakeLists.txt b/python/CMakeLists.txt
index dbffa6c..df11c10 100644
--- a/python/CMakeLists.txt
+++ b/python/CMakeLists.txt
@@ -35,7 +35,6 @@ GR_PYTHON_INSTALL(
     demapping/gsm_bcch_ccch_sdcch4_demapper.py
     demapping/gsm_sdcch8_demapper.py
     receiver/gsm_input.py
-    receiver/gsm_wideband_input.py
     receiver/fcch_burst_tagger.py
     receiver/sch_detector.py
     receiver/fcch_detector.py
diff --git a/python/__init__.py b/python/__init__.py
index 76c6b99..0a9e544 100644
--- a/python/__init__.py
+++ b/python/__init__.py
@@ -52,7 +52,6 @@ from sch_detector import sch_detector
 from fcch_detector import fcch_detector
 from clock_offset_corrector_tagged import clock_offset_corrector_tagged
 from gsm_input import gsm_input
-from gsm_wideband_input import gsm_wideband_input
 from gsm_bcch_ccch_demapper import gsm_bcch_ccch_demapper
 from gsm_bcch_ccch_sdcch4_demapper import gsm_bcch_ccch_sdcch4_demapper
 from gsm_sdcch8_demapper import gsm_sdcch8_demapper
diff --git a/python/receiver/gsm_wideband_input.py b/python/receiver/gsm_wideband_input.py
deleted file mode 100644
index 962d7b0..0000000
--- a/python/receiver/gsm_wideband_input.py
+++ /dev/null
@@ -1,122 +0,0 @@
-#!/usr/bin/env python
-##################################################
-# Gnuradio Python Flow Graph
-# Title: GSM wideband input adaptor
-# Author: Piotr Krysik
-# Co-author: Pieter Robyns
-# Description: Adaptor of input stream for the GSM receiver. Contains frequency ofset corrector doing also resampling to integer multiplies of GSM sample rate and LP filter filtering GSM channel.
-##################################################
-
-from gnuradio import filter
-from gnuradio import gr
-from gnuradio import eng_notation
-from gnuradio.filter import firdes
-import grgsm.arfcn as arfcn
-import grgsm
-
-class gsm_wideband_input(grgsm.hier_block):
-    def __init__(self, ppm=0, osr=4, fc=925.2e6, samp_rate_in=20e6, ca=[], band='P-GSM'):
-        self.num_streams = len(ca)
-        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),
-        )
-
-        ##################################################
-        # Parameters
-        ##################################################
-        self.ppm = ppm
-        self.osr = osr
-        self.fc = fc
-        self.samp_rate_in = samp_rate_in
-        self.ca = ca
-        self.blocks_fir_filters = {}
-        self.blocks_resamplers = {}
-        self.blocks_ocs = {}
-        self.band = band
-
-        ##################################################
-        # Variables
-        ##################################################
-        self.samp_rate_out = samp_rate_out = 1625000.0/6.0*osr
-
-        ##################################################
-        # Blocks
-        ##################################################
-        self.ppm_in = None
-        self.message_port_register_hier_in("ppm_in")
-        #self.lpf = firdes.low_pass(1, samp_rate_out, 125e3, 5e3, firdes.WIN_HAMMING, 6.76)
-        self.lpf = firdes.low_pass(1, samp_rate_in, 125e3, 75e3, firdes.WIN_HAMMING, 6.76)
-        self.gsm_clock_offset_corrector_0 = grgsm.clock_offset_corrector(
-            fc=fc,
-            ppm=ppm,
-            samp_rate_in=samp_rate_in,
-        )
-
-        center_arfcn = arfcn.downlink2arfcn(fc, band)
-        fc_str = eng_notation.num_to_str(fc)
-        print("Extracting channels %s, given center frequency at %sHz (ARFCN %d)" % (str(ca), fc_str, center_arfcn))
-
-        self.connect((self, 0), (self.gsm_clock_offset_corrector_0, 0))
-
-        output_port = 0
-        for channel in ca:
-            channel_freq = arfcn.arfcn2downlink(channel, band)
-            if channel_freq is None:
-                print("Warning: invalid ARFCN %d for band %s" % (channel, band))
-                continue
-            freq_diff = channel_freq - fc
-            freq_diff_str = "+" if 0 <= freq_diff else ""
-            freq_diff_str += eng_notation.num_to_str(freq_diff)
-            print("ARFCN %d is at %sHz %sHz" % (channel, fc_str, freq_diff_str))
-
-            self.blocks_resamplers[channel] = filter.fractional_resampler_cc(0, samp_rate_in/samp_rate_out)
-            self.blocks_fir_filters[channel] = filter.freq_xlating_fir_filter_ccc(1, self.lpf, freq_diff, samp_rate_in)
-            self.connect((self.gsm_clock_offset_corrector_0, 0), (self.blocks_fir_filters[channel], 0))
-            self.connect((self.blocks_fir_filters[channel], 0), (self.blocks_resamplers[channel], 0))
-            self.connect((self.blocks_resamplers[channel], 0), (self, output_port))
-            output_port += 1
-
-        ##################################################
-        # Asynch Message Connections
-        ##################################################
-        self.msg_connect(self, "ppm_in", self.gsm_clock_offset_corrector_0, "ppm_in")
-
-    def get_ppm(self):
-        return self.ppm
-
-    def set_ppm(self, ppm):
-        self.ppm = ppm
-        self.gsm_clock_offset_corrector_0.set_ppm(self.ppm)
-
-    def get_fc(self):
-        return self.fc
-
-    def set_fc(self, fc):
-        self.fc = fc
-        self.gsm_clock_offset_corrector_0.set_fc(self.fc)
-
-    def get_osr(self):
-        return self.osr
-
-    def set_osr(self, osr):
-        self.osr = osr
-        self.set_samp_rate_out(1625000.0/6.0*self.osr)
-
-    def get_samp_rate_in(self):
-        return self.samp_rate_in
-
-    def set_samp_rate_in(self, samp_rate_in):
-        self.samp_rate_in = samp_rate_in
-        for channel in self.blocks_resamplers:
-            self.blocks_resamplers[channel].set_resamp_ratio(self.samp_rate_in / self.samp_rate_out)
-        self.gsm_clock_offset_corrector_0.set_samp_rate_in(self.samp_rate_in)
-
-    def get_samp_rate_out(self):
-        return self.samp_rate_out
-
-    def set_samp_rate_out(self, samp_rate_out):
-        self.samp_rate_out = samp_rate_out
-        for channel in self.blocks_resamplers:
-            self.blocks_resamplers[channel].set_resamp_ratio(self.samp_rate_in / self.samp_rate_out)