From 7d8dd5e122e0201d96410eec6549b903881f8b3a Mon Sep 17 00:00:00 2001
From: Johnathan Corgan
Date: Sat, 19 Sep 2009 20:38:24 -0700
Subject: Added CVSD encoder/decoder to GRC, example app
Used blks2.cvsd* wrappers, not bare gnuradio.vocoder.cvsd*
Example application sweeps 0-4KHz through encoder/decoder pair configured
as Bluetooth standard
---
grc/blocks/Makefile.am | 2 ++
grc/blocks/blks2_cvsd_decode.xml | 32 ++++++++++++++++++++++++++++++++
grc/blocks/blks2_cvsd_encode.xml | 32 ++++++++++++++++++++++++++++++++
grc/blocks/block_tree.xml | 5 +++++
4 files changed, 71 insertions(+)
create mode 100644 grc/blocks/blks2_cvsd_decode.xml
create mode 100644 grc/blocks/blks2_cvsd_encode.xml
(limited to 'grc/blocks')
diff --git a/grc/blocks/Makefile.am b/grc/blocks/Makefile.am
index 32ddc6567..617a3bf60 100644
--- a/grc/blocks/Makefile.am
+++ b/grc/blocks/Makefile.am
@@ -30,6 +30,8 @@ dist_ourdata_DATA = \
band_reject_filter.xml \
blks2_am_demod_cf.xml \
blks2_analysis_filterbank.xml \
+ blks2_cvsd_encode.xml \
+ blks2_cvsd_decode.xml \
blks2_dxpsk_demod.xml \
blks2_dxpsk_mod.xml \
blks2_error_rate.xml \
diff --git a/grc/blocks/blks2_cvsd_decode.xml b/grc/blocks/blks2_cvsd_decode.xml
new file mode 100644
index 000000000..6be7daa22
--- /dev/null
+++ b/grc/blocks/blks2_cvsd_decode.xml
@@ -0,0 +1,32 @@
+
+
+
+ CVSD Decoder
+ blks2_cvsd_decode
+ from gnuradio import blks2
+ blks2.cvsd_decode($resample,$bw)
+
+ Resample
+ resample
+ 8
+ int
+
+
+ Frac. Bandwidth
+ bw
+ 0.5
+ real
+
+
+ in
+ byte
+
+
+ out
+ float
+
+
diff --git a/grc/blocks/blks2_cvsd_encode.xml b/grc/blocks/blks2_cvsd_encode.xml
new file mode 100644
index 000000000..3123b1aa9
--- /dev/null
+++ b/grc/blocks/blks2_cvsd_encode.xml
@@ -0,0 +1,32 @@
+
+
+
+ CVSD Encoder
+ blks2_cvsd_encode
+ from gnuradio import blks2
+ blks2.cvsd_encode($resample,$bw)
+
+ Resample
+ resample
+ 8
+ int
+
+
+ Frac. Bandwidth
+ bw
+ 0.5
+ real
+
+
+ in
+ float
+
+
+ out
+ byte
+
+
diff --git a/grc/blocks/block_tree.xml b/grc/blocks/block_tree.xml
index 5a989cc01..296f0ee91 100644
--- a/grc/blocks/block_tree.xml
+++ b/grc/blocks/block_tree.xml
@@ -251,6 +251,11 @@
gr_scrambler_bb
gr_descrambler_bb
+
+ Vocoders
+ blks2_cvsd_encode
+ blks2_cvsd_decode
+
Probes
gr_probe_avg_mag_sqrd_x
--
cgit
From fd37328c778ea8014e9ea9d932e61e5d229dd012 Mon Sep 17 00:00:00 2001
From: Josh Blum
Date: Fri, 25 Sep 2009 00:24:48 -0700
Subject: Added a run options to the "no gui" generate options. The user can
select between run to completion and prompt for exit.
Also fixed the props dialog is changed function to have better hashes.
Now we hash a tuple of all "relevant" items which is "order aware".
Since xoring the individual hashes proved faulty when 2 params alternated hiding.
---
grc/blocks/options.xml | 29 +++++++++++++++++++++++------
1 file changed, 23 insertions(+), 6 deletions(-)
(limited to 'grc/blocks')
diff --git a/grc/blocks/options.xml b/grc/blocks/options.xml
index 1798a69f8..4d0dd2899 100644
--- a/grc/blocks/options.xml
+++ b/grc/blocks/options.xml
@@ -77,20 +77,37 @@ else: self.stop(); self.wait()
string
#if $generate_options() == 'hb' then 'none' else 'all'#
+
+ Run Options
+ run_options
+ prompt
+ enum
+ #if $generate_options() == 'no_gui' then 'none' else 'all'#
+
+
+
Run
run
True
bool
- #if $generate_options() == 'wx_gui'
- #if str($run) == 'True'
-part#slurp
+
+#if $generate_options() == 'wx_gui'
+ #if $run()
+ part
#else
-none#slurp
+ none
#end if
#else
-all#slurp
-#end if
+ all
+#end if
+
-
-
Run
run
True
bool
-
-#if $generate_options() == 'wx_gui'
- #if $run()
- part
+ #if $generate_options() == 'wx_gui'
+ #if str($run) == 'True'
+part#slurp
#else
- none
+none#slurp
#end if
#else
- all
-#end if
-
+all#slurp
+#end if
+
+
Run
run
True
bool
- #if $generate_options() == 'wx_gui'
- #if str($run) == 'True'
-part#slurp
+
+#if $generate_options() == 'wx_gui'
+ #if $run()
+ part
#else
-none#slurp
+ none
#end if
#else
-all#slurp
-#end if
+ all
+#end if
+