diff options
Diffstat (limited to 'grc')
| -rw-r--r-- | grc/demapping/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | grc/demapping/gsm_tch_f_chans_demapper.xml | 27 | ||||
| -rw-r--r-- | grc/demapping/gsm_tch_h_chans_demapper.xml | 40 | ||||
| -rw-r--r-- | grc/gsm_block_tree.xml | 1 |
4 files changed, 45 insertions, 27 deletions
diff --git a/grc/demapping/CMakeLists.txt b/grc/demapping/CMakeLists.txt index 84f4fee..4aacfff 100644 --- a/grc/demapping/CMakeLists.txt +++ b/grc/demapping/CMakeLists.txt @@ -22,5 +22,7 @@ install(FILES gsm_bcch_ccch_demapper.xml gsm_bcch_ccch_sdcch4_demapper.xml gsm_sdcch8_demapper.xml - gsm_tch_f_chans_demapper.xml DESTINATION share/gnuradio/grc/blocks + gsm_tch_f_chans_demapper.xml + gsm_tch_h_chans_demapper.xml + DESTINATION share/gnuradio/grc/blocks ) diff --git a/grc/demapping/gsm_tch_f_chans_demapper.xml b/grc/demapping/gsm_tch_f_chans_demapper.xml index c87776a..33b4153 100644 --- a/grc/demapping/gsm_tch_f_chans_demapper.xml +++ b/grc/demapping/gsm_tch_f_chans_demapper.xml @@ -3,7 +3,7 @@ <name>TCH/F Demapper</name> <key>gsm_tch_f_chans_demapper</key> <import>import grgsm</import> - <make>grgsm.tch_f_chans_demapper($timeslot_nr, $tch_type, $tch_h_channel)</make> + <make>grgsm.tch_f_chans_demapper($timeslot_nr)</make> <param> <name>Timeslot</name> @@ -13,31 +13,6 @@ <hide>part</hide> </param> - <param> - <name>TCH Type</name> - <key>tch_type</key> - <value>0</value> - <type>int</type> - <hide>part</hide> - <option> - <name>Full rate</name> - <key>0</key> - </option> - <option> - <name>Half rate</name> - <key>1</key> - </option> - </param> - - <param> - <name>TCH/H Channel</name> - <key>tch_h_channel</key> - <value>0</value> - <type>int</type> - <hide>#if $tch_type() == 0 then 'all' else 'none'#</hide> - </param> - <check>$tch_h_channel() > -1 and $tch_h_channel() < 2</check> - <sink> <name>bursts</name> <type>message</type> diff --git a/grc/demapping/gsm_tch_h_chans_demapper.xml b/grc/demapping/gsm_tch_h_chans_demapper.xml new file mode 100644 index 0000000..f2bd67f --- /dev/null +++ b/grc/demapping/gsm_tch_h_chans_demapper.xml @@ -0,0 +1,40 @@ +<?xml version="1.0"?> +<block> + <name>TCH/H Demapper</name> + <key>gsm_tch_h_chans_demapper</key> + <import>import grgsm</import> + <make>grgsm.tch_h_chans_demapper($timeslot_nr, $tch_h_channel)</make> + + <param> + <name>Timeslot</name> + <key>timeslot_nr</key> + <value>2</value> + <type>int</type> + <hide>part</hide> + </param> + + <param> + <name>TCH/H Channel</name> + <key>tch_h_channel</key> + <value>0</value> + <type>int</type> + <hide>#if $tch_type() == 0 then 'all' else 'none'#</hide> + </param> + <check>$tch_h_channel() > -1 and $tch_h_channel() < 2</check> + + <sink> + <name>bursts</name> + <type>message</type> + <optional>1</optional> + </sink> + <source> + <name>tch_bursts</name> + <type>message</type> + <optional>1</optional> + </source> + <source> + <name>acch_bursts</name> + <type>message</type> + <optional>1</optional> + </source> +</block> diff --git a/grc/gsm_block_tree.xml b/grc/gsm_block_tree.xml index 2e502d0..786d7d2 100644 --- a/grc/gsm_block_tree.xml +++ b/grc/gsm_block_tree.xml @@ -40,6 +40,7 @@ <block>gsm_bcch_ccch_sdcch4_demapper</block> <block>gsm_sdcch8_demapper</block> <block>gsm_tch_f_chans_demapper</block> + <block>gsm_tch_h_chans_demapper</block> </cat> <cat> <name>Decryption</name> |