Merge branch 'master' of gnuradio.org:gnuradio into qtgui2

5 files changed, 111 insertions, 4 deletions

diff --git a/grc/blocks/Makefile.am b/grc/blocks/Makefile.am
index fc2d3f161..81eb81182 100644
--- a/grc/blocks/Makefile.am
+++ b/grc/blocks/Makefile.am
@@ -48,6 +48,7 @@ dist_ourdata_DATA = \
 	blks2_packet_decoder.xml \
 	blks2_packet_encoder.xml \
 	blks2_pfb_arb_resampler.xml \
+	blks2_pfb_channelizer.xml \
 	blks2_qamx_demod.xml \
 	blks2_qamx_mod.xml \
 	blks2_rational_resampler_xxx.xml \
@@ -148,6 +149,7 @@ dist_ourdata_DATA = \
 	gr_peak_detector2_fb.xml \
 	gr_peak_detector_xb.xml \
 	gr_pfb_clock_sync.xml \
+	gr_pfb_synthesis_filterbank.xml \
 	gr_phase_modulator_fc.xml \
 	gr_pll_carriertracking_cc.xml \
 	gr_pll_freqdet_cf.xml \
diff --git a/grc/blocks/blks2_dxpsk2_demod.xml b/grc/blocks/blks2_dxpsk2_demod.xml
index ce8305c50..7fe4be32b 100644
--- a/grc/blocks/blks2_dxpsk2_demod.xml
+++ b/grc/blocks/blks2_dxpsk2_demod.xml
@@ -11,7 +11,8 @@
 	<make>blks2.$(type)2_demod(
 	samples_per_symbol=$samples_per_symbol,
 	excess_bw=$excess_bw,
-	costas_alpha=$costas_alpha,
+        freq_alpha=$freq_alpha,
+        phase_alpha=$phase_alpha,
 	timing_alpha=$timing_alpha,
 	timing_max_dev=$timing_max_dev,
 	gray_code=$gray_code,
@@ -48,9 +49,15 @@
 		<type>real</type>
 	</param>
 	<param>
-		<name>Costas Alpha</name>
-		<key>costas_alpha</key>
-		<value>0.175</value>
+		<name>FLL Alpha</name>
+		<key>freq_alpha</key>
+		<value>0.010</value>
+		<type>real</type>
+	</param>
+	<param>
+		<name>Phase Alpha</name>
+		<key>phase_alpha</key>
+		<value>0.100</value>
 		<type>real</type>
 	</param>
 	<param>
diff --git a/grc/blocks/blks2_pfb_channelizer.xml b/grc/blocks/blks2_pfb_channelizer.xml
new file mode 100644
index 000000000..aee9dd512
--- /dev/null
+++ b/grc/blocks/blks2_pfb_channelizer.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0"?>
+<!--
+###################################################
+##Polyphase Channelizer
+###################################################
+ -->
+<block>
+	<name>Polyphase Channelizer</name>
+	<key>blks2_pfb_channelizer_ccf</key>
+	<import>from gnuradio import blks2</import>
+	<import>from gnuradio.gr import firdes</import>
+	<make>blks2.pfb_channelizer_ccf(
+	  $nchans,
+	  $taps,
+	  $osr,
+	  $atten)
+	</make>
+	<!-- Set taps not implemented yet 
+           <callback>set_taps($taps)</callback>
+         -->
+	<param>
+		<name>Channels</name>
+		<key>nchans</key>
+		<type>int</type>
+	</param>
+	<param>
+		<name>Taps</name>
+		<key>taps</key>
+		<value>None</value>
+		<type>real_vector</type>
+	</param>
+	<param>
+		<name>Over Sample Ratio</name>
+		<key>osr</key>
+		<value>1.0</value>
+		<type>real</type>
+	</param>
+	<param>
+		<name>Attenuation</name>
+		<key>atten</key>
+		<value>100</value>
+		<type>real</type>
+	</param>
+	<sink>
+		<name>in</name>
+		<type>complex</type>
+	</sink>
+	<source>
+		<name>out</name>
+		<type>complex</type>
+		<nports>$nchans</nports>
+	</source>
+</block>
diff --git a/grc/blocks/block_tree.xml b/grc/blocks/block_tree.xml
index e7aa7c810..66094a80d 100644
--- a/grc/blocks/block_tree.xml
+++ b/grc/blocks/block_tree.xml
@@ -175,6 +175,8 @@
 		<block>blks2_analysis_filterbank</block>
 		<!-- Polyphase filters -->
 		<block>blks2_pfb_arb_resampler_ccf</block>
+		<block>blks2_pfb_channelizer_ccf</block>
+		<block>gr_pfb_synthesis_filterbank_ccf</block>
 		<!-- Other filters -->
 		<block>gr_single_pole_iir_filter_xx</block>
 		<block>gr_hilbert_fc</block>
diff --git a/grc/blocks/gr_pfb_synthesis_filterbank.xml b/grc/blocks/gr_pfb_synthesis_filterbank.xml
new file mode 100644
index 000000000..a8b944c6a
--- /dev/null
+++ b/grc/blocks/gr_pfb_synthesis_filterbank.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0"?>
+<!--
+###################################################
+##Polyphase Synthesis Filterbank
+###################################################
+ -->
+<block>
+	<name>Polyphase Synthesis Filterbank</name>
+	<key>gr_pfb_synthesis_filterbank_ccf</key>
+	<import>from gnuradio import gr</import>
+	<import>from gnuradio.gr import firdes</import>
+	<make>gr.pfb_synthesis_filterbank_ccf(
+	  $numchans, $taps)
+	</make>
+        <callback>set_taps($taps)</callback>
+
+	<param>
+		<name>Channels</name>
+		<key>numchans</key>
+		<value>2</value>
+		<type>int</type>
+	</param>
+	<param>
+		<name>Connections</name>
+		<key>connections</key>
+		<value>2</value>
+		<type>int</type>
+	</param>
+	<param>
+		<name>Taps</name>
+		<key>taps</key>
+		<type>real_vector</type>
+	</param>
+	<sink>
+		<name>in</name>
+		<type>complex</type>
+		<nports>$connections</nports>
+	</sink>
+	<source>
+		<name>out</name>
+		<type>complex</type>
+	</source>
+</block>