Added new configurable block for demapping of control channels.
diff --git a/examples/receiver_file.grc b/examples/receiver_file.grc
index af657d8..6bc0516 100644
--- a/examples/receiver_file.grc
+++ b/examples/receiver_file.grc
@@ -1,55 +1,32 @@
<?xml version='1.0' encoding='ASCII'?>
+<?grc format='1' created='3.7.6'?>
<flow_graph>
- <timestamp>Thu Nov 6 14:42:26 2014</timestamp>
+ <timestamp>Wed Aug 13 19:03:06 2014</timestamp>
<block>
- <key>options</key>
+ <key>parameter</key>
<param>
<key>id</key>
- <value>gsm_receiver_file</value>
+ <value>input_file_name</value>
</param>
<param>
<key>_enabled</key>
<value>True</value>
</param>
<param>
- <key>title</key>
- <value></value>
+ <key>label</key>
+ <value>input_file_name</value>
</param>
<param>
- <key>author</key>
- <value></value>
+ <key>value</key>
+ <value>input.cfile</value>
</param>
<param>
- <key>description</key>
- <value></value>
+ <key>type</key>
+ <value>string</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>run</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>
+ <key>short_id</key>
+ <value>i</value>
</param>
<param>
<key>alias</key>
@@ -57,7 +34,196 @@
</param>
<param>
<key>_coordinate</key>
- <value>(10, 10)</value>
+ <value>(184, -5)</value>
+ </param>
+ <param>
+ <key>_rotation</key>
+ <value>0</value>
+ </param>
+ </block>
+ <block>
+ <key>variable</key>
+ <param>
+ <key>id</key>
+ <value>AGCH</value>
+ </param>
+ <param>
+ <key>_enabled</key>
+ <value>True</value>
+ </param>
+ <param>
+ <key>value</key>
+ <value>4</value>
+ </param>
+ <param>
+ <key>alias</key>
+ <value></value>
+ </param>
+ <param>
+ <key>_coordinate</key>
+ <value>(808, -5)</value>
+ </param>
+ <param>
+ <key>_rotation</key>
+ <value>0</value>
+ </param>
+ </block>
+ <block>
+ <key>variable</key>
+ <param>
+ <key>id</key>
+ <value>PCH</value>
+ </param>
+ <param>
+ <key>_enabled</key>
+ <value>True</value>
+ </param>
+ <param>
+ <key>value</key>
+ <value>5</value>
+ </param>
+ <param>
+ <key>alias</key>
+ <value></value>
+ </param>
+ <param>
+ <key>_coordinate</key>
+ <value>(872, -5)</value>
+ </param>
+ <param>
+ <key>_rotation</key>
+ <value>0</value>
+ </param>
+ </block>
+ <block>
+ <key>variable</key>
+ <param>
+ <key>id</key>
+ <value>RACH</value>
+ </param>
+ <param>
+ <key>_enabled</key>
+ <value>True</value>
+ </param>
+ <param>
+ <key>value</key>
+ <value>3</value>
+ </param>
+ <param>
+ <key>alias</key>
+ <value></value>
+ </param>
+ <param>
+ <key>_coordinate</key>
+ <value>(744, -5)</value>
+ </param>
+ <param>
+ <key>_rotation</key>
+ <value>0</value>
+ </param>
+ </block>
+ <block>
+ <key>variable</key>
+ <param>
+ <key>id</key>
+ <value>SDCCH</value>
+ </param>
+ <param>
+ <key>_enabled</key>
+ <value>True</value>
+ </param>
+ <param>
+ <key>value</key>
+ <value>6</value>
+ </param>
+ <param>
+ <key>alias</key>
+ <value></value>
+ </param>
+ <param>
+ <key>_coordinate</key>
+ <value>(936, -5)</value>
+ </param>
+ <param>
+ <key>_rotation</key>
+ <value>0</value>
+ </param>
+ </block>
+ <block>
+ <key>variable</key>
+ <param>
+ <key>id</key>
+ <value>CCCH</value>
+ </param>
+ <param>
+ <key>_enabled</key>
+ <value>True</value>
+ </param>
+ <param>
+ <key>value</key>
+ <value>2</value>
+ </param>
+ <param>
+ <key>alias</key>
+ <value></value>
+ </param>
+ <param>
+ <key>_coordinate</key>
+ <value>(680, -5)</value>
+ </param>
+ <param>
+ <key>_rotation</key>
+ <value>0</value>
+ </param>
+ </block>
+ <block>
+ <key>variable</key>
+ <param>
+ <key>id</key>
+ <value>BCCH</value>
+ </param>
+ <param>
+ <key>_enabled</key>
+ <value>True</value>
+ </param>
+ <param>
+ <key>value</key>
+ <value>1</value>
+ </param>
+ <param>
+ <key>alias</key>
+ <value></value>
+ </param>
+ <param>
+ <key>_coordinate</key>
+ <value>(616, -5)</value>
+ </param>
+ <param>
+ <key>_rotation</key>
+ <value>0</value>
+ </param>
+ </block>
+ <block>
+ <key>variable</key>
+ <param>
+ <key>id</key>
+ <value>CHANNEL_UNKNOWN</value>
+ </param>
+ <param>
+ <key>_enabled</key>
+ <value>True</value>
+ </param>
+ <param>
+ <key>value</key>
+ <value>0</value>
+ </param>
+ <param>
+ <key>alias</key>
+ <value></value>
+ </param>
+ <param>
+ <key>_coordinate</key>
+ <value>(480, -5)</value>
</param>
<param>
<key>_rotation</key>
@@ -96,7 +262,7 @@
</param>
<param>
<key>_coordinate</key>
- <value>(311, 10)</value>
+ <value>(296, -5)</value>
</param>
<param>
<key>_rotation</key>
@@ -135,7 +301,7 @@
</param>
<param>
<key>_coordinate</key>
- <value>(656, 8)</value>
+ <value>(376, -5)</value>
</param>
<param>
<key>_rotation</key>
@@ -143,155 +309,62 @@
</param>
</block>
<block>
- <key>gsm_message_printer</key>
+ <key>options</key>
<param>
<key>id</key>
- <value>gsm_message_printer_0</value>
+ <value>gsm_receiver_file</value>
</param>
<param>
<key>_enabled</key>
<value>True</value>
</param>
<param>
- <key>alias</key>
+ <key>title</key>
<value></value>
</param>
<param>
- <key>affinity</key>
+ <key>author</key>
<value></value>
</param>
<param>
- <key>_coordinate</key>
- <value>(1130, 196)</value>
+ <key>description</key>
+ <value></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>
+ <key>window_size</key>
+ <value>1280, 1024</value>
</param>
<param>
- <key>_enabled</key>
+ <key>generate_options</key>
+ <value>no_gui</value>
+ </param>
+ <param>
+ <key>category</key>
+ <value>Custom</value>
+ </param>
+ <param>
+ <key>run_options</key>
+ <value>run</value>
+ </param>
+ <param>
+ <key>run</key>
<value>True</value>
</param>
<param>
- <key>alias</key>
+ <key>max_nouts</key>
+ <value>0</value>
+ </param>
+ <param>
+ <key>realtime_scheduling</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>(908, 196)</value>
- </param>
- <param>
- <key>_rotation</key>
- <value>0</value>
- </param>
- </block>
- <block>
- <key>blocks_socket_pdu</key>
- <param>
- <key>id</key>
- <value>blocks_socket_pdu_0</value>
- </param>
- <param>
- <key>_enabled</key>
- <value>True</value>
- </param>
- <param>
- <key>type</key>
- <value>"UDP_CLIENT"</value>
- </param>
- <param>
- <key>host</key>
- <value>127.0.0.1</value>
- </param>
- <param>
- <key>port</key>
- <value>4729</value>
- </param>
- <param>
- <key>mtu</key>
- <value>10000</value>
- </param>
- <param>
- <key>tcp_no_delay</key>
- <value>False</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>(1138, 278)</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>(637, 192)</value>
+ <value>(0, -5)</value>
</param>
<param>
<key>_rotation</key>
@@ -334,7 +407,7 @@
</param>
<param>
<key>_coordinate</key>
- <value>(261, 307)</value>
+ <value>(240, 219)</value>
</param>
<param>
<key>_rotation</key>
@@ -342,57 +415,6 @@
</param>
</block>
<block>
- <key>gsm_receiver</key>
- <param>
- <key>id</key>
- <value>gsm_receiver_0</value>
- </param>
- <param>
- <key>_enabled</key>
- <value>True</value>
- </param>
- <param>
- <key>osr</key>
- <value>4</value>
- </param>
- <param>
- <key>cell_allocation</key>
- <value>[0]</value>
- </param>
- <param>
- <key>tseq_nums</key>
- <value>[]</value>
- </param>
- <param>
- <key>num_streams</key>
- <value>1</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>(414, 196)</value>
- </param>
- <param>
- <key>_rotation</key>
- <value>0</value>
- </param>
- </block>
- <block>
<key>gsm_input</key>
<param>
<key>id</key>
@@ -407,14 +429,14 @@
<value>0</value>
</param>
<param>
- <key>fc</key>
- <value>fc</value>
- </param>
- <param>
<key>osr</key>
<value>4</value>
</param>
<param>
+ <key>fc</key>
+ <value>fc</value>
+ </param>
+ <param>
<key>samp_rate_in</key>
<value>samp_rate</value>
</param>
@@ -436,46 +458,7 @@
</param>
<param>
<key>_coordinate</key>
- <value>(226, 213)</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>(193, 11)</value>
+ <value>(176, 128)</value>
</param>
<param>
<key>_rotation</key>
@@ -526,7 +509,163 @@
</param>
<param>
<key>_coordinate</key>
- <value>(15, 201)</value>
+ <value>(-8, 115)</value>
+ </param>
+ <param>
+ <key>_rotation</key>
+ <value>0</value>
+ </param>
+ </block>
+ <block>
+ <key>gsm_receiver</key>
+ <param>
+ <key>id</key>
+ <value>gsm_receiver_0</value>
+ </param>
+ <param>
+ <key>_enabled</key>
+ <value>True</value>
+ </param>
+ <param>
+ <key>osr</key>
+ <value>4</value>
+ </param>
+ <param>
+ <key>cell_allocation</key>
+ <value>[0]</value>
+ </param>
+ <param>
+ <key>tseq_nums</key>
+ <value>[]</value>
+ </param>
+ <param>
+ <key>num_streams</key>
+ <value>1</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>(352, 112)</value>
+ </param>
+ <param>
+ <key>_rotation</key>
+ <value>0</value>
+ </param>
+ </block>
+ <block>
+ <key>gsm_universal_ctrl_chans_demapper</key>
+ <param>
+ <key>id</key>
+ <value>gsm_universal_ctrl_chans_demapper_0</value>
+ </param>
+ <param>
+ <key>_enabled</key>
+ <value>True</value>
+ </param>
+ <param>
+ <key>starts_fn_mod51</key>
+ <value>[2,6,12,16,22,26,32,36,42,46]</value>
+ </param>
+ <param>
+ <key>channel_types</key>
+ <value>[BCCH,CCCH,CCCH,CCCH,CCCH,CCCH,CCCH,CCCH,CCCH,CCCH]</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>(536, 112)</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>(784, 112)</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>(1000, 112)</value>
</param>
<param>
<key>_rotation</key>
@@ -540,44 +679,38 @@
<sink_key>measurements</sink_key>
</connection>
<connection>
- <source_block_id>gsm_receiver_0</source_block_id>
- <sink_block_id>gsm_get_bcch_or_ccch_bursts_0</sink_block_id>
- <source_key>C0</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_control_channels_decoder_0</source_block_id>
- <sink_block_id>blocks_socket_pdu_0</sink_block_id>
- <source_key>msgs</source_key>
- <sink_key>pdus</sink_key>
- </connection>
- <connection>
- <source_block_id>blocks_file_source_0</source_block_id>
- <sink_block_id>gsm_input_0</sink_block_id>
+ <source_block_id>gsm_input_0</source_block_id>
+ <sink_block_id>gsm_receiver_0</sink_block_id>
<source_key>0</source_key>
<sink_key>0</sink_key>
</connection>
<connection>
+ <source_block_id>gsm_universal_ctrl_chans_demapper_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_0</source_block_id>
+ <sink_block_id>gsm_universal_ctrl_chans_demapper_0</sink_block_id>
+ <source_key>C0</source_key>
+ <sink_key>bursts</sink_key>
+ </connection>
+ <connection>
<source_block_id>gsm_clock_offset_control_0</source_block_id>
<sink_block_id>gsm_input_0</sink_block_id>
<source_key>ppm</source_key>
<sink_key>ppm_in</sink_key>
</connection>
<connection>
- <source_block_id>gsm_input_0</source_block_id>
- <sink_block_id>gsm_receiver_0</sink_block_id>
+ <source_block_id>blocks_file_source_0</source_block_id>
+ <sink_block_id>gsm_input_0</sink_block_id>
<source_key>0</source_key>
<sink_key>0</sink_key>
</connection>
diff --git a/examples/receiver_rtlsdr.grc b/examples/receiver_rtlsdr.grc
index beee92d..ae68d08 100644
--- a/examples/receiver_rtlsdr.grc
+++ b/examples/receiver_rtlsdr.grc
@@ -1,4 +1,5 @@
<?xml version='1.0' encoding='ASCII'?>
+<?grc format='1' created='3.7.6'?>
<flow_graph>
<timestamp>Thu Nov 6 14:43:22 2014</timestamp>
<block>
@@ -68,6 +69,114 @@
<key>variable</key>
<param>
<key>id</key>
+ <value>AGCH</value>
+ </param>
+ <param>
+ <key>_enabled</key>
+ <value>True</value>
+ </param>
+ <param>
+ <key>value</key>
+ <value>4</value>
+ </param>
+ <param>
+ <key>alias</key>
+ <value></value>
+ </param>
+ <param>
+ <key>_coordinate</key>
+ <value>(944, 11)</value>
+ </param>
+ <param>
+ <key>_rotation</key>
+ <value>0</value>
+ </param>
+ </block>
+ <block>
+ <key>variable</key>
+ <param>
+ <key>id</key>
+ <value>RACH</value>
+ </param>
+ <param>
+ <key>_enabled</key>
+ <value>True</value>
+ </param>
+ <param>
+ <key>value</key>
+ <value>3</value>
+ </param>
+ <param>
+ <key>alias</key>
+ <value></value>
+ </param>
+ <param>
+ <key>_coordinate</key>
+ <value>(880, 11)</value>
+ </param>
+ <param>
+ <key>_rotation</key>
+ <value>0</value>
+ </param>
+ </block>
+ <block>
+ <key>variable</key>
+ <param>
+ <key>id</key>
+ <value>SDCCH</value>
+ </param>
+ <param>
+ <key>_enabled</key>
+ <value>True</value>
+ </param>
+ <param>
+ <key>value</key>
+ <value>6</value>
+ </param>
+ <param>
+ <key>alias</key>
+ <value></value>
+ </param>
+ <param>
+ <key>_coordinate</key>
+ <value>(1072, 11)</value>
+ </param>
+ <param>
+ <key>_rotation</key>
+ <value>0</value>
+ </param>
+ </block>
+ <block>
+ <key>variable</key>
+ <param>
+ <key>id</key>
+ <value>PCH</value>
+ </param>
+ <param>
+ <key>_enabled</key>
+ <value>True</value>
+ </param>
+ <param>
+ <key>value</key>
+ <value>5</value>
+ </param>
+ <param>
+ <key>alias</key>
+ <value></value>
+ </param>
+ <param>
+ <key>_coordinate</key>
+ <value>(1008, 11)</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>
@@ -92,6 +201,87 @@
</param>
</block>
<block>
+ <key>variable</key>
+ <param>
+ <key>id</key>
+ <value>CCCH</value>
+ </param>
+ <param>
+ <key>_enabled</key>
+ <value>True</value>
+ </param>
+ <param>
+ <key>value</key>
+ <value>2</value>
+ </param>
+ <param>
+ <key>alias</key>
+ <value></value>
+ </param>
+ <param>
+ <key>_coordinate</key>
+ <value>(816, 11)</value>
+ </param>
+ <param>
+ <key>_rotation</key>
+ <value>0</value>
+ </param>
+ </block>
+ <block>
+ <key>variable</key>
+ <param>
+ <key>id</key>
+ <value>CHANNEL_UNKNOWN</value>
+ </param>
+ <param>
+ <key>_enabled</key>
+ <value>True</value>
+ </param>
+ <param>
+ <key>value</key>
+ <value>0</value>
+ </param>
+ <param>
+ <key>alias</key>
+ <value></value>
+ </param>
+ <param>
+ <key>_coordinate</key>
+ <value>(616, 11)</value>
+ </param>
+ <param>
+ <key>_rotation</key>
+ <value>0</value>
+ </param>
+ </block>
+ <block>
+ <key>variable</key>
+ <param>
+ <key>id</key>
+ <value>BCCH</value>
+ </param>
+ <param>
+ <key>_enabled</key>
+ <value>True</value>
+ </param>
+ <param>
+ <key>value</key>
+ <value>1</value>
+ </param>
+ <param>
+ <key>alias</key>
+ <value></value>
+ </param>
+ <param>
+ <key>_coordinate</key>
+ <value>(752, 11)</value>
+ </param>
+ <param>
+ <key>_rotation</key>
+ <value>0</value>
+ </param>
+ </block>
+ <block>
<key>gsm_message_printer</key>
<param>
<key>id</key>
@@ -119,80 +309,6 @@
</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>(650, 226)</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>(910, 230)</value>
- </param>
- <param>
- <key>_rotation</key>
- <value>0</value>
- </param>
- </block>
- <block>
<key>blocks_socket_pdu</key>
<param>
<key>id</key>
@@ -698,6 +814,10 @@
<value>1024</value>
</param>
<param>
+ <key>freqhalf</key>
+ <value>True</value>
+ </param>
+ <param>
<key>wintype</key>
<value>firdes.WIN_BLACKMAN_hARRIS</value>
</param>
@@ -746,6 +866,22 @@
<value>True</value>
</param>
<param>
+ <key>tr_mode</key>
+ <value>qtgui.TRIG_MODE_FREE</value>
+ </param>
+ <param>
+ <key>tr_level</key>
+ <value>0.0</value>
+ </param>
+ <param>
+ <key>tr_chan</key>
+ <value>0</value>
+ </param>
+ <param>
+ <key>tr_tag</key>
+ <value>""</value>
+ </param>
+ <param>
<key>label1</key>
<value></value>
</param>
@@ -974,6 +1110,92 @@
</param>
</block>
<block>
+ <key>gsm_input</key>
+ <param>
+ <key>id</key>
+ <value>gsm_input_0</value>
+ </param>
+ <param>
+ <key>_enabled</key>
+ <value>True</value>
+ </param>
+ <param>
+ <key>ppm</key>
+ <value>0</value>
+ </param>
+ <param>
+ <key>fc</key>
+ <value>fc</value>
+ </param>
+ <param>
+ <key>osr</key>
+ <value>4</value>
+ </param>
+ <param>
+ <key>samp_rate_in</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>(268, 247)</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>(910, 230)</value>
+ </param>
+ <param>
+ <key>_rotation</key>
+ <value>0</value>
+ </param>
+ </block>
+ <block>
<key>gsm_receiver</key>
<param>
<key>id</key>
@@ -1025,30 +1247,22 @@
</param>
</block>
<block>
- <key>gsm_input</key>
+ <key>gsm_universal_ctrl_chans_demapper</key>
<param>
<key>id</key>
- <value>gsm_input_0</value>
+ <value>gsm_universal_ctrl_chans_demapper_0</value>
</param>
<param>
<key>_enabled</key>
<value>True</value>
</param>
<param>
- <key>ppm</key>
- <value>0</value>
+ <key>starts_fn_mod51</key>
+ <value>[2,6,12,16,22,26,32,36,42,46]</value>
</param>
<param>
- <key>fc</key>
- <value>fc</value>
- </param>
- <param>
- <key>osr</key>
- <value>4</value>
- </param>
- <param>
- <key>samp_rate_in</key>
- <value>samp_rate</value>
+ <key>channel_types</key>
+ <value>[BCCH,CCCH,CCCH,CCCH,CCCH,CCCH,CCCH,CCCH,CCCH,CCCH]</value>
</param>
<param>
<key>alias</key>
@@ -1068,7 +1282,7 @@
</param>
<param>
<key>_coordinate</key>
- <value>(268, 247)</value>
+ <value>(648, 232)</value>
</param>
<param>
<key>_rotation</key>
@@ -1082,12 +1296,6 @@
<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_control_channels_decoder_0</source_block_id>
<sink_block_id>blocks_socket_pdu_0</sink_block_id>
<source_key>msgs</source_key>
@@ -1119,14 +1327,20 @@
</connection>
<connection>
<source_block_id>gsm_receiver_0</source_block_id>
- <sink_block_id>gsm_get_bcch_or_ccch_bursts_0</sink_block_id>
- <source_key>C0</source_key>
+ <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_universal_ctrl_chans_demapper_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_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>
+ <sink_block_id>gsm_universal_ctrl_chans_demapper_0</sink_block_id>
+ <source_key>C0</source_key>
+ <sink_key>bursts</sink_key>
</connection>
</flow_graph>
diff --git a/examples/receiver_usrp.grc b/examples/receiver_usrp.grc
index 7202f10..82f0109 100644
--- a/examples/receiver_usrp.grc
+++ b/examples/receiver_usrp.grc
@@ -1,4 +1,5 @@
<?xml version='1.0' encoding='ASCII'?>
+<?grc format='1' created='3.7.6'?>
<flow_graph>
<timestamp>Thu Nov 6 14:43:18 2014</timestamp>
<block>
@@ -68,6 +69,195 @@
<key>variable</key>
<param>
<key>id</key>
+ <value>CHANNEL_UNKNOWN</value>
+ </param>
+ <param>
+ <key>_enabled</key>
+ <value>True</value>
+ </param>
+ <param>
+ <key>value</key>
+ <value>0</value>
+ </param>
+ <param>
+ <key>alias</key>
+ <value></value>
+ </param>
+ <param>
+ <key>_coordinate</key>
+ <value>(600, 11)</value>
+ </param>
+ <param>
+ <key>_rotation</key>
+ <value>0</value>
+ </param>
+ </block>
+ <block>
+ <key>variable</key>
+ <param>
+ <key>id</key>
+ <value>CCCH</value>
+ </param>
+ <param>
+ <key>_enabled</key>
+ <value>True</value>
+ </param>
+ <param>
+ <key>value</key>
+ <value>2</value>
+ </param>
+ <param>
+ <key>alias</key>
+ <value></value>
+ </param>
+ <param>
+ <key>_coordinate</key>
+ <value>(800, 11)</value>
+ </param>
+ <param>
+ <key>_rotation</key>
+ <value>0</value>
+ </param>
+ </block>
+ <block>
+ <key>variable</key>
+ <param>
+ <key>id</key>
+ <value>AGCH</value>
+ </param>
+ <param>
+ <key>_enabled</key>
+ <value>True</value>
+ </param>
+ <param>
+ <key>value</key>
+ <value>4</value>
+ </param>
+ <param>
+ <key>alias</key>
+ <value></value>
+ </param>
+ <param>
+ <key>_coordinate</key>
+ <value>(928, 11)</value>
+ </param>
+ <param>
+ <key>_rotation</key>
+ <value>0</value>
+ </param>
+ </block>
+ <block>
+ <key>variable</key>
+ <param>
+ <key>id</key>
+ <value>BCCH</value>
+ </param>
+ <param>
+ <key>_enabled</key>
+ <value>True</value>
+ </param>
+ <param>
+ <key>value</key>
+ <value>1</value>
+ </param>
+ <param>
+ <key>alias</key>
+ <value></value>
+ </param>
+ <param>
+ <key>_coordinate</key>
+ <value>(736, 11)</value>
+ </param>
+ <param>
+ <key>_rotation</key>
+ <value>0</value>
+ </param>
+ </block>
+ <block>
+ <key>variable</key>
+ <param>
+ <key>id</key>
+ <value>PCH</value>
+ </param>
+ <param>
+ <key>_enabled</key>
+ <value>True</value>
+ </param>
+ <param>
+ <key>value</key>
+ <value>5</value>
+ </param>
+ <param>
+ <key>alias</key>
+ <value></value>
+ </param>
+ <param>
+ <key>_coordinate</key>
+ <value>(992, 11)</value>
+ </param>
+ <param>
+ <key>_rotation</key>
+ <value>0</value>
+ </param>
+ </block>
+ <block>
+ <key>variable</key>
+ <param>
+ <key>id</key>
+ <value>SDCCH</value>
+ </param>
+ <param>
+ <key>_enabled</key>
+ <value>True</value>
+ </param>
+ <param>
+ <key>value</key>
+ <value>6</value>
+ </param>
+ <param>
+ <key>alias</key>
+ <value></value>
+ </param>
+ <param>
+ <key>_coordinate</key>
+ <value>(1056, 11)</value>
+ </param>
+ <param>
+ <key>_rotation</key>
+ <value>0</value>
+ </param>
+ </block>
+ <block>
+ <key>variable</key>
+ <param>
+ <key>id</key>
+ <value>RACH</value>
+ </param>
+ <param>
+ <key>_enabled</key>
+ <value>True</value>
+ </param>
+ <param>
+ <key>value</key>
+ <value>3</value>
+ </param>
+ <param>
+ <key>alias</key>
+ <value></value>
+ </param>
+ <param>
+ <key>_coordinate</key>
+ <value>(864, 11)</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>
@@ -269,45 +459,6 @@
</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>(674, 268)</value>
- </param>
- <param>
- <key>_rotation</key>
- <value>0</value>
- </param>
- </block>
- <block>
<key>gsm_message_printer</key>
<param>
<key>id</key>
@@ -335,41 +486,6 @@
</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>(916, 272)</value>
- </param>
- <param>
- <key>_rotation</key>
- <value>0</value>
- </param>
- </block>
- <block>
<key>blocks_socket_pdu</key>
<param>
<key>id</key>
@@ -447,6 +563,10 @@
<value>1024</value>
</param>
<param>
+ <key>freqhalf</key>
+ <value>True</value>
+ </param>
+ <param>
<key>wintype</key>
<value>firdes.WIN_BLACKMAN_hARRIS</value>
</param>
@@ -495,6 +615,22 @@
<value>True</value>
</param>
<param>
+ <key>tr_mode</key>
+ <value>qtgui.TRIG_MODE_FREE</value>
+ </param>
+ <param>
+ <key>tr_level</key>
+ <value>0.0</value>
+ </param>
+ <param>
+ <key>tr_chan</key>
+ <value>0</value>
+ </param>
+ <param>
+ <key>tr_tag</key>
+ <value>""</value>
+ </param>
+ <param>
<key>label1</key>
<value></value>
</param>
@@ -1367,57 +1503,6 @@
</param>
</block>
<block>
- <key>gsm_receiver</key>
- <param>
- <key>id</key>
- <value>gsm_receiver_0</value>
- </param>
- <param>
- <key>_enabled</key>
- <value>True</value>
- </param>
- <param>
- <key>osr</key>
- <value>4</value>
- </param>
- <param>
- <key>cell_allocation</key>
- <value>[0]</value>
- </param>
- <param>
- <key>tseq_nums</key>
- <value>[]</value>
- </param>
- <param>
- <key>num_streams</key>
- <value>1</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>(434, 272)</value>
- </param>
- <param>
- <key>_rotation</key>
- <value>0</value>
- </param>
- </block>
- <block>
<key>gsm_input</key>
<param>
<key>id</key>
@@ -1468,6 +1553,135 @@
<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>(916, 272)</value>
+ </param>
+ <param>
+ <key>_rotation</key>
+ <value>0</value>
+ </param>
+ </block>
+ <block>
+ <key>gsm_universal_ctrl_chans_demapper</key>
+ <param>
+ <key>id</key>
+ <value>gsm_universal_ctrl_chans_demapper_0</value>
+ </param>
+ <param>
+ <key>_enabled</key>
+ <value>True</value>
+ </param>
+ <param>
+ <key>starts_fn_mod51</key>
+ <value>[2,6,12,16,22,26,32,36,42,46]</value>
+ </param>
+ <param>
+ <key>channel_types</key>
+ <value>[BCCH,CCCH,CCCH,CCCH,CCCH,CCCH,CCCH,CCCH,CCCH,CCCH]</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>(648, 272)</value>
+ </param>
+ <param>
+ <key>_rotation</key>
+ <value>0</value>
+ </param>
+ </block>
+ <block>
+ <key>gsm_receiver</key>
+ <param>
+ <key>id</key>
+ <value>gsm_receiver_0</value>
+ </param>
+ <param>
+ <key>_enabled</key>
+ <value>True</value>
+ </param>
+ <param>
+ <key>osr</key>
+ <value>4</value>
+ </param>
+ <param>
+ <key>cell_allocation</key>
+ <value>[0]</value>
+ </param>
+ <param>
+ <key>tseq_nums</key>
+ <value>[]</value>
+ </param>
+ <param>
+ <key>num_streams</key>
+ <value>1</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>(434, 272)</value>
+ </param>
+ <param>
+ <key>_rotation</key>
+ <value>0</value>
+ </param>
+ </block>
<connection>
<source_block_id>uhd_usrp_source_0</source_block_id>
<sink_block_id>qtgui_freq_sink_x_0</sink_block_id>
@@ -1475,12 +1689,6 @@
<sink_key>0</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>
@@ -1493,12 +1701,6 @@
<sink_key>pdus</sink_key>
</connection>
<connection>
- <source_block_id>gsm_receiver_0</source_block_id>
- <sink_block_id>gsm_get_bcch_or_ccch_bursts_0</sink_block_id>
- <source_key>C0</source_key>
- <sink_key>bursts</sink_key>
- </connection>
- <connection>
<source_block_id>uhd_usrp_source_0</source_block_id>
<sink_block_id>gsm_input_0</sink_block_id>
<source_key>0</source_key>
@@ -1510,4 +1712,16 @@
<source_key>0</source_key>
<sink_key>0</sink_key>
</connection>
+ <connection>
+ <source_block_id>gsm_universal_ctrl_chans_demapper_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_0</source_block_id>
+ <sink_block_id>gsm_universal_ctrl_chans_demapper_0</sink_block_id>
+ <source_key>C0</source_key>
+ <sink_key>bursts</sink_key>
+ </connection>
</flow_graph>