digital: fixing qa code; adding (untested) GRC block for DxPSK demods.

2 files changed, 167 insertions, 1 deletions

diff --git a/gr-digital/grc/digital_dxpsk_demod.xml b/gr-digital/grc/digital_dxpsk_demod.xml
new file mode 100644
index 000000000..5e6dced22
--- /dev/null
+++ b/gr-digital/grc/digital_dxpsk_demod.xml
@@ -0,0 +1,167 @@
+<?xml version="1.0"?>
+
+<!--
+ Copyright 2009,2010,2011 Free Software Foundation, Inc.
+ 
+ This file is part of GNU Radio
+ 
+ GNU Radio is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 3, or (at your option)
+ any later version.
+ 
+ GNU Radio is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ 
+ You should have received a copy of the GNU General Public License
+ along with GNU Radio; see the file COPYING.  If not, write to
+ the Free Software Foundation, Inc., 51 Franklin Street,
+ Boston, MA 02110-1301, USA.
+-->
+
+<!--
+###################################################
+##DPSK2 Mod - 2, 4, 8
+###################################################
+ -->
+<block>
+	<name>DPSK Demod</name>
+	<key>digital_dxpsk_demod</key>
+	<import>from gnuradio import digital</import>
+	<make>digital.$(type)_demod(
+	samples_per_symbol=$samples_per_symbol,
+	excess_bw=$excess_bw,
+	costas_alpha=$costas_alpha,
+	timing_alpha=$timing_alpha,
+	timing_max_dev=$timing_max_dev,
+	gray_code=$gray_code,
+	verbose=$verbose,
+	log=$log,
+	sync_out=$sync_out,
+)</make>
+	<callback>clock_recov.set_alpha($costas_alpha)</callback>
+	<callback>clock_recov.set_beta(0.25*$costas_alpha**2)</callback>
+	<callback>time_recov.set_alpha($timing_alpha)</callback>
+	<param>
+		<name>Type</name>
+		<key>type</key>
+		<type>enum</type>
+		<option>
+			<name>DBPSK</name>
+			<key>dbpsk</key>
+		</option>
+		<option>
+			<name>DQPSK</name>
+			<key>dqpsk</key>
+		</option>
+	</param>
+	<param>
+		<name>Samples/Symbol</name>
+		<key>samples_per_symbol</key>
+		<value>2</value>
+		<type>int</type>
+	</param>
+	<param>
+		<name>Excess BW</name>
+		<key>excess_bw</key>
+		<value>0.35</value>
+		<type>real</type>
+	</param>
+	<param>
+		<name>Costas Alpha</name>
+		<key>costas_alpha</key>
+		<value>0.175</value>
+		<type>real</type>
+	</param>
+	<param>
+		<name>Timing Alpha</name>
+		<key>timing_alpha</key>
+		<value>0.100</value>
+		<type>real</type>
+	</param>
+	<param>
+		<name>Timing Max Dev</name>
+		<key>timing_max_dev</key>
+		<value>1.5</value>
+		<type>real</type>
+	</param>
+	<param>
+		<name>Omega Relative Limit</name>
+		<key>omega_relative_limit</key>
+		<value>0.005</value>
+		<type>real</type>
+	</param>
+	<param>
+		<name>Gray Code</name>
+		<key>gray_code</key>
+		<value>True</value>
+		<type>bool</type>
+		<option>
+			<name>Yes</name>
+			<key>True</key>
+		</option>
+		<option>
+			<name>No</name>
+			<key>False</key>
+		</option>
+	</param>
+	<param>
+		<name>Verbose</name>
+		<key>verbose</key>
+		<value>False</value>
+		<type>bool</type>
+		<hide>#if str($verbose) == 'False' then 'part' else 'none'#</hide>
+		<option>
+			<name>On</name>
+			<key>True</key>
+		</option>
+		<option>
+			<name>Off</name>
+			<key>False</key>
+		</option>
+	</param>
+	<param>
+		<name>Logging</name>
+		<key>log</key>
+		<value>False</value>
+		<type>bool</type>
+		<hide>#if str($log) == 'False' then 'part' else 'none'#</hide>
+		<option>
+			<name>On</name>
+			<key>True</key>
+		</option>
+		<option>
+			<name>Off</name>
+			<key>False</key>
+		</option>
+	</param>
+	<param>
+		<name>Sync Out</name>
+		<key>sync_out</key>
+		<value>False</value>
+		<type>bool</type>
+		<option>
+			<name>On</name>
+			<key>True</key>
+		</option>
+		<option>
+			<name>Off</name>
+			<key>False</key>
+		</option>
+	</param>
+	<sink>
+		<name>in</name>
+		<type>complex</type>
+	</sink>
+	<source>
+		<name>out</name>
+		<type>byte</type>
+	</source>
+	<source>
+		<name>sync</name>
+		<type>complex</type>
+		<optional>1</optional>
+	</source>
+</block>
diff --git a/gr-digital/python/qa_costas_loop_cc.py b/gr-digital/python/qa_costas_loop_cc.py
index 2d8ce6726..368704093 100644
--- a/gr-digital/python/qa_costas_loop_cc.py
+++ b/gr-digital/python/qa_costas_loop_cc.py
@@ -135,7 +135,6 @@ class test_digital(gr_unittest.TestCase):
         data = [2*rot*const[d] for d in data]
         
         N = 40 # settling time
-        data = [rot1*const[d] for d in data] # rotate to align with sync
         expected_result = data[N:]
 
         rot = cmath.exp(0.1j) # some small rotation