Merge branch 'master' into sync

Conflicts:
	gr-utils/src/python/gr_plot_qt.py
	gr-utils/src/python/pyqt_plot.py
	gr-utils/src/python/pyqt_plot.ui

5 files changed, 94 insertions, 6 deletions

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 @@
+<?xml version="1.0"?>
+<!--
+###################################################
+## CVSD Encoder
+###################################################
+ -->
+<block>
+	<name>CVSD Decoder</name>
+	<key>blks2_cvsd_decode</key>
+	<import>from gnuradio import blks2</import>
+	<make>blks2.cvsd_decode($resample,$bw)</make>
+	<param>
+	  <name>Resample</name>
+	  <key>resample</key>
+	  <value>8</value>
+	  <type>int</type>
+	</param>
+	<param>
+	  <name>Frac. Bandwidth</name>
+	  <key>bw</key>
+	  <value>0.5</value>
+	  <type>real</type>
+	</param>
+	<sink>
+		<name>in</name>
+		<type>byte</type>
+	</sink>
+	<source>
+		<name>out</name>
+		<type>float</type>
+	</source>
+</block>
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 @@
+<?xml version="1.0"?>
+<!--
+###################################################
+## CVSD Encoder
+###################################################
+ -->
+<block>
+	<name>CVSD Encoder</name>
+	<key>blks2_cvsd_encode</key>
+	<import>from gnuradio import blks2</import>
+	<make>blks2.cvsd_encode($resample,$bw)</make>
+	<param>
+	  <name>Resample</name>
+	  <key>resample</key>
+	  <value>8</value>
+	  <type>int</type>
+	</param>
+	<param>
+	  <name>Frac. Bandwidth</name>
+	  <key>bw</key>
+	  <value>0.5</value>
+	  <type>real</type>
+	</param>
+	<sink>
+		<name>in</name>
+		<type>float</type>
+	</sink>
+	<source>
+		<name>out</name>
+		<type>byte</type>
+	</source>
+</block>
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
@@ -252,6 +252,11 @@
 		<block>gr_descrambler_bb</block>
 	</cat>
 	<cat>
+	        <name>Vocoders</name>
+		<block>blks2_cvsd_encode</block>
+		<block>blks2_cvsd_decode</block>
+	</cat>
+	<cat>
 		<name>Probes</name>
 		<block>gr_probe_avg_mag_sqrd_x</block>
 		<block>gr_probe_density_b</block>
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
@@ -78,19 +78,36 @@ else: self.stop(); self.wait()</callback>
 		<hide>#if $generate_options() == 'hb' then 'none' else 'all'#</hide>
 	</param>
 	<param>
+		<name>Run Options</name>
+		<key>run_options</key>
+		<value>prompt</value>
+		<type>enum</type>
+		<hide>#if $generate_options() == 'no_gui' then 'none' else 'all'#</hide>
+		<option>
+			<name>Run to Completion</name>
+			<key>run</key>
+		</option>
+		<option>
+			<name>Prompt for Exit</name>
+			<key>prompt</key>
+		</option>
+	</param>
+	<param>
 		<name>Run</name>
 		<key>run</key>
 		<value>True</value>
 		<type>bool</type>
-		<hide>#if $generate_options() == 'wx_gui'
-	#if str($run) == 'True'
-part#slurp
+		<hide>
+#if $generate_options() == 'wx_gui'
+	#if $run()
+		part
 	#else
-none#slurp
+		none
 	#end if
 #else
-all#slurp
-#end if</hide>
+	all
+#end if
+		</hide>
 		<option>
 			<name>Autostart</name>
 			<key>True</key>