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/receiver | |
| 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/receiver')
| -rw-r--r-- | grc/receiver/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | grc/receiver/gsm_receiver.xml | 2 | ||||
| -rw-r--r-- | grc/receiver/gsm_receiver_with_uplink.xml | 71 |
3 files changed, 73 insertions, 1 deletions
diff --git a/grc/receiver/CMakeLists.txt b/grc/receiver/CMakeLists.txt index af7042d..bbc086f 100644 --- a/grc/receiver/CMakeLists.txt +++ b/grc/receiver/CMakeLists.txt @@ -21,6 +21,7 @@ install(FILES gsm_input.xml gsm_wideband_input.xml gsm_receiver.xml + gsm_receiver_with_uplink.xml gsm_fcch_burst_tagger.xml gsm_sch_detector.xml gsm_fcch_detector.xml diff --git a/grc/receiver/gsm_receiver.xml b/grc/receiver/gsm_receiver.xml index 2119fd2..2988243 100644 --- a/grc/receiver/gsm_receiver.xml +++ b/grc/receiver/gsm_receiver.xml @@ -3,7 +3,7 @@ <name>GSM Receiver</name> <key>gsm_receiver</key> <import>import grgsm</import> - <make>grgsm.receiver($osr, $cell_allocation, $tseq_nums)</make> + <make>grgsm.receiver($osr, $cell_allocation, $tseq_nums, False)</make> <param> <name>Oversampling ratio</name> diff --git a/grc/receiver/gsm_receiver_with_uplink.xml b/grc/receiver/gsm_receiver_with_uplink.xml new file mode 100644 index 0000000..4b68336 --- /dev/null +++ b/grc/receiver/gsm_receiver_with_uplink.xml @@ -0,0 +1,71 @@ +<?xml version="1.0"?> +<block> + <name>GSM Receiver (with uplink)</name> + <key>gsm_receiver_with_uplink</key> + <import>import grgsm</import> + <make>grgsm.receiver($osr, $cell_allocation, $tseq_nums, True)</make> + + <param> + <name>Oversampling ratio</name> + <key>osr</key> + <value>4</value> + <type>int</type> + </param> + + <param> + <name>Cell allocation</name> + <key>cell_allocation</key> + <value>[0]</value> + <type>float_vector</type> + <hide>part</hide> + </param> + + <param> + <name>TSEQ numbers</name> + <key>tseq_nums</key> + <value>[]</value> + <type>int_vector</type> + <hide>part</hide> + </param> + + <param> + <name>Num Streams</name> + <key>num_streams</key> + <value>1</value> + <type>int</type> + <hide>part</hide> + </param> + + <check>$num_streams >= 0</check> + + <sink> + <name>C</name> + <type>complex</type> + <nports>$num_streams</nports> + </sink> + + + <sink> + <name>C_up</name> + <type>complex</type> + <nports>$num_streams</nports> + </sink> + + <source> + <name>C0</name> + <type>message</type> + <optional>1</optional> + </source> + + <source> + <name>CX</name> + <type>message</type> + <optional>1</optional> + </source> + + <source> + <name>measurements</name> + <type>message</type> + <optional>1</optional> + </source> +</block> |