diff options
author | piotr <Piotr Krysik pkrysik@elka.pw.edu.pl> | 2014-08-06 14:18:02 +0200 |
---|---|---|
committer | piotr <Piotr Krysik pkrysik@elka.pw.edu.pl> | 2014-08-06 14:18:02 +0200 |
commit | 6fbc7326c3b918b0a41f186f9e30d054cc3a7123 (patch) | |
tree | 7d83850df55e1f1a0131efc17009ab3fcc65df84 | |
parent | 4520e99ec4086587367531a9e9fd7e5bc00794e8 (diff) |
Cleanup in examples directory
-rwxr-xr-x | examples/gsm_receiver_test.py | 96 | ||||
-rw-r--r-- | examples/receiver_file.grc | 265 | ||||
-rw-r--r-- | examples/receiver_rtlsdr.grc | 907 | ||||
-rw-r--r-- | examples/receiver_usrp.grc | 258 | ||||
-rw-r--r-- | grc/gsm_extract_system_info.xml | 2 | ||||
-rw-r--r-- | hier_blocks/gsm_fcch_detector.grc (renamed from examples/gsm_fcch_detector.grc) | 0 | ||||
-rw-r--r-- | python/receiver_hier.pyc | bin | 2997 -> 0 bytes |
7 files changed, 1382 insertions, 146 deletions
diff --git a/examples/gsm_receiver_test.py b/examples/gsm_receiver_test.py new file mode 100755 index 0000000..231f2bc --- /dev/null +++ b/examples/gsm_receiver_test.py @@ -0,0 +1,96 @@ +#!/usr/bin/env python +################################################## +# Gnuradio Python Flow Graph +# Title: Gsm Receiver Test +# Generated: Wed Aug 6 13:56:15 2014 +################################################## + +execfile("/home/piotr/.grc_gnuradio/clk_offset_corrector.py") +from gnuradio import blocks +from gnuradio import eng_notation +from gnuradio import gr +from gnuradio.eng_option import eng_option +from gnuradio.filter import firdes +from grc_gnuradio import wxgui as grc_wxgui +from optparse import OptionParser +import gsm +import wx + +class gsm_receiver_test(grc_wxgui.top_block_gui): + + def __init__(self, input_file_name="input.cfile"): + grc_wxgui.top_block_gui.__init__(self, title="Gsm Receiver Test") + _icon_path = "/home/piotr/.local/share/icons/hicolor/32x32/apps/gnuradio-grc.png" + self.SetIcon(wx.Icon(_icon_path, wx.BITMAP_TYPE_ANY)) + + ################################################## + # Parameters + ################################################## + self.input_file_name = input_file_name + + ################################################## + # Variables + ################################################## + self.samp_rate = samp_rate = 1625000/6*4 + + ################################################## + # Blocks + ################################################## + self.gsm_receiver_hier_0 = gsm.receiver_hier(samp_rate, 4) + self.gsm_message_printer_0 = gsm.message_printer() + self.gsm_get_bcch_or_ccch_bursts_0 = gsm.get_bcch_or_ccch_bursts(2) + self.gsm_control_channels_decoder_0 = gsm.control_channels_decoder() + self.gsm_clock_offset_control_0 = gsm.clock_offset_control(940e6, samp_rate) + self.clk_offset_corrector_0 = clk_offset_corrector( + ppm=0, + samp_rate=samp_rate, + fc=936.6e6, + ) + self.blocks_file_source_0 = blocks.file_source(gr.sizeof_gr_complex*1, input_file_name, False) + + ################################################## + # Connections + ################################################## + self.connect((self.clk_offset_corrector_0, 0), (self.gsm_receiver_hier_0, 0)) + self.connect((self.blocks_file_source_0, 0), (self.clk_offset_corrector_0, 0)) + + ################################################## + # Asynch Message Connections + ################################################## + self.msg_connect(self.gsm_clock_offset_control_0, "ppm", self.clk_offset_corrector_0, "ppm_msg") + self.msg_connect(self.gsm_receiver_hier_0, "measurements", self.gsm_clock_offset_control_0, "measurements") + self.msg_connect(self.gsm_control_channels_decoder_0, "msgs", self.gsm_message_printer_0, "msgs") + self.msg_connect(self.gsm_get_bcch_or_ccch_bursts_0, "bursts", self.gsm_control_channels_decoder_0, "bursts") + self.msg_connect(self.gsm_receiver_hier_0, "bursts", self.gsm_get_bcch_or_ccch_bursts_0, "bursts") + + + def get_input_file_name(self): + return self.input_file_name + + def set_input_file_name(self, input_file_name): + self.input_file_name = input_file_name + self.blocks_file_source_0.open(self.input_file_name, False) + + def get_samp_rate(self): + return self.samp_rate + + def set_samp_rate(self, samp_rate): + self.samp_rate = samp_rate + self.clk_offset_corrector_0.set_samp_rate(self.samp_rate) + +if __name__ == '__main__': + import ctypes + import sys + if sys.platform.startswith('linux'): + try: + x11 = ctypes.cdll.LoadLibrary('libX11.so') + x11.XInitThreads() + except: + print "Warning: failed to XInitThreads()" + parser = OptionParser(option_class=eng_option, usage="%prog: [options]") + parser.add_option("-i", "--input-file-name", dest="input_file_name", type="string", default="input.cfile", + help="Set input.cfile [default=%default]") + (options, args) = parser.parse_args() + tb = gsm_receiver_test(input_file_name=options.input_file_name) + tb.Start(True) + tb.Wait() diff --git a/examples/receiver_file.grc b/examples/receiver_file.grc index 883ea2e..ac3df82 100644 --- a/examples/receiver_file.grc +++ b/examples/receiver_file.grc @@ -1,6 +1,6 @@ <?xml version='1.0' encoding='ASCII'?> <flow_graph> - <timestamp>Fri Jul 18 10:24:08 2014</timestamp> + <timestamp>Wed Aug 6 13:56:14 2014</timestamp> <block> <key>options</key> <param> @@ -29,7 +29,7 @@ </param> <param> <key>generate_options</key> - <value>no_gui</value> + <value>wx_gui</value> </param> <param> <key>category</key> @@ -92,16 +92,28 @@ </param> </block> <block> - <key>blocks_message_debug</key> + <key>gsm_receiver_hier</key> <param> <key>id</key> - <value>blocks_message_debug_0</value> + <value>gsm_receiver_hier_0</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> + <key>input_rate</key> + <value>samp_rate</value> + </param> + <param> + <key>osr</key> + <value>4</value> + </param> + <param> + <key>arfcn</key> + <value>0</value> + </param> + <param> <key>alias</key> <value></value> </param> @@ -110,8 +122,16 @@ <value></value> </param> <param> + <key>minoutbuf</key> + <value>0</value> + </param> + <param> + <key>maxoutbuf</key> + <value>0</value> + </param> + <param> <key>_coordinate</key> - <value>(630, 183)</value> + <value>(606, 180)</value> </param> <param> <key>_rotation</key> @@ -119,28 +139,172 @@ </param> </block> <block> - <key>gsm_receiver_hier</key> + <key>gsm_get_bcch_or_ccch_bursts</key> <param> <key>id</key> - <value>gsm_receiver_hier_0</value> + <value>gsm_get_bcch_or_ccch_bursts_0</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>input_rate</key> + <key>d_fn51_start</key> + <value>2</value> + </param> + <param> + <key>alias</key> + <value></value> + </param> + <param> + <key>affinity</key> + <value></value> + </param> + <param> + <key>minoutbuf</key> + <value>0</value> + </param> + <param> + <key>maxoutbuf</key> + <value>0</value> + </param> + <param> + <key>_coordinate</key> + <value>(809, 179)</value> + </param> + <param> + <key>_rotation</key> + <value>0</value> + </param> + </block> + <block> + <key>gsm_control_channels_decoder</key> + <param> + <key>id</key> + <value>gsm_control_channels_decoder_0</value> + </param> + <param> + <key>_enabled</key> + <value>True</value> + </param> + <param> + <key>alias</key> + <value></value> + </param> + <param> + <key>affinity</key> + <value></value> + </param> + <param> + <key>minoutbuf</key> + <value>0</value> + </param> + <param> + <key>maxoutbuf</key> + <value>0</value> + </param> + <param> + <key>_coordinate</key> + <value>(1054, 183)</value> + </param> + <param> + <key>_rotation</key> + <value>0</value> + </param> + </block> + <block> + <key>gsm_message_printer</key> + <param> + <key>id</key> + <value>gsm_message_printer_0</value> + </param> + <param> + <key>_enabled</key> + <value>True</value> + </param> + <param> + <key>alias</key> + <value></value> + </param> + <param> + <key>affinity</key> + <value></value> + </param> + <param> + <key>_coordinate</key> + <value>(945, 254)</value> + </param> + <param> + <key>_rotation</key> + <value>0</value> + </param> + </block> + <block> + <key>clk_offset_corrector</key> + <param> + <key>id</key> + <value>clk_offset_corrector_0</value> + </param> + <param> + <key>_enabled</key> + <value>True</value> + </param> + <param> + <key>ppm</key> + <value>0</value> + </param> + <param> + <key>samp_rate</key> <value>samp_rate</value> </param> <param> - <key>osr</key> - <value>4</value> + <key>fc</key> + <value>936.6e6</value> </param> <param> - <key>arfcn</key> + <key>alias</key> + <value></value> + </param> + <param> + <key>affinity</key> + <value></value> + </param> + <param> + <key>minoutbuf</key> <value>0</value> </param> <param> + <key>maxoutbuf</key> + <value>0</value> + </param> + <param> + <key>_coordinate</key> + <value>(374, 180)</value> + </param> + <param> + <key>_rotation</key> + <value>0</value> + </param> + </block> + <block> + <key>gsm_clock_offset_control</key> + <param> + <key>id</key> + <value>gsm_clock_offset_control_0</value> + </param> + <param> + <key>_enabled</key> + <value>True</value> + </param> + <param> + <key>fc</key> + <value>940e6</value> + </param> + <param> + <key>samp_rate</key> + <value>samp_rate</value> + </param> + <param> <key>alias</key> <value></value> </param> @@ -158,7 +322,46 @@ </param> <param> <key>_coordinate</key> - <value>(352, 163)</value> + <value>(447, 43)</value> + </param> + <param> + <key>_rotation</key> + <value>0</value> + </param> + </block> + <block> + <key>parameter</key> + <param> + <key>id</key> + <value>input_file_name</value> + </param> + <param> + <key>_enabled</key> + <value>True</value> + </param> + <param> + <key>label</key> + <value>input_file_name</value> + </param> + <param> + <key>value</key> + <value>input.cfile</value> + </param> + <param> + <key>type</key> + <value>string</value> + </param> + <param> + <key>short_id</key> + <value>i</value> + </param> + <param> + <key>alias</key> + <value></value> + </param> + <param> + <key>_coordinate</key> + <value>(189, 13)</value> </param> <param> <key>_rotation</key> @@ -177,7 +380,7 @@ </param> <param> <key>file</key> - <value>/home/piotr/Odbiornik_gsm/reconstr_signal</value> + <value>input_file_name</value> </param> <param> <key>type</key> @@ -217,15 +420,45 @@ </param> </block> <connection> - <source_block_id>blocks_file_source_0</source_block_id> + <source_block_id>gsm_clock_offset_control_0</source_block_id> + <sink_block_id>clk_offset_corrector_0</sink_block_id> + <source_key>ppm</source_key> + <sink_key>ppm_msg</sink_key> + </connection> + <connection> + <source_block_id>clk_offset_corrector_0</source_block_id> <sink_block_id>gsm_receiver_hier_0</sink_block_id> <source_key>0</source_key> <sink_key>0</sink_key> </connection> <connection> + <source_block_id>blocks_file_source_0</source_block_id> + <sink_block_id>clk_offset_corrector_0</sink_block_id> + <source_key>0</source_key> + <sink_key>0</sink_key> + </connection> + <connection> + <source_block_id>gsm_receiver_hier_0</source_block_id> + <sink_block_id>gsm_clock_offset_control_0</sink_block_id> + <source_key>measurements</source_key> + <sink_key>measurements</sink_key> + </connection> + <connection> + <source_block_id>gsm_control_channels_decoder_0</source_block_id> + <sink_block_id>gsm_message_printer_0</sink_block_id> + <source_key>msgs</source_key> + <sink_key>msgs</sink_key> + </connection> + <connection> + <source_block_id>gsm_get_bcch_or_ccch_bursts_0</source_block_id> + <sink_block_id>gsm_control_channels_decoder_0</sink_block_id> + <source_key>bursts</source_key> + <sink_key>bursts</sink_key> + </connection> + <connection> <source_block_id>gsm_receiver_hier_0</source_block_id> - <sink_block_id>blocks_message_debug_0</sink_block_id> + <sink_block_id>gsm_get_bcch_or_ccch_bursts_0</sink_block_id> <source_key>bursts</source_key> - <sink_key>print</sink_key> + <sink_key>bursts</sink_key> </connection> </flow_graph> diff --git a/examples/receiver_rtlsdr.grc b/examples/receiver_rtlsdr.grc new file mode 100644 index 0000000..c48a512 --- /dev/null +++ b/examples/receiver_rtlsdr.grc @@ -0,0 +1,907 @@ +<?xml version='1.0' encoding='ASCII'?> +<flow_graph> + <timestamp>Wed Aug 6 13:33:28 2014</timestamp> + <block> + <key>options</key> + <param> + <key>id</key> + <value>rtl</value> + </param> + <param> + <key>_enabled</key> + <value>True</value> + </param> + <param> + <key>title</key> + <value></value> + </param> + <param> + <key>author</key> + <value></value> + </param> + <param> + <key>description</key> + <value></value> + </param> + <param> + <key>window_size</key> + <value>1280, 1024</value> + </param> + <param> + <key>generate_options</key> + <value>wx_gui</value> + </param> + <param> + <key>category</key> + <value>Custom</value> + </param> + <param> + <key>run_options</key> + <value>prompt</value> + </param> + <param> + <key>run</key> + <value>True</value> + </param> + <param> + <key>max_nouts</key> + <value>0</value> + </param> + <param> + <key>realtime_scheduling</key> + <value></value> + </param> + <param> + <key>alias</key> + <value></value> + </param> + <param> + <key>_coordinate</key> + <value>(13, 9)</value> + </param> + <param> + <key>_rotation</key> + <value>0</value> + </param> + </block> + <block> + <key>variable</key> + <param> + <key>id</key> + <value>samp_rate</value> + </param> + <param> + <key>_enabled</key> + <value>True</value> + </param> + <param> + <key>value</key> + <value>1000000.026491</value> + </param> + <param> + <key>alias</key> + <value></value> + </param> + <param> + <key>_coordinate</key> + <value>(13, 167)</value> + </param> + <param> + <key>_rotation</key> + <value>0</value> + </param> + </block> + <block> + <key>variable_slider</key> + <param> + <key>id</key> + <value>fc</value> + </param> + <param> + <key>_enabled</key> + <value>True</value> + </param> + <param> + <key>label</key> + <value></value> + </param> + <param> + <key>value</key> + <value>940e6</value> + </param> + <param> + <key>min</key> + <value>800e6</value> + </param> + <param> + <key>max</key> + <value>1000e6</value> + </param> + <param> + <key>num_steps</key> + <value>1000</value> + </param> + <param> + <key>style</key> + <value>wx.SL_HORIZONTAL</value> + </param> + <param> + <key>converver</key> + <value>float_converter</value> + </param> + <param> + <key>grid_pos</key> + <value></value> + </param> + <param> + <key>notebook</key> + <value></value> + </param> + <param> + <key>alias</key> + <value></value> + </param> + <param> + <key>_coordinate</key> + <value>(333, 29)</value> + </param> + <param> + <key>_rotation</key> + <value>0</value> + </param> + </block> + <block> + <key>variable_slider</key> + <param> + <key>id</key> + <value>g</value> + </param> + <param> + <key>_enabled</key> + <value>True</value> + </param> + <param> + <key>label</key> + <value></value> + </param> + <param> + <key>value</key> + <value>43</value> + </param> + <param> + <key>min</key> + <value>0</value> + </param> + <param> + <key>max</key> + <value>100</value> + </param> + <param> + <key>num_steps</key> + <value>100</value> + </param> + <param> + <key>style</key> + <value>wx.SL_HORIZONTAL</value> + </param> + <param> + <key>converver</key> + <value>float_converter</value> + </param> + <param> + <key>grid_pos</key> + <value></value> + </param> + <param> + <key>notebook</key> + <value></value> + </param> + <param> + <key>alias</key> + <value></value> + </param> + <param> + <key>_coordinate</key> + <value>(215, 29)</value> + </param> + <param> + <key>_rotation</key> + <value>0</value> + </param> + </block> + <block> + <key>clk_offset_corrector</key> + <param> + <key>id</key> + <value>clk_offset_corrector_0</value> + </param> + <param> + <key>_enabled</key> + <value>True</value> + </param> + <param> + <key>ppm</key> + <value>0</value> + </param> + <param> + <key>samp_rate</key> + <value>samp_rate</value> + </param> + <param> + <key>fc</key> + <value>936.6e6</value> + </param> + <param> + <key>alias</key> + <value></value> + </param> + <param> + <key>affinity</key> + <value></value> + </param> + <param> + <key>minoutbuf</key> + <value>0</value> + </param> + <param> + <key>maxoutbuf</key> + <value>0</value> + </param> + <param> + <key>_coordinate</key> + <value>(381, 306)</value> + </param> + <param> + <key>_rotation</key> + <value>0</value> + </param> + </block> + <block> + <key>gsm_get_bcch_or_ccch_bursts</key> + <param> + <key>id</key> + <value>gsm_get_bcch_or_ccch_bursts_0</value> + </param> + <param> + <key>_enabled</key> + <value>True</value> + </param> + <param> + <key>d_fn51_start</key> + <value>2</value> + </param> + <param> + <key>alias</key> + <value></value> + </param> + <param> + <key>affinity</key> + <value></value> + </param> + <param> + <key>minoutbuf</key> + <value>0</value> + </param> + <param> + <key>maxoutbuf</key> + <value>0</value> + </param> + <param> + <key>_coordinate</key> + <value>(793, 304)</value> + </param> + <param> + <key>_rotation</key> + <value>0</value> + </param> + </block> + <block> + <key>gsm_control_channels_decoder</key> + <param> + <key>id</key> + <value>gsm_control_channels_decoder_0</value> + </param> + <param> + <key>_enabled</key> + <value>True</value> + </param> + <param> + <key>alias</key> + <value></value> + </param> + <param> + <key>affinity</key> + <value></value> + </param> + <param> + <key>minoutbuf</key> + <value>0</value> + </param> + <param> + <key>maxoutbuf</key> + <value>0</value> + </param> + <param> + <key>_coordinate</key> + <value>(1035, 308)</value> + </param> + <param> + <key>_rotation</key> + <value>0</value> + </param> + </block> + <block> + <key>gsm_message_printer</key> + <param> + <key>id</key> + <value>gsm_message_printer_0</value> + </param> + <param> + <key>_enabled</key> + <value>True</value> + </param> + <param> + <key>alias</key> + <value></value> + </param> + <param> + <key>affinity</key> + <value></value> + </param> + <param> + <key>_coordinate</key> + <value>(1072, 371)</value> + </param> + <param> + <key>_rotation</key> + <value>0</value> + </param> + </block> + <block> + <key>variable_slider</key> + <param> + <key>id</key> + <value>ppm</value> + </param> + <param> + <key>_enabled</key> + <value>True</value> + </param> + <param> + <key>label</key> + <value></value> + </param> + <param> + <key>value</key> + <value>0</value> + </param> + <param> + <key>min</key> + <value>-50</value> + </param> + <param> + <key>max</key> + <value>50</value> + </param> + <param> + <key>num_steps</key> + <value>100</value> + </param> + <param> + <key>style</key> + <value>wx.SL_HORIZONTAL</value> + </param> + <param> + <key>converver</key> + <value>float_converter</value> + </param> + <param> + <key>grid_pos</key> + <value></value> + </param> + <param> + <key>notebook</key> + <value></value> + </param> + <param> + <key>alias</key> + <value></value> + </param> + <param> + <key>_coordinate</key> + <value>(462, 28)</value> + </param> + <param> + <key>_rotation</key> + <value>0</value> + </param> + </block> + <block> + <key>gsm_receiver_hier</key> + <param> + <key>id</key> + <value>gsm_receiver_hier_0</value> + </param> + <param> + <key>_enabled</key> + <value>True</value> + </param> + <param> + <key>input_rate</key> + <value>samp_rate</value> + </param> + <param> + <key>osr</key> + <value>4</value> + </param> + <param> + <key>arfcn</key> + <value>0</value> + </param> + <param> + <key>alias</key> + <value></value> + </param> + <param> + <key>affinity</key> + <value></value> + </param> + <param> + <key>minoutbuf</key> + <value>0</value> + </param> + <param> + <key>maxoutbuf</key> + <value>0</value> + </param> + <param> + <key>_coordinate</key> + <value>(585, 306)</value> + </param> + <param> + <key>_rotation</key> + <value>0</value> + </param> + </block> + <block> + <key>gsm_clock_offset_control</key> + <param> + <key>id</key> + <value>gsm_clock_offset_control_0</value> + </param> + <param> + <key>_enabled</key> + <value>True</value> + </param> + <param> + <key>fc</key> + <value>fc</value> + </param> + <param> + <key>samp_rate</key> + <value>samp_rate</value> + </param> + <param> + <key>alias</key> + <value></value> + </param> + <param> + <key>affinity</key> + <value></value> + </param> + <param> + <key>minoutbuf</key> + <value>0</value> + </param> + <param> + <key>maxoutbuf</key> + <value>0</value> + </param> + <param> + <key>_coordinate</key> + <value>(488, 171)</value> + </param> + <param> + <key>_rotation</key> + <value>0</value> + </param> + </block> + <block> + <key>wxgui_fftsink2</key> + <param> + <key>id</key> + <value>wxgui_fftsink2_0</value> + </param> + <param> + <key>_enabled</key> + <value>True</value> + </param> + <param> + <key>type</key> + <value>complex</value> + </param> + <param> + <key>title</key> + <value>FFT Plot</value> + </param> + <param> + <key>samp_rate</key> + <value>samp_rate</value> + </param> + <param> + <key>baseband_freq</key> + <value>0</value> + </param> + <param> + <key>y_per_div</key> + <value>10</value> + </param> + <param> + <key>y_divs</key> + <value>10</value> + </param> + <param> + <key>ref_level</key> + <value>0</value> + </param> + <param> + <key>ref_scale</key> + <value>2.0</value> + </param> + <param> + <key>fft_size</key> + <value>1024</value> + </param> + <param> + <key>fft_rate</key> + <value>15</value> + </param> + <param> + <key>peak_hold</key> + <value>False</value> + </param> + <param> + <key>average</key> + <value>False</value> + </param> + <param> + <key>avg_alpha</key> + <value>0</value> + </param> + <param> + <key>win</key> + <value>None</value> + </param> + <param> + <key>win_size</key> + <value></value> + </param> + <param> + <key>grid_pos</key> + <value></value> + </param> + <param> + <key>notebook</key> + <value></value> + </param> + <param> + <key>freqvar</key> + <value>None</value> + </param> + <param> + <key>alias</key> + <value></value> + </param> + <param> + <key>affinity</key> + <value></value> + </param> + <param> + <key>_coordinate</key> + <value>(585, 386)</value> + </param> + <param> + <key>_rotation</key> + <value>0</value> + </param> + </block> + <block> + <key>rtlsdr_source</key> + <param> + <key>id</key> + <value>rtlsdr_source_0</value> + </param> + <param> + <key>_enabled</key> + <value>True</value> + </param> + <param> + <key>type</key> + <value>fc32</value> + </param> + <param> + <key>args</key> + <value></value> + </param> + <param> + <key>nchan</key> + <value>1</value> + </param> + <param> + <key>sample_rate</key> + <value>samp_rate</value> + </param> + <param> + <key>freq0</key> + <value>fc</value> + </param> + <param> + <key>corr0</key> + <value>ppm</value> + </param> + <param> + <key>dc_offset_mode0</key> + <value>0</value> + </param> + <param> + <key>iq_balance_mode0</key> + <value>0</value> + </param> + <param> + <key>gain_mode0</key> + <value>True</value> + </param> + <param> + <key>gain0</key> + <value>g</value> + </param> + <param> + <key>if_gain0</key> + <value>20</value> + </param> + <param> + <key>bb_gain0</key> + <value>20</value> + </param> + <param> + <key>ant0</key> + <value></value> + </param> + <param> + <key>bw0</key> + <value>250e3</value> + </param> + <param> + <key>freq1</key> + <value>100e6</value> + </param> + <param> + <key>corr1</key> + <value>0</value> + </param> + <param> + <key>dc_offset_mode1</key> + <value>0</value> + </param> + <param> + <key>iq_balance_mode1</key> + <value>0</value> + </param> + <param> + <key>gain_mode1</key> + <value>0</value> + </param> + <param> + <key>gain1</key> + <value>10</value> + </param> + <param> + <key>if_gain1</key> + <value>20</value> + </param> + <param> + <key>bb_gain1</key> + <value>20</value> + </param> + <param> + <key>ant1</key> + <value></value> + </param> + <param> + <key>bw1</key> + <value>0</value> + </param> + <param> + <key>freq2</key> + <value>100e6</value> + </param> + <param> + <key>corr2</key> + <value>0</value> + </param> + <param> + <key>dc_offset_mode2</key> + <value>0</value> + </param> + <param> + <key>iq_balance_mode2</key> + <value>0</value> + </param> + <param> + <key>gain_mode2</key> + <value>0</value> + </param> + <param> + <key>gain2</key> + <value>10</value> + </param> + <param> + <key>if_gain2</key> + <value>20</value> + </param> + <param> + <key>bb_gain2</key> + <value>20</value> + </param> + <param> + <key>ant2</key> + <value></value> + </param> + <param> + <key>bw2</key> + <value>0</value> + </param> + <param> + <key>freq3</key> + <value>100e6</value> + </param> + <param> + <key>corr3</key> + <value>0</value> + </param> + <param> + <key>dc_offset_mode3</key> + <value>0</value> + </param> + <param> + <key>iq_balance_mode3</key> + <value>0</value> + </param> + <param> + <key>gain_mode3</key> + <value>0</value> + </param> + <param> + <key>gain3</key> + <value>10</value> + </param> + <param> + <key>if_gain3</key> + <value>20</value> + </param> + <param> + <key>bb_gain3</key> + <value>20</value> + </param> + <param> + <key>ant3</key> + <value></value> + </param> + <param> + <key>bw3</key> + <value>0</value> + </param> + <param> + <key>freq4</key> + <value>100e6</value> + </param> + <param> + <key>corr4</key> + <value>0</value> + </param> + <param> + <key>dc_offset_mode4</key> + <value>0</value> + </param> + <param> + <key>iq_balance_mode4</key> + <value>0</value> + </param> + <param> + <key>gain_mode4</key> + <value>0</value> + </param> + <param> + <key>gain4</key> + <value>10</value> + </param> + <param> + <key>if_gain4</key> + <value>20</value> + </param> + <param> + <key>bb_gain4</key> + <value>20</value> + </param> + <param> + <key>ant4</key> + <value></value> + </param> + <param> + <key>bw4</key> + <value>0</value> + </param> + <param> + <key>alias</key> + <value></value> + </param> + <param> + <key>affinity</key> + <value></value> + </param> + <param> + <key>minoutbuf</key> + <value>0</value> + </param> + <param> + <key>maxoutbuf</key> + <value>0</value> + </param> + <param> + <key>_coordinate</key> + <value>(112, 233)</value> + </param> + <param> + <key>_rotation</key> + <value>0</value> + </param> + </block> + <connection> + <source_block_id>rtlsdr_source_0</source_block_id> + <sink_block_id>clk_offset_corrector_0</sink_block_id> + <source_key>0</source_key> + <sink_key>0</sink_key> + </connection> + <connection> + <source_block_id>gsm_clock_offset_control_0</source_block_id> + <sink_block_id>clk_offset_corrector_0</sink_block_id> + <source_key>ppm</source_key> + <sink_key>ppm_msg</sink_key> + </connection> + <connection> + <source_block_id>clk_offset_corrector_0</source_block_id> + <sink_block_id>wxgui_fftsink2_0</sink_block_id> + <source_key>0</source_key> + <sink_key>0</sink_key> + </connection> + <connection> + <source_block_id>clk_offset_corrector_0</source_block_id> + <sink_block_id>gsm_receiver_hier_0</sink_block_id> + <source_key>0</source_key> + <sink_key>0</sink_key> + </connection> + <connection> + <source_block_id>gsm_receiver_hier_0</source_block_id> + <sink_block_id>gsm_get_bcch_or_ccch_bursts_0</sink_block_id> + <source_key>bursts</source_key> + <sink_key>bursts</sink_key> + </connection> + <connection> + <source_block_id>gsm_get_bcch_or_ccch_bursts_0</source_block_id> + <sink_block_id>gsm_control_channels_decoder_0</sink_block_id> + <source_key>bursts</source_key> + <sink_key>bursts</sink_key> + </connection> + <connection> + <source_block_id>gsm_control_channels_decoder_0</source_block_id> + <sink_block_id>gsm_message_printer_0</sink_block_id> + <source_key>msgs</source_key> + <sink_key>msgs</sink_key> + </connection> + <connection> + <source_block_id>gsm_receiver_hier_0</source_block_id> + <sink_block_id>gsm_clock_offset_control_0</sink_block_id> + <source_key>measurements</source_key> + <sink_key>measurements</sink_key> + </connection> +</flow_graph> diff --git a/examples/receiver_usrp.grc b/examples/receiver_usrp.grc index c4bb2c1..b63151e 100644 --- a/examples/receiver_usrp.grc +++ b/examples/receiver_usrp.grc @@ -1,6 +1,6 @@ <?xml version='1.0' encoding='ASCII'?> <flow_graph> - <timestamp>Mon Aug 4 09:35:59 2014</timestamp> + <timestamp>Tue Aug 5 12:58:13 2014</timestamp> <block> <key>options</key> <param> @@ -131,105 +131,6 @@ </param> </block> <block> - <key>wxgui_fftsink2</key> - <param> - <key>id</key> - <value>wxgui_fftsink2_0</value> - </param> - <param> - <key>_enabled</key> - <value>True</value> - </param> - <param> - <key>type</key> - <value>complex</value> - </param> - <param> - <key>title</key> - <value>FFT Plot</value> - </param> - <param> - <key>samp_rate</key> - <value>samp_rate</value> - </param> - <param> - <key>baseband_freq</key> - <value>fc</value> - </param> - <param> - <key>y_per_div</key> - <value>10</value> - </param> - <param> - <key>y_divs</key> - <value>10</value> - </param> - <param> - <key>ref_level</key> - <value>0</value> - </param> - <param> - <key>ref_scale</key> - <value>2.0</value> - </param> - <param> - <key>fft_size</key> - <value>1024</value> - </param> - <param> - <key>fft_rate</key> - <value>15</value> - </param> - <param> - <key>peak_hold</key> - <value>False</value> - </param> - <param> - <key>average</key> - <value>False</value> - </param> - <param> - <key>avg_alpha</key> - <value>0</value> - </param> - <param> - <key>win</key> - <value>None</value> - </param> - <param> - <key>win_size</key> - <value></value> - </param> - <param> - <key>grid_pos</key> - <value>1,1,1,1</value> - </param> - <param> - <key>notebook</key> - <value></value> - </param> - <param> - <key>freqvar</key> - <value>None</value> - </param> - <param> - <key>alias</key> - <value></value> - </param> - <param> - <key>affinity</key> - <value></value> - </param> - <param> - <key>_coordinate</key> - <value>(444, 366)</value> - </param> - <param> - <key>_rotation</key> - <value>0</value> - </param> - </block> - <block> <key>variable_slider</key> <param> <key>id</key> @@ -1035,33 +936,6 @@ </param> </block> <block> - <key>gsm_bursts_printer</key> - <param> - <key>id</key> - <value>gsm_bursts_printer_1</value> - </param> - <param> - <key>_enabled</key> - <value>False</value> - </param> - <param> - <key>alias</key> - <value></value> - </param> - <param> - <key>affinity</key> - <value></value> - </param> - <param> - <key>_coordinate</key> - <value>(688, 272)</value> - </param> - <param> - <key>_rotation</key> - <value>0</value> - </param> - </block> - <block> <key>gsm_receiver_hier</key> <param> <key>id</key> @@ -1140,7 +1014,7 @@ </param> <param> <key>_coordinate</key> - <value>(664, 346)</value> + <value>(681, 268)</value> </param> <param> <key>_rotation</key> @@ -1175,7 +1049,133 @@ </param> <param> <key>_coordinate</key> - <value>(955, 350)</value> + <value>(946, 272)</value> + </param> + <param> + <key>_rotation</key> + <value>0</value> + </param> + </block> + <block> + <key>gsm_bursts_printer</key> + <param> + <key>id</key> + <value>gsm_bursts_printer_1</value> + </param> + <param> + <key>_enabled</key> + <value>False</value> + </param> + <param> + <key>alias</key> + <value></value> + </param> + <param> + <key>affinity</key> + <value></value> + </param> + <param> + <key>_coordinate</key> + <value>(717, 162)</value> + </param> + <param> + <key>_rotation</key> + <value>0</value> + </param> + </block> + <block> + <key>wxgui_fftsink2</key> + <param> + <key>id</key> + <value>wxgui_fftsink2_0</value> + </param> + <param> + <key>_enabled</key> + <value>True</value> + </param> + <param> + <key>type</key> + <value>complex</value> + </param> + <param> + <key>title</key> + <value>FFT Plot</value> + </param> + <param> + <key>samp_rate</key> + <value>samp_rate</value> + </param> + <param> + <key>baseband_freq</key> + <value>fc</value> + </param> + <param> + <key>y_per_div</key> + <value>10</value> + </param> + <param> + <key>y_divs</key> + <value>10</value> + </param> + <param> + <key>ref_level</key> + <value>0</value> + </param> + <param> + <key>ref_scale</key> + <value>2.0</value> + </param> + <param> + <key>fft_size</key> + <value>1024</value> + </param> + <param> + <key>fft_rate</key> + <value>15</value> + </param> + <param> + <key>peak_hold</key> + <value>False</value> + </param> + <param> + <key>average</key> + <value>False</value> + </param> + <param> + <key>avg_alpha</key> + <value>0</value> + </param> + <param> + <key>win</key> + <value>None</value> + </param> + <param> + <key>win_size</key> + <value></value> + </param> + <param> + <key>grid_pos</key> + <value>1,1,1,1</value> + </param> + <param> + <key>notebook</key> + <value></value> + </param> + <param> + <key>freqvar</key> + <value>None</value> + </param> + <param> + <key>alias</key> + <value></value> + </param> + <param> + <key>affinity</key> + <value></value> + </param> + <param> + <key>_coordinate</key> + <value>(453, 342)</value> </param> <param> <key>_rotation</key> diff --git a/grc/gsm_extract_system_info.xml b/grc/gsm_extract_system_info.xml index 72434f6..4316d14 100644 --- a/grc/gsm_extract_system_info.xml +++ b/grc/gsm_extract_system_info.xml @@ -2,7 +2,7 @@ <block> <name>extract_system_info</name> <key>gsm_extract_system_info</key> - <category>gsm</category> + <category>GSM</category> <import>import gsm</import> <make>gsm.extract_system_info()</make> diff --git a/examples/gsm_fcch_detector.grc b/hier_blocks/gsm_fcch_detector.grc index 1d69b53..1d69b53 100644 --- a/examples/gsm_fcch_detector.grc +++ b/hier_blocks/gsm_fcch_detector.grc diff --git a/python/receiver_hier.pyc b/python/receiver_hier.pyc Binary files differdeleted file mode 100644 index 87bf0d6..0000000 --- a/python/receiver_hier.pyc +++ /dev/null |