From 773a194c327c89161b3d11e5246dfea04d9b45dc Mon Sep 17 00:00:00 2001 From: Piotr Krysik Date: Fri, 20 May 2016 12:45:54 +0200 Subject: Big change of the universal control channels demapper: -simplification of the universal demapper, -addition of hierarhical blocks for each of the demappers - so they also look well and readable in python, -addition of helper script for compilation of the demappers. --- hier_blocks/compile_demappers | 37 +++ hier_blocks/demapping/gsm_bcch_ccch_demapper.grc | 292 +++++++++++++++++++++ .../demapping/gsm_bcch_ccch_sdcch4_demapper.grc | 292 +++++++++++++++++++++ hier_blocks/demapping/gsm_sdcch8_demapper.grc | 292 +++++++++++++++++++++ 4 files changed, 913 insertions(+) create mode 100755 hier_blocks/compile_demappers create mode 100644 hier_blocks/demapping/gsm_bcch_ccch_demapper.grc create mode 100644 hier_blocks/demapping/gsm_bcch_ccch_sdcch4_demapper.grc create mode 100644 hier_blocks/demapping/gsm_sdcch8_demapper.grc (limited to 'hier_blocks') diff --git a/hier_blocks/compile_demappers b/hier_blocks/compile_demappers new file mode 100755 index 0000000..96d652b --- /dev/null +++ b/hier_blocks/compile_demappers @@ -0,0 +1,37 @@ +#!/bin/bash + +#This is just helper script for manual compilation of hierarhical blocks +#by gr-gsm developers +#Author: Piotr Krysik + +cd demapping +for p in *.grc +do + echo $p + grcc $p -d `pwd` +done +cd .. + +mv ~/.grc_gnuradio/gsm_* . + +for file in *.py.xml +do + cat $file | sed 's/.*\.*/ import grgsm<\/import>/' \ + | sed 's//grgsm./' \ + | sed "s/.*.py//" \ + | sed 's/.*hier_blocks/gr-gsm\/hier_blocks/' \ + > ${file}2 + + mv ${file}2 $file + + mv "$file" "`basename $file .py.xml`.xml" +done + +for py in *.py +do + cat $py |sed 's/gr.hier_block2/grgsm.hier_block/' > ${py}2 + mv ${py}2 $py +done + +mv *.py ../python/demapping +mv *.xml ../grc/demapping \ No newline at end of file diff --git a/hier_blocks/demapping/gsm_bcch_ccch_demapper.grc b/hier_blocks/demapping/gsm_bcch_ccch_demapper.grc new file mode 100644 index 0000000..faef3dd --- /dev/null +++ b/hier_blocks/demapping/gsm_bcch_ccch_demapper.grc @@ -0,0 +1,292 @@ + + + + Tue May 17 17:08:42 2016 + + options + + author + Piotr Krysik + + + window_size + + + + category + + + + comment + + + + description + Demapper for BCCH + CCCH control channels. This corresponds to channel combination iv specified in GSM 05.02, section 6.4 + + + _enabled + True + + + _coordinate + (8, 8) + + + _rotation + 0 + + + generate_options + hb + + + hier_block_src_path + .: + + + id + gsm_bcch_ccch_demapper + + + max_nouts + 0 + + + qt_qss_theme + + + + realtime_scheduling + + + + run_command + {python} -u {filename} + + + run_options + prompt + + + run + True + + + thread_safe_setters + + + + title + BCCH + CCCH demapper + + + + gsm_universal_ctrl_chans_demapper + + alias + + + + comment + + + + affinity + + + + _enabled + True + + + _coordinate + (168, 193) + + + _rotation + 0 + + + id + gsm_universal_ctrl_chans_demapper_0 + + + maxoutbuf + 0 + + + minoutbuf + 0 + + + downlink_channel_types + [0,0,1,1,1,1,2,2,2,2,0,0,2,2,2,2,2,2,2,2,0,0,2,2,2,2,2,2,2,2,0,0,2,2,2,2,2,2,2,2,0,0,2,2,2,2,2,2,2,2,0,] + + + downlink_starts_fn_mod51 + [0,0,2,2,2,2,6,6,6,6,0,0,12,12,12,12,16,16,16,16,0,0,22,22,22,22,26,26,26,26,0,0,32,32,32,32,36,36,36,36,0,0,42,42,42,42,46,46,46,46,0,] + + + downlink_subslots + [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,] + + + timeslot_nr + timeslot_nr + + + uplink_channel_types + [2,2,2,2,0,0,2,2,2,2,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,2,2,2,2,0,0,2,2,2,2,] + + + uplink_starts_fn_mod51 + [0,0,0,0,0,0,6,6,6,6,10,10,10,10,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,37,37,37,37,41,41,41,41,0,0,47,47,47,47] + + + uplink_subslots + [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,] + + + + pad_sink + + comment + + + + _enabled + True + + + _coordinate + (424, 188) + + + _rotation + 0 + + + id + pad_sink_0 + + + type + message + + + label + bursts + + + num_streams + 1 + + + optional + True + + + vlen + 1 + + + + pad_source + + comment + + + + _enabled + True + + + _coordinate + (32, 188) + + + _rotation + 0 + + + id + pad_source_0 + + + label + bursts + + + num_streams + 1 + + + optional + True + + + type + message + + + vlen + 1 + + + + parameter + + alias + + + + comment + + + + _enabled + True + + + _coordinate + (192, 7) + + + _rotation + 0 + + + id + timeslot_nr + + + label + timeslot_nr + + + short_id + + + + type + intx + + + value + 0 + + + + gsm_universal_ctrl_chans_demapper_0 + pad_sink_0 + bursts + in + + + pad_source_0 + gsm_universal_ctrl_chans_demapper_0 + out + bursts + + diff --git a/hier_blocks/demapping/gsm_bcch_ccch_sdcch4_demapper.grc b/hier_blocks/demapping/gsm_bcch_ccch_sdcch4_demapper.grc new file mode 100644 index 0000000..ad5c751 --- /dev/null +++ b/hier_blocks/demapping/gsm_bcch_ccch_sdcch4_demapper.grc @@ -0,0 +1,292 @@ + + + + Tue May 17 17:08:42 2016 + + options + + author + Piotr Krysik + + + window_size + + + + category + + + + comment + + + + description + Demapper for BCCH + CCCH + SDCCH/4 + SACCH/C4 control channels. This corresponds to channel combination v specified in GSM 05.02, section 6.4 + + + _enabled + True + + + _coordinate + (8, 8) + + + _rotation + 0 + + + generate_options + hb + + + hier_block_src_path + .: + + + id + gsm_bcch_ccch_sdcch4_demapper + + + max_nouts + 0 + + + qt_qss_theme + + + + realtime_scheduling + + + + run_command + {python} -u {filename} + + + run_options + prompt + + + run + True + + + thread_safe_setters + + + + title + BCCH + CCCH + SDCCH/4 demapper + + + + gsm_universal_ctrl_chans_demapper + + alias + + + + comment + + + + affinity + + + + _enabled + True + + + _coordinate + (168, 193) + + + _rotation + 0 + + + id + gsm_universal_ctrl_chans_demapper_0 + + + maxoutbuf + 0 + + + minoutbuf + 0 + + + downlink_channel_types + [0,0,1,1,1,1,2,2,2,2,0,0,2,2,2,2,2,2,2,2,0,0,7,7,7,7,7,7,7,7,0,0,7,7,7,7,7,7,7,7,0,0,135,135,135,135,135,135,135,135,0] + + + downlink_starts_fn_mod51 + [0,0,2,2,2,2,6,6,6,6,0,0,12,12,12,12,16,16,16,16,0,0,22,22,22,22,26,26,26,26,0,0,32,32,32,32,36,36,36,36,0,0,42,42,42,42,46,46,46,46,0,] + + + downlink_subslots + [0,0,0,0,0,0,0,0,0,0,0,0,1,1,1,1,2,2,2,2,0,0,0,0,0,0,1,1,1,1,0,0,2,2,2,2,3,3,3,3,0,0,0,0,0,0,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,1,1,2,2,2,2,0,0,0,0,0,0,1,1,1,1,0,0,2,2,2,2,3,3,3,3,0,0,2,2,2,2,3,3,3,3,0,] + + + timeslot_nr + timeslot_nr + + + uplink_channel_types + [7,7,7,7,0,0,135,135,135,135,135,135,135,135,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7,7,7,7,7,7,7,7,0,0,7,7,7,7,] + + + uplink_starts_fn_mod51 + [0,0,0,0,0,0,6,6,6,6,10,10,10,10,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,37,37,37,37,41,41,41,41,0,0,47,47,47,47,] + + + uplink_subslots + [0,0,0,0,0,0,0,0,0,0,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,1,1,2,2,2,2,0,0,3,3,3,3,0,0,0,0,0,0,2,2,2,2,3,3,3,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,1,1,2,2,2,2,0,0,3,3,3,3,] + + + + pad_sink + + comment + + + + _enabled + True + + + _coordinate + (416, 188) + + + _rotation + 0 + + + id + pad_sink_0 + + + type + message + + + label + bursts + + + num_streams + 1 + + + optional + True + + + vlen + 1 + + + + pad_source + + comment + + + + _enabled + True + + + _coordinate + (32, 188) + + + _rotation + 0 + + + id + pad_source_0 + + + label + bursts + + + num_streams + 1 + + + optional + True + + + type + message + + + vlen + 1 + + + + parameter + + alias + + + + comment + + + + _enabled + True + + + _coordinate + (192, 7) + + + _rotation + 0 + + + id + timeslot_nr + + + label + timeslot_nr + + + short_id + + + + type + intx + + + value + 0 + + + + gsm_universal_ctrl_chans_demapper_0 + pad_sink_0 + bursts + in + + + pad_source_0 + gsm_universal_ctrl_chans_demapper_0 + out + bursts + + diff --git a/hier_blocks/demapping/gsm_sdcch8_demapper.grc b/hier_blocks/demapping/gsm_sdcch8_demapper.grc new file mode 100644 index 0000000..3cc5f7e --- /dev/null +++ b/hier_blocks/demapping/gsm_sdcch8_demapper.grc @@ -0,0 +1,292 @@ + + + + Tue May 17 17:08:42 2016 + + options + + author + Piotr Krysik + + + window_size + + + + category + + + + comment + + + + description + Demapper for SDCCH/8 + SACCH/C8 control channels. This corresponds to channel combination vii specified in GSM 05.02, section 6.4 + + + _enabled + True + + + _coordinate + (8, 8) + + + _rotation + 0 + + + generate_options + hb + + + hier_block_src_path + .: + + + id + gsm_sdcch8_demapper + + + max_nouts + 0 + + + qt_qss_theme + + + + realtime_scheduling + + + + run_command + {python} -u {filename} + + + run_options + prompt + + + run + True + + + thread_safe_setters + + + + title + SDCCH/8 demapper + + + + gsm_universal_ctrl_chans_demapper + + alias + + + + comment + + + + affinity + + + + _enabled + True + + + _coordinate + (168, 193) + + + _rotation + 0 + + + id + gsm_universal_ctrl_chans_demapper_0 + + + maxoutbuf + 0 + + + minoutbuf + 0 + + + downlink_channel_types + [0,0,0,0,1,1,1,1,2,2,2,2,3,3,3,3,4,4,4,4,5,5,5,5,6,6,6,6,7,7,7,7,0,0,0,0,1,1,1,1,2,2,2,2,3,3,3,3,0,0,0,0,0,0,0,1,1,1,1,2,2,2,2,3,3,3,3,4,4,4,4,5,5,5,5,6,6,6,6,7,7,7,7,4,4,4,4,5,5,5,5,6,6,6,6,7,7,7,7,0,0,0] + + + downlink_starts_fn_mod51 + [0,0,0,0,4,4,4,4,8,8,8,8,12,12,12,12,16,16,16,16,20,20,20,20,24,24,24,24,28,28,28,28,32,32,32,32,36,36,36,36,40,40,40,40,44,44,44,44,0,0,0] + + + downlink_subslots + [0,0,0,0,1,1,1,1,2,2,2,2,3,3,3,3,4,4,4,4,5,5,5,5,6,6,6,6,7,7,7,7,0,0,0,0,1,1,1,1,2,2,2,2,3,3,3,3,0,0,0,0,0,0,0,1,1,1,1,2,2,2,2,3,3,3,3,4,4,4,4,5,5,5,5,6,6,6,6,7,7,7,7,4,4,4,4,5,5,5,5,6,6,6,6,7,7,7,7,0,0,0,] + + + timeslot_nr + timeslot_nr + + + uplink_channel_types + [1,1,1,1,2,2,2,2,3,3,3,3,0,0,0,0,0,0,0,1,1,1,1,2,2,2,2,3,3,3,3,4,4,4,4,5,5,5,5,6,6,6,6,7,7,7,7,0,0,0,0,5,5,5,5,6,6,6,6,7,7,7,7,0,0,0,0,0,0,0,1,1,1,1,2,2,2,2,3,3,3,3,4,4,4,4,5,5,5,5,6,6,6,6,7,7,7,7,4,4,4,4] + + + uplink_starts_fn_mod51 + [136,136,136,136,136,136,136,136,136,136,136,136,0,0,0,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,136,136,136,136] + + + uplink_subslots + [1,1,1,1,2,2,2,2,3,3,3,3,0,0,0,0,0,0,0,1,1,1,1,2,2,2,2,3,3,3,3,4,4,4,4,5,5,5,5,6,6,6,6,7,7,7,7,0,0,0,0,5,5,5,5,6,6,6,6,7,7,7,7,0,0,0,0,0,0,0,1,1,1,1,2,2,2,2,3,3,3,3,4,4,4,4,5,5,5,5,6,6,6,6,7,7,7,7,4,4,4,4,] + + + + pad_sink + + comment + + + + _enabled + True + + + _coordinate + (416, 188) + + + _rotation + 0 + + + id + pad_sink_0 + + + type + message + + + label + bursts + + + num_streams + 1 + + + optional + True + + + vlen + 1 + + + + pad_source + + comment + + + + _enabled + True + + + _coordinate + (32, 188) + + + _rotation + 0 + + + id + pad_source_0 + + + label + bursts + + + num_streams + 1 + + + optional + True + + + type + message + + + vlen + 1 + + + + parameter + + alias + + + + comment + + + + _enabled + True + + + _coordinate + (192, 7) + + + _rotation + 0 + + + id + timeslot_nr + + + label + timeslot_nr + + + short_id + + + + type + intx + + + value + 1 + + + + gsm_universal_ctrl_chans_demapper_0 + pad_sink_0 + bursts + in + + + pad_source_0 + gsm_universal_ctrl_chans_demapper_0 + out + bursts + + -- cgit v1.2.3