summaryrefslogtreecommitdiff
path: root/grc/blocks
diff options
context:
space:
mode:
authorTom Rondeau <trondeau@vt.edu>2012-04-05 10:39:55 -0400
committerTom Rondeau <trondeau@vt.edu>2012-04-05 10:39:55 -0400
commit8f84dfdd2104ec70057c31b70494bfac95b47424 (patch)
treea9e0dbe71953d5587bf0c25462f3168ec395fe47 /grc/blocks
parent2f73fe22c5e1591242a9556221ec8487170a7b00 (diff)
parenta66a650a1f39118500434bc9c91b2ade24887149 (diff)
Merge branch 'master' into next
Conflicts: grc/blocks/Makefile.am
Diffstat (limited to 'grc/blocks')
-rw-r--r--grc/blocks/block_tree.xml3
-rw-r--r--grc/blocks/gr_char_to_float.xml17
-rw-r--r--grc/blocks/gr_char_to_short.xml28
-rw-r--r--grc/blocks/gr_float_to_char.xml17
-rw-r--r--grc/blocks/gr_float_to_int.xml35
-rw-r--r--grc/blocks/gr_float_to_short.xml17
-rw-r--r--grc/blocks/gr_int_to_float.xml17
-rw-r--r--grc/blocks/gr_short_to_char.xml28
-rw-r--r--grc/blocks/gr_short_to_float.xml17
9 files changed, 174 insertions, 5 deletions
diff --git a/grc/blocks/block_tree.xml b/grc/blocks/block_tree.xml
index 656811a16d..438c0eaa95 100644
--- a/grc/blocks/block_tree.xml
+++ b/grc/blocks/block_tree.xml
@@ -73,13 +73,16 @@
<block>gr_complex_to_float</block>
<block>gr_float_to_complex</block>
+ <block>gr_float_to_int</block>
<block>gr_float_to_short</block>
<block>gr_short_to_float</block>
+ <block>gr_short_to_char</block>
<block>gr_int_to_float</block>
<block>gr_float_to_char</block>
<block>gr_char_to_float</block>
+ <block>gr_char_to_short</block>
<block>gr_float_to_uchar</block>
<block>gr_uchar_to_float</block>
diff --git a/grc/blocks/gr_char_to_float.xml b/grc/blocks/gr_char_to_float.xml
index 9ab778051d..838b6a203d 100644
--- a/grc/blocks/gr_char_to_float.xml
+++ b/grc/blocks/gr_char_to_float.xml
@@ -8,13 +8,28 @@
<name>Char To Float</name>
<key>gr_char_to_float</key>
<import>from gnuradio import gr</import>
- <make>gr.char_to_float()</make>
+ <make>gr.char_to_float($vlen, $scale)</make>
+ <callback>set_scale($scale)</callback>
+ <param>
+ <name>Vec Length</name>
+ <key>vlen</key>
+ <value>1</value>
+ <type>int</type>
+ </param>
+ <param>
+ <name>Scale</name>
+ <key>scale</key>
+ <value>1</value>
+ <type>real</type>
+ </param>
<sink>
<name>in</name>
<type>byte</type>
+ <vlen>$vlen</vlen>
</sink>
<source>
<name>out</name>
<type>float</type>
+ <vlen>$vlen</vlen>
</source>
</block>
diff --git a/grc/blocks/gr_char_to_short.xml b/grc/blocks/gr_char_to_short.xml
new file mode 100644
index 0000000000..57261e0845
--- /dev/null
+++ b/grc/blocks/gr_char_to_short.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0"?>
+<!--
+###################################################
+##Char to Short:
+###################################################
+ -->
+<block>
+ <name>Char To Short</name>
+ <key>gr_char_to_short</key>
+ <import>from gnuradio import gr</import>
+ <make>gr.char_to_short($vlen)</make>
+ <param>
+ <name>Vec Length</name>
+ <key>vlen</key>
+ <value>1</value>
+ <type>int</type>
+ </param>
+ <sink>
+ <name>in</name>
+ <type>byte</type>
+ <vlen>$vlen</vlen>
+ </sink>
+ <source>
+ <name>out</name>
+ <type>short</type>
+ <vlen>$vlen</vlen>
+ </source>
+</block>
diff --git a/grc/blocks/gr_float_to_char.xml b/grc/blocks/gr_float_to_char.xml
index 907de77438..1fa500e3cf 100644
--- a/grc/blocks/gr_float_to_char.xml
+++ b/grc/blocks/gr_float_to_char.xml
@@ -8,13 +8,28 @@
<name>Float To Char</name>
<key>gr_float_to_char</key>
<import>from gnuradio import gr</import>
- <make>gr.float_to_char()</make>
+ <make>gr.float_to_char($vlen, $scale)</make>
+ <callback>set_scale($scale)</callback>
+ <param>
+ <name>Vec Length</name>
+ <key>vlen</key>
+ <value>1</value>
+ <type>int</type>
+ </param>
+ <param>
+ <name>Scale</name>
+ <key>scale</key>
+ <value>1</value>
+ <type>real</type>
+ </param>
<sink>
<name>in</name>
<type>float</type>
+ <vlen>$vlen</vlen>
</sink>
<source>
<name>out</name>
<type>byte</type>
+ <vlen>$vlen</vlen>
</source>
</block>
diff --git a/grc/blocks/gr_float_to_int.xml b/grc/blocks/gr_float_to_int.xml
new file mode 100644
index 0000000000..b43c208a5a
--- /dev/null
+++ b/grc/blocks/gr_float_to_int.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0"?>
+<!--
+###################################################
+##Float to Int:
+###################################################
+ -->
+<block>
+ <name>Float To Int</name>
+ <key>gr_float_to_int</key>
+ <import>from gnuradio import gr</import>
+ <make>gr.float_to_int($vlen, $scale)</make>
+ <callback>set_scale($scale)</callback>
+ <param>
+ <name>Vec Length</name>
+ <key>vlen</key>
+ <value>1</value>
+ <type>int</type>
+ </param>
+ <param>
+ <name>Scale</name>
+ <key>scale</key>
+ <value>1</value>
+ <type>real</type>
+ </param>
+ <sink>
+ <name>in</name>
+ <type>float</type>
+ <vlen>$vlen</vlen>
+ </sink>
+ <source>
+ <name>out</name>
+ <type>int</type>
+ <vlen>$vlen</vlen>
+ </source>
+</block>
diff --git a/grc/blocks/gr_float_to_short.xml b/grc/blocks/gr_float_to_short.xml
index cb2bcd4bea..4f76b8f580 100644
--- a/grc/blocks/gr_float_to_short.xml
+++ b/grc/blocks/gr_float_to_short.xml
@@ -8,13 +8,28 @@
<name>Float To Short</name>
<key>gr_float_to_short</key>
<import>from gnuradio import gr</import>
- <make>gr.float_to_short()</make>
+ <make>gr.float_to_short($vlen, $scale)</make>
+ <callback>set_scale($scale)</callback>
+ <param>
+ <name>Vec Length</name>
+ <key>vlen</key>
+ <value>1</value>
+ <type>int</type>
+ </param>
+ <param>
+ <name>Scale</name>
+ <key>scale</key>
+ <value>1</value>
+ <type>real</type>
+ </param>
<sink>
<name>in</name>
<type>float</type>
+ <vlen>$vlen</vlen>
</sink>
<source>
<name>out</name>
<type>short</type>
+ <vlen>$vlen</vlen>
</source>
</block>
diff --git a/grc/blocks/gr_int_to_float.xml b/grc/blocks/gr_int_to_float.xml
index 8e6d024e21..7430fec728 100644
--- a/grc/blocks/gr_int_to_float.xml
+++ b/grc/blocks/gr_int_to_float.xml
@@ -8,13 +8,28 @@
<name>Int To Float</name>
<key>gr_int_to_float</key>
<import>from gnuradio import gr</import>
- <make>gr.int_to_float()</make>
+ <make>gr.int_to_float($vlen, $scale)</make>
+ <callback>set_scale($scale)</callback>
+ <param>
+ <name>Vec Length</name>
+ <key>vlen</key>
+ <value>1</value>
+ <type>int</type>
+ </param>
+ <param>
+ <name>Scale</name>
+ <key>scale</key>
+ <value>1</value>
+ <type>real</type>
+ </param>
<sink>
<name>in</name>
<type>int</type>
+ <vlen>$vlen</vlen>
</sink>
<source>
<name>out</name>
<type>float</type>
+ <vlen>$vlen</vlen>
</source>
</block>
diff --git a/grc/blocks/gr_short_to_char.xml b/grc/blocks/gr_short_to_char.xml
new file mode 100644
index 0000000000..9c41da84ef
--- /dev/null
+++ b/grc/blocks/gr_short_to_char.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0"?>
+<!--
+###################################################
+##Short to char:
+###################################################
+ -->
+<block>
+ <name>Short To Char</name>
+ <key>gr_short_to_char</key>
+ <import>from gnuradio import gr</import>
+ <make>gr.short_to_char($vlen)</make>
+ <param>
+ <name>Vec Length</name>
+ <key>vlen</key>
+ <value>1</value>
+ <type>int</type>
+ </param>
+ <sink>
+ <name>in</name>
+ <type>short</type>
+ <vlen>$vlen</vlen>
+ </sink>
+ <source>
+ <name>out</name>
+ <type>byte</type>
+ <vlen>$vlen</vlen>
+ </source>
+</block>
diff --git a/grc/blocks/gr_short_to_float.xml b/grc/blocks/gr_short_to_float.xml
index 8dac97c096..529f8c78cb 100644
--- a/grc/blocks/gr_short_to_float.xml
+++ b/grc/blocks/gr_short_to_float.xml
@@ -8,13 +8,28 @@
<name>Short To Float</name>
<key>gr_short_to_float</key>
<import>from gnuradio import gr</import>
- <make>gr.short_to_float()</make>
+ <make>gr.short_to_float($vlen, $scale)</make>
+ <callback>set_scale($scale)</callback>
+ <param>
+ <name>Vec Length</name>
+ <key>vlen</key>
+ <value>1</value>
+ <type>int</type>
+ </param>
+ <param>
+ <name>Scale</name>
+ <key>scale</key>
+ <value>1</value>
+ <type>real</type>
+ </param>
<sink>
<name>in</name>
<type>short</type>
+ <vlen>$vlen</vlen>
</sink>
<source>
<name>out</name>
<type>float</type>
+ <vlen>$vlen</vlen>
</source>
</block>
generated by cgit v1.2.3 (git 2.39.1) at 2025-03-13 18:09:39 +0000