diff options
| author | Piotr Krysik <ptrkrysik@gmail.com> | 2016-05-14 19:37:14 +0200 |
|---|---|---|
| committer | Piotr Krysik <ptrkrysik@gmail.com> | 2016-05-14 19:37:14 +0200 |
| commit | 8630fac60ca3b1609725498348267e66602d2067 (patch) | |
| tree | 7d275e2455ca3efa11e86f90a036d9ff859e5723 /grc/demapping/gsm_bcch_ccch_sdcch4_demapper.xml | |
| parent | cdff492ff7f318dc452b6270a4845b8df6d9e025 (diff) | |
| parent | 5d6ae655574947444b713f1d34fab85167554b8c (diff) | |
Merged uplink-decoding branch (with complete support for control channels decoding on uplink)
# Conflicts:
# examples
# lib/demapping/universal_ctrl_chans_demapper_impl.cc
# lib/receiver/receiver_impl.cc
Diffstat (limited to 'grc/demapping/gsm_bcch_ccch_sdcch4_demapper.xml')
| -rw-r--r-- | grc/demapping/gsm_bcch_ccch_sdcch4_demapper.xml | 26 |
1 files changed, 21 insertions, 5 deletions
diff --git a/grc/demapping/gsm_bcch_ccch_sdcch4_demapper.xml b/grc/demapping/gsm_bcch_ccch_sdcch4_demapper.xml index 80e67d5..90b33ce 100644 --- a/grc/demapping/gsm_bcch_ccch_sdcch4_demapper.xml +++ b/grc/demapping/gsm_bcch_ccch_sdcch4_demapper.xml @@ -3,7 +3,7 @@ <name>BCCH + CCCH + SDCCH/4 demapper</name> <key>gsm_bcch_ccch_sdcch4_demapper</key> <import>import grgsm</import> - <make>grgsm.universal_ctrl_chans_demapper($timeslot_nr, $starts_fn_mod51, $channel_types)</make> + <make>grgsm.universal_ctrl_chans_demapper($timeslot_nr, $downlink_starts_fn_mod51, $downlink_channel_types, $uplink_starts_fn_mod51, $uplink_channel_types)</make> <param> <name>Timeslot</name> @@ -14,21 +14,37 @@ </param> <param> - <name>starts_fn_mod51</name> - <key>starts_fn_mod51</key> + <name>downlink_starts_fn_mod51</name> + <key>downlink_starts_fn_mod51</key> <value>[2,6,12,16,22,26,32,36,42,46]</value> <type>int_vector</type> <hide>all</hide> </param> <param> - <name>channel_types</name> - <key>channel_types</key> + <name>downlink_channel_types</name> + <key>downlink_channel_types</key> <value>[1,2,2,2,7,7,7,7,135,135]</value> <type>int_vector</type> <hide>all</hide> </param> + <param> + <name>uplink_starts_fn_mod51</name> + <key>uplink_starts_fn_mod51</key> + <value>[0,6,10,37,41,47]</value> + <type>int_vector</type> + <hide>all</hide> + </param> + + <param> + <name>uplink_channel_types</name> + <key>uplink_channel_types</key> + <value>[7,135,135,7,7,7]</value> + <type>int_vector</type> + <hide>all</hide> + </param> + <sink> <name>bursts</name> <type>message</type> |