diff options
author | Roman Khassraf <roman@khassraf.at> | 2015-08-05 12:51:33 +0200 |
---|---|---|
committer | Roman Khassraf <roman@khassraf.at> | 2015-08-05 12:51:33 +0200 |
commit | 64c74463ba818857138ad9b1286d41866d5ee7f2 (patch) | |
tree | 0dcde6a742d005004ba61de31a317f7784bd8fe0 /grc | |
parent | 1fc0565aa9b0b02ab6cbcb9dcb7d7524bdceddd9 (diff) | |
parent | 1ce4469fd20a466984607ce0d075cb213e9c86f9 (diff) |
Merged origin/test-utils-98 into dev, fixed conflicts
Diffstat (limited to 'grc')
-rw-r--r-- | grc/CMakeLists.txt | 3 | ||||
-rw-r--r-- | grc/gsm_block_tree.xml | 6 | ||||
-rw-r--r-- | grc/misc_utils/CMakeLists.txt | 6 | ||||
-rw-r--r-- | grc/misc_utils/gsm_burst_file_sink.xml (renamed from grc/misc_utils/gsm_burst_sink.xml) | 6 | ||||
-rw-r--r-- | grc/misc_utils/gsm_burst_file_source.xml (renamed from grc/misc_utils/gsm_burst_source.xml) | 6 | ||||
-rw-r--r-- | grc/misc_utils/gsm_message_printer.xml | 16 | ||||
-rw-r--r-- | grc/qa_utils/CMakeLists.txt | 25 | ||||
-rw-r--r-- | grc/qa_utils/gsm_burst_sink.xml (renamed from grc/misc_utils/gsm_burst_sink_qa.xml) | 6 | ||||
-rw-r--r-- | grc/qa_utils/gsm_burst_source.xml (renamed from grc/misc_utils/gsm_burst_source_qa.xml) | 6 | ||||
-rw-r--r-- | grc/qa_utils/gsm_message_sink.xml | 19 | ||||
-rw-r--r-- | grc/qa_utils/gsm_message_source.xml | 32 |
11 files changed, 108 insertions, 23 deletions
diff --git a/grc/CMakeLists.txt b/grc/CMakeLists.txt index caf2660..d42bff8 100644 --- a/grc/CMakeLists.txt +++ b/grc/CMakeLists.txt @@ -23,6 +23,5 @@ add_subdirectory(demapping) add_subdirectory(receiver) add_subdirectory(misc_utils) install(FILES - gsm_block_tree.xml - DESTINATION share/gnuradio/grc/blocks + gsm_block_tree.xml DESTINATION share/gnuradio/grc/blocks ) diff --git a/grc/gsm_block_tree.xml b/grc/gsm_block_tree.xml index 2503710..fe29895 100644 --- a/grc/gsm_block_tree.xml +++ b/grc/gsm_block_tree.xml @@ -40,10 +40,8 @@ <cat> <name>Utilities</name> <block>gsm_bursts_printer</block> - <block>gsm_burst_sink</block> - <block>gsm_burst_source</block> - <block>gsm_burst_sink_qa</block> - <block>gsm_burst_source_qa</block> + <block>gsm_burst_file_sink</block> + <block>gsm_burst_file_source</block> <block>gsm_extract_system_info</block> <block>gsm_extract_immediate_assignment</block> <block>gsm_controlled_rotator_cc</block> diff --git a/grc/misc_utils/CMakeLists.txt b/grc/misc_utils/CMakeLists.txt index 5a3f874..bbb4bce 100644 --- a/grc/misc_utils/CMakeLists.txt +++ b/grc/misc_utils/CMakeLists.txt @@ -26,8 +26,6 @@ install(FILES gsm_bursts_printer.xml gsm_clock_offset_corrector.xml gsm_tmsi_dumper.xml - gsm_burst_sink.xml - gsm_burst_source.xml - gsm_burst_source_qa.xml - gsm_burst_sink_qa.xml DESTINATION share/gnuradio/grc/blocks + gsm_burst_file_sink.xml + gsm_burst_file_source.xml DESTINATION share/gnuradio/grc/blocks ) diff --git a/grc/misc_utils/gsm_burst_sink.xml b/grc/misc_utils/gsm_burst_file_sink.xml index a0e7532..e468e5f 100644 --- a/grc/misc_utils/gsm_burst_sink.xml +++ b/grc/misc_utils/gsm_burst_file_sink.xml @@ -1,9 +1,9 @@ <?xml version="1.0"?> <block> - <name>Burst sink</name> - <key>gsm_burst_sink</key> + <name>Burst file sink</name> + <key>gsm_burst_file_sink</key> <import>import grgsm</import> - <make>grgsm.burst_sink($filename)</make> + <make>grgsm.burst_file_sink($filename)</make> <param> <name>Destination file</name> diff --git a/grc/misc_utils/gsm_burst_source.xml b/grc/misc_utils/gsm_burst_file_source.xml index 9e78069..e32a708 100644 --- a/grc/misc_utils/gsm_burst_source.xml +++ b/grc/misc_utils/gsm_burst_file_source.xml @@ -1,9 +1,9 @@ <?xml version="1.0"?> <block> - <name>Burst source</name> - <key>gsm_burst_source</key> + <name>Burst file source</name> + <key>gsm_burst_file_source</key> <import>import grgsm</import> - <make>grgsm.burst_source($filename)</make> + <make>grgsm.burst_file_source($filename)</make> <param> <name>Source file</name> diff --git a/grc/misc_utils/gsm_message_printer.xml b/grc/misc_utils/gsm_message_printer.xml index 8b44b22..7e390ed 100644 --- a/grc/misc_utils/gsm_message_printer.xml +++ b/grc/misc_utils/gsm_message_printer.xml @@ -4,7 +4,7 @@ <key>gsm_message_printer</key> <import>import grgsm</import> <import>import pmt</import> - <make>grgsm.message_printer(pmt.intern($prepend_string))</make> + <make>grgsm.message_printer(pmt.intern($prepend_string), $print_gsmtap_header)</make> <param> <name>Prepend String</name> @@ -13,6 +13,20 @@ <type>string</type> <hide>part</hide> </param> + <param> + <name>Print GSMTap header</name> + <key>print_gsmtap_header</key> + <value>False</value> + <type>bool</type> + <option> + <name>False</name> + <key>False</key> + </option> + <option> + <name>True</name> + <key>True</key> + </option> + </param> <sink> <name>msgs</name> diff --git a/grc/qa_utils/CMakeLists.txt b/grc/qa_utils/CMakeLists.txt new file mode 100644 index 0000000..1f57aa1 --- /dev/null +++ b/grc/qa_utils/CMakeLists.txt @@ -0,0 +1,25 @@ +# Copyright 2011,2012 Free Software Foundation, Inc. +# +# This file is part of GNU Radio +# +# GNU Radio is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3, or (at your option) +# any later version. +# +# GNU Radio is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with GNU Radio; see the file COPYING. If not, write to +# the Free Software Foundation, Inc., 51 Franklin Street, +# Boston, MA 02110-1301, USA. + +install(FILES + gsm_burst_source.xml + gsm_burst_sink.xml + gsm_message_source.xml + gsm_message_sink.xml DESTINATION share/gnuradio/grc/blocks +) diff --git a/grc/misc_utils/gsm_burst_sink_qa.xml b/grc/qa_utils/gsm_burst_sink.xml index c028da3..740960f 100644 --- a/grc/misc_utils/gsm_burst_sink_qa.xml +++ b/grc/qa_utils/gsm_burst_sink.xml @@ -1,9 +1,9 @@ <?xml version="1.0"?> <block> - <name>QA Burst sink</name> - <key>gsm_burst_sink_qa</key> + <name>Burst sink</name> + <key>gsm_burst_sink</key> <import>import grgsm</import> - <make>grgsm.burst_sink_qa()</make> + <make>grgsm.burst_sink()</make> <sink> <name>in</name> diff --git a/grc/misc_utils/gsm_burst_source_qa.xml b/grc/qa_utils/gsm_burst_source.xml index bb04cca..9f55ac5 100644 --- a/grc/misc_utils/gsm_burst_source_qa.xml +++ b/grc/qa_utils/gsm_burst_source.xml @@ -1,9 +1,9 @@ <?xml version="1.0"?> <block> - <name>QA Burst source</name> - <key>gsm_burst_source_qa</key> + <name>Burst source</name> + <key>gsm_burst_source</key> <import>import grgsm</import> - <make>grgsm.burst_source_qa($framenumbers, $timeslots, $bursts)</make> + <make>grgsm.burst_source($framenumbers, $timeslots, $bursts)</make> <param> <name>Frame numbers</name> diff --git a/grc/qa_utils/gsm_message_sink.xml b/grc/qa_utils/gsm_message_sink.xml new file mode 100644 index 0000000..e0d6ac0 --- /dev/null +++ b/grc/qa_utils/gsm_message_sink.xml @@ -0,0 +1,19 @@ +<?xml version="1.0"?> +<block> + <name>Message Sink</name> + <key>gsm_message_sink</key> + <import>import grgsm</import> + <make>grgsm.message_sink()</make> + + <sink> + <name>in</name> + <type>message</type> + </sink> + + <doc> +This block is a message sink for testing purposes. + +The data can be retrieved using function get_messages() + + </doc> +</block> diff --git a/grc/qa_utils/gsm_message_source.xml b/grc/qa_utils/gsm_message_source.xml new file mode 100644 index 0000000..ab06f65 --- /dev/null +++ b/grc/qa_utils/gsm_message_source.xml @@ -0,0 +1,32 @@ +<?xml version="1.0"?> +<block> + <name>Message Source</name> + <key>gsm_message_source</key> + <import>import grgsm</import> + <make>grgsm.message_source($messages)</make> + + <param> + <name>Messages</name> + <key>messages</key> + <value>["02 04 01 00 00 00 c9 00 00 1d 3c e5 02 00 01 00 15 06 21 00 01 f0 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b", +"02 04 01 00 00 00 ca 00 00 1d 3c e9 02 00 02 00 15 06 21 00 01 f0 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b", +"02 04 01 00 00 00 cb 00 00 1d 3d 0e 01 00 00 00 59 06 1a 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ff e5 04 00", +"02 04 01 00 00 00 cb 00 00 1d 3d 12 02 00 00 00 15 06 21 00 01 f0 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b"]</value> + <type>raw</type> + <hide>true</hide> + </param> + + <source> + <name>msgs</name> + <type>message</type> + </source> + + <doc> +This block is a basic message source for testing purposes. + +It takes a list of strings as input, where each string +is a whitespace-separated list of hexadecimal values representing the data bytes of a message including the gsmtap header. + +Such strings can be obtained using the message printer with option "Print GSMTap header" + </doc> +</block> |