diff options
author | Piotr Krysik <ptrkrysik@gmail.com> | 2016-07-15 13:07:05 +0200 |
---|---|---|
committer | Piotr Krysik <ptrkrysik@gmail.com> | 2016-07-15 13:07:05 +0200 |
commit | 1bed4abb0ea0a748119c481b164a39834268e12d (patch) | |
tree | 86136b4f98a3865eb12a0692d68f47416809dc46 | |
parent | 47ab20e45ea6bf30dcde61f359db517a25834aaa (diff) |
Moved new blocks (controlled resampler and msg to tag) to appropriate directory
-rw-r--r-- | grc/CMakeLists.txt | 4 | ||||
-rw-r--r-- | grc/grgsm_msg_to_tag.xml | 38 | ||||
-rw-r--r-- | grc/misc_utils/gsm_controlled_fractional_resampler_cc.xml (renamed from grc/grgsm_controlled_fractional_resampler_cc.xml) | 5 | ||||
-rw-r--r-- | grc/misc_utils/gsm_msg_to_tag.xml | 23 | ||||
-rw-r--r-- | swig/grgsm_swig.i | 1 |
5 files changed, 27 insertions, 44 deletions
diff --git a/grc/CMakeLists.txt b/grc/CMakeLists.txt index 1619f1a..2b94539 100644 --- a/grc/CMakeLists.txt +++ b/grc/CMakeLists.txt @@ -24,7 +24,5 @@ add_subdirectory(receiver) add_subdirectory(flow_control) add_subdirectory(misc_utils) install(FILES - gsm_block_tree.xml - grgsm_msg_to_tag.xml - grgsm_controlled_fractional_resampler_cc.xml DESTINATION share/gnuradio/grc/blocks + gsm_block_tree.xml DESTINATION share/gnuradio/grc/blocks ) diff --git a/grc/grgsm_msg_to_tag.xml b/grc/grgsm_msg_to_tag.xml deleted file mode 100644 index fab2c6c..0000000 --- a/grc/grgsm_msg_to_tag.xml +++ /dev/null @@ -1,38 +0,0 @@ -<?xml version="1.0"?> -<block> - <name>msg_to_tag</name> - <key>grgsm_msg_to_tag</key> - <category>grgsm</category> - <import>import grgsm</import> - <make>grgsm.msg_to_tag()</make> - <!-- Make one 'param' node for every Parameter you want settable from the GUI. - Sub-nodes: - * name - * key (makes the value accessible as $keyname, e.g. in the make node) - * type --> - <param> - <name>...</name> - <key>...</key> - <type>...</type> - </param> - - <!-- Make one 'sink' node per input. Sub-nodes: - * name (an identifier for the GUI) - * type - * vlen - * optional (set to 1 for optional inputs) --> - <sink> - <name>in</name> - <type><!-- e.g. int, float, complex, byte, short, xxx_vector, ...--></type> - </sink> - - <!-- Make one 'source' node per output. Sub-nodes: - * name (an identifier for the GUI) - * type - * vlen - * optional (set to 1 for optional inputs) --> - <source> - <name>out</name> - <type><!-- e.g. int, float, complex, byte, short, xxx_vector, ...--></type> - </source> -</block> diff --git a/grc/grgsm_controlled_fractional_resampler_cc.xml b/grc/misc_utils/gsm_controlled_fractional_resampler_cc.xml index ca92572..fdecece 100644 --- a/grc/grgsm_controlled_fractional_resampler_cc.xml +++ b/grc/misc_utils/gsm_controlled_fractional_resampler_cc.xml @@ -1,8 +1,7 @@ <?xml version="1.0"?> <block> - <name>controlled_fractional_resampler_cc</name> - <key>grgsm_controlled_fractional_resampler_cc</key> - <category>grgsm</category> + <name>Controlled Fractional Resampler</name> + <key>gsm_controlled_fractional_resampler_cc</key> <import>import grgsm</import> <make>grgsm.controlled_fractional_resampler_cc($phase_shift, $resamp_ratio)</make> <callback>set_resamp_ratio($resamp_ratio)</callback> diff --git a/grc/misc_utils/gsm_msg_to_tag.xml b/grc/misc_utils/gsm_msg_to_tag.xml new file mode 100644 index 0000000..c0d73c3 --- /dev/null +++ b/grc/misc_utils/gsm_msg_to_tag.xml @@ -0,0 +1,23 @@ +<?xml version="1.0"?> +<block> + <name>Message To Tag</name> + <key>gsm_msg_to_tag</key> + <import>import grgsm</import> + <make>grgsm.msg_to_tag()</make> + + <sink> + <name>in</name> + <type>complex</type> + </sink> + + <sink> + <name>msg</name> + <type>message</type> + <optional>1</optional> + </sink> + + <source> + <name>out</name> + <type>complex</type> + </source> +</block> diff --git a/swig/grgsm_swig.i b/swig/grgsm_swig.i index 81a5942..a6baf97 100644 --- a/swig/grgsm_swig.i +++ b/swig/grgsm_swig.i @@ -106,3 +106,4 @@ GR_SWIG_BLOCK_MAGIC2(gsm, message_source); GR_SWIG_BLOCK_MAGIC2(gsm, message_sink); %include "grgsm/msg_to_tag.h" GR_SWIG_BLOCK_MAGIC2(grgsm, msg_to_tag); +GR_SWIG_BLOCK_MAGIC2(gsm, controlled_fractional_resampler_cc); |