From 5d3d5cf4315e14be805d8b87c00d0110c4a79797 Mon Sep 17 00:00:00 2001
From: Tom Rondeau
Date: Sat, 31 Mar 2012 15:26:40 -0400
Subject: core: adds vlen and scalar args to type converter blocks in GRC.
Also fixes documentation for these blocks.
---
grc/blocks/Makefile.am | 3 +++
grc/blocks/block_tree.xml | 3 +++
grc/blocks/gr_char_to_float.xml | 17 ++++++++++++++++-
grc/blocks/gr_char_to_short.xml | 28 ++++++++++++++++++++++++++++
grc/blocks/gr_float_to_char.xml | 17 ++++++++++++++++-
grc/blocks/gr_float_to_int.xml | 35 +++++++++++++++++++++++++++++++++++
grc/blocks/gr_float_to_short.xml | 17 ++++++++++++++++-
grc/blocks/gr_int_to_float.xml | 17 ++++++++++++++++-
grc/blocks/gr_short_to_char.xml | 28 ++++++++++++++++++++++++++++
grc/blocks/gr_short_to_float.xml | 17 ++++++++++++++++-
10 files changed, 177 insertions(+), 5 deletions(-)
create mode 100644 grc/blocks/gr_char_to_short.xml
create mode 100644 grc/blocks/gr_float_to_int.xml
create mode 100644 grc/blocks/gr_short_to_char.xml
(limited to 'grc')
diff --git a/grc/blocks/Makefile.am b/grc/blocks/Makefile.am
index 104ba8062..37f493ce5 100644
--- a/grc/blocks/Makefile.am
+++ b/grc/blocks/Makefile.am
@@ -61,6 +61,7 @@ dist_ourdata_DATA = \
gr_argmax_xx.xml \
gr_channel_model.xml \
gr_char_to_float.xml \
+ gr_char_to_short.xml \
gr_chunks_to_symbols.xml \
gr_complex_to_arg.xml \
gr_complex_to_float.xml \
@@ -93,6 +94,7 @@ dist_ourdata_DATA = \
gr_fir_filter_xxx.xml \
gr_float_to_char.xml \
gr_float_to_complex.xml \
+ gr_float_to_int.xml \
gr_float_to_short.xml \
gr_float_to_uchar.xml \
gr_fractional_interpolator_xx.xml \
@@ -149,6 +151,7 @@ dist_ourdata_DATA = \
gr_sample_and_hold_xx.xml \
gr_scrambler_bb.xml \
gr_short_to_float.xml \
+ gr_short_to_char.xml \
gr_sig_source_x.xml \
gr_simple_correlator.xml \
gr_simple_framer.xml \
diff --git a/grc/blocks/block_tree.xml b/grc/blocks/block_tree.xml
index 6c4cc0e88..42187585e 100644
--- a/grc/blocks/block_tree.xml
+++ b/grc/blocks/block_tree.xml
@@ -73,13 +73,16 @@
gr_complex_to_float
gr_float_to_complex
+ gr_float_to_int
gr_float_to_short
gr_short_to_float
+ gr_short_to_char
gr_int_to_float
gr_float_to_char
gr_char_to_float
+ gr_char_to_short
gr_float_to_uchar
gr_uchar_to_float
diff --git a/grc/blocks/gr_char_to_float.xml b/grc/blocks/gr_char_to_float.xml
index 9ab778051..838b6a203 100644
--- a/grc/blocks/gr_char_to_float.xml
+++ b/grc/blocks/gr_char_to_float.xml
@@ -8,13 +8,28 @@
Char To Float
gr_char_to_float
from gnuradio import gr
- gr.char_to_float()
+ gr.char_to_float($vlen, $scale)
+ set_scale($scale)
+
+ Vec Length
+ vlen
+ 1
+ int
+
+
+ Scale
+ scale
+ 1
+ real
+
in
byte
+ $vlen
out
float
+ $vlen
diff --git a/grc/blocks/gr_char_to_short.xml b/grc/blocks/gr_char_to_short.xml
new file mode 100644
index 000000000..57261e084
--- /dev/null
+++ b/grc/blocks/gr_char_to_short.xml
@@ -0,0 +1,28 @@
+
+
+
+ Char To Short
+ gr_char_to_short
+ from gnuradio import gr
+ gr.char_to_short($vlen)
+
+ Vec Length
+ vlen
+ 1
+ int
+
+
+ in
+ byte
+ $vlen
+
+
+ out
+ short
+ $vlen
+
+
diff --git a/grc/blocks/gr_float_to_char.xml b/grc/blocks/gr_float_to_char.xml
index 907de7743..1fa500e3c 100644
--- a/grc/blocks/gr_float_to_char.xml
+++ b/grc/blocks/gr_float_to_char.xml
@@ -8,13 +8,28 @@
Float To Char
gr_float_to_char
from gnuradio import gr
- gr.float_to_char()
+ gr.float_to_char($vlen, $scale)
+ set_scale($scale)
+
+ Vec Length
+ vlen
+ 1
+ int
+
+
+ Scale
+ scale
+ 1
+ real
+
in
float
+ $vlen
out
byte
+ $vlen
diff --git a/grc/blocks/gr_float_to_int.xml b/grc/blocks/gr_float_to_int.xml
new file mode 100644
index 000000000..b43c208a5
--- /dev/null
+++ b/grc/blocks/gr_float_to_int.xml
@@ -0,0 +1,35 @@
+
+
+
+ Float To Int
+ gr_float_to_int
+ from gnuradio import gr
+ gr.float_to_int($vlen, $scale)
+ set_scale($scale)
+
+ Vec Length
+ vlen
+ 1
+ int
+
+
+ Scale
+ scale
+ 1
+ real
+
+
+ in
+ float
+ $vlen
+
+
+ out
+ int
+ $vlen
+
+
diff --git a/grc/blocks/gr_float_to_short.xml b/grc/blocks/gr_float_to_short.xml
index cb2bcd4be..4f76b8f58 100644
--- a/grc/blocks/gr_float_to_short.xml
+++ b/grc/blocks/gr_float_to_short.xml
@@ -8,13 +8,28 @@
Float To Short
gr_float_to_short
from gnuradio import gr
- gr.float_to_short()
+ gr.float_to_short($vlen, $scale)
+ set_scale($scale)
+
+ Vec Length
+ vlen
+ 1
+ int
+
+
+ Scale
+ scale
+ 1
+ real
+
in
float
+ $vlen
out
short
+ $vlen
diff --git a/grc/blocks/gr_int_to_float.xml b/grc/blocks/gr_int_to_float.xml
index 8e6d024e2..7430fec72 100644
--- a/grc/blocks/gr_int_to_float.xml
+++ b/grc/blocks/gr_int_to_float.xml
@@ -8,13 +8,28 @@
Int To Float
gr_int_to_float
from gnuradio import gr
- gr.int_to_float()
+ gr.int_to_float($vlen, $scale)
+ set_scale($scale)
+
+ Vec Length
+ vlen
+ 1
+ int
+
+
+ Scale
+ scale
+ 1
+ real
+
in
int
+ $vlen
out
float
+ $vlen
diff --git a/grc/blocks/gr_short_to_char.xml b/grc/blocks/gr_short_to_char.xml
new file mode 100644
index 000000000..9c41da84e
--- /dev/null
+++ b/grc/blocks/gr_short_to_char.xml
@@ -0,0 +1,28 @@
+
+
+
+ Short To Char
+ gr_short_to_char
+ from gnuradio import gr
+ gr.short_to_char($vlen)
+
+ Vec Length
+ vlen
+ 1
+ int
+
+
+ in
+ short
+ $vlen
+
+
+ out
+ byte
+ $vlen
+
+
diff --git a/grc/blocks/gr_short_to_float.xml b/grc/blocks/gr_short_to_float.xml
index 8dac97c09..529f8c78c 100644
--- a/grc/blocks/gr_short_to_float.xml
+++ b/grc/blocks/gr_short_to_float.xml
@@ -8,13 +8,28 @@
Short To Float
gr_short_to_float
from gnuradio import gr
- gr.short_to_float()
+ gr.short_to_float($vlen, $scale)
+ set_scale($scale)
+
+ Vec Length
+ vlen
+ 1
+ int
+
+
+ Scale
+ scale
+ 1
+ real
+
in
short
+ $vlen
out
float
+ $vlen
--
cgit