Merge branch 'master' into next

Conflicts:
	gr-digital/grc/Makefile.am

4 files changed, 112 insertions, 33 deletions

diff --git a/gr-digital/grc/CMakeLists.txt b/gr-digital/grc/CMakeLists.txt
index e94c53556..bace20847 100644
--- a/gr-digital/grc/CMakeLists.txt
+++ b/gr-digital/grc/CMakeLists.txt
@@ -17,36 +17,5 @@
 # the Free Software Foundation, Inc., 51 Franklin Street,
 # Boston, MA 02110-1301, USA.
 
-install(FILES
-    digital_block_tree.xml
-    digital_binary_slicer_fb.xml
-    digital_clock_recovery_mm_xx.xml
-    digital_constellation_decoder_cb.xml
-    digital_constellation_receiver_cb.xml
-    digital_correlate_access_code_bb.xml
-    digital_costas_loop_cc.xml
-    digital_cma_equalizer_cc.xml
-    digital_cpmmod_bc.xml
-    digital_fll_band_edge_cc.xml
-    digital_gmsk_demod.xml
-    digital_gmsk_mod.xml
-    digital_gmskmod_bc.xml
-    digital_kurtotic_equalizer_cc.xml
-    digital_lms_dd_equalizer_cc.xml
-    digital_mpsk_receiver_cc.xml
-    digital_dxpsk_mod.xml
-    digital_dxpsk_demod.xml
-    digital_psk_mod.xml
-    digital_psk_demod.xml
-    digital_qam_mod.xml
-    digital_qam_demod.xml
-    digital_ofdm_mod.xml
-    digital_ofdm_demod.xml
-    digital_ofdm_cyclic_prefixer.xml
-    digital_ofdm_frame_acquisition.xml
-    digital_ofdm_insert_preamble.xml
-    digital_ofdm_sampler.xml
-    digital_ofdm_sync_pn.xml
-    DESTINATION ${GRC_BLOCKS_DIR}
-    COMPONENT "digital_python"
-)
+file(GLOB xml_files "*.xml")
+install(FILES ${xml_files} DESTINATION ${GRC_BLOCKS_DIR} COMPONENT "digital_python")
diff --git a/gr-digital/grc/digital_block_tree.xml b/gr-digital/grc/digital_block_tree.xml
index 49a01973f..3ef4d0b1d 100644
--- a/gr-digital/grc/digital_block_tree.xml
+++ b/gr-digital/grc/digital_block_tree.xml
@@ -41,6 +41,8 @@
 		<block>digital_kurtotic_equalizer_cc</block>
 		<block>digital_lms_dd_equalizer_cc</block>
 		<block>digital_mpsk_receiver_cc</block>
+		<block>digital_mpsk_snr_est_cc</block>
+		<block>digital_probe_mpsk_snr_est_c</block>
 	</cat>
 	<cat>
 		<name>Digital Modulators</name>
diff --git a/gr-digital/grc/digital_mpsk_snr_est_cc.xml b/gr-digital/grc/digital_mpsk_snr_est_cc.xml
new file mode 100644
index 000000000..6039e5b13
--- /dev/null
+++ b/gr-digital/grc/digital_mpsk_snr_est_cc.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0"?>
+<!--
+###################################################
+##MPSK SNR Estimator
+###################################################
+ -->
+<block>
+	<name>MPSK SNR Estimator</name>
+	<key>digital_mpsk_snr_est_cc</key>
+	<import>from gnuradio import digital</import>
+	<make>digital.mpsk_snr_est_cc($type, $tag_nsamples, $alpha)</make>
+	<callback>set_type($type)</callback>
+	<callback>set_tag_nsamples($tag_nsamples)</callback>
+	<callback>set_alpha($alpha)</callback>
+	<param>
+		<name>Type</name>
+		<key>type</key>
+		<type>enum</type>
+		<option>
+			<name>Simple</name>
+			<key>0</key>
+		</option>
+		<option>
+			<name>Skewness</name>
+			<key>1</key>
+		</option>
+		<option>
+			<name>2nd and 4th Moment</name>
+			<key>2</key>
+		</option>
+		<option>
+			<name>SVR</name>
+			<key>3</key>
+		</option>
+	</param>
+	<param>
+		<name>Samples between tags</name>
+		<key>tag_nsamples</key>
+		<value>10000</value>
+		<type>int</type>
+	</param>
+	<param>
+		<name>Filter Alpha</name>
+		<key>alpha</key>
+		<value>0.001</value>
+		<type>real</type>
+	</param>
+	<sink>
+		<name>in</name>
+		<type>complex</type>
+	</sink>
+	<source>
+		<name>out</name>
+		<type>complex</type>
+	</source>
+</block>
diff --git a/gr-digital/grc/digital_probe_mpsk_snr_est_c.xml b/gr-digital/grc/digital_probe_mpsk_snr_est_c.xml
new file mode 100644
index 000000000..62c5fad97
--- /dev/null
+++ b/gr-digital/grc/digital_probe_mpsk_snr_est_c.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0"?>
+<!--
+###################################################
+##MPSK SNR Estimator
+###################################################
+ -->
+<block>
+	<name>MPSK SNR Estimator Probe</name>
+	<key>digital_probe_mpsk_snr_est_c</key>
+	<import>from gnuradio import digital</import>
+	<make>digital.probe_mpsk_snr_est_c($type, $msg_nsamples, $alpha)</make>
+	<callback>set_type($type)</callback>
+	<callback>set_msg_nsample($msg_nsamples)</callback>
+	<callback>set_alpha($alpha)</callback>
+	<param>
+		<name>Type</name>
+		<key>type</key>
+		<type>enum</type>
+		<option>
+			<name>Simple</name>
+			<key>0</key>
+		</option>
+		<option>
+			<name>Skewness</name>
+			<key>1</key>
+		</option>
+		<option>
+			<name>2nd and 4th Moment</name>
+			<key>2</key>
+		</option>
+		<option>
+			<name>SVR</name>
+			<key>3</key>
+		</option>
+	</param>
+	<param>
+		<name>Samples between SNR messages</name>
+		<key>msg_nsamples</key>
+		<value>10000</value>
+		<type>int</type>
+	</param>
+	<param>
+		<name>Filter Alpha</name>
+		<key>alpha</key>
+		<value>0.001</value>
+		<type>real</type>
+	</param>
+	<sink>
+		<name>in</name>
+		<type>complex</type>
+	</sink>
+</block>