From 1a9a1e15cfe63e0fb231d7be27487c0aab078fb3 Mon Sep 17 00:00:00 2001
From: Josh Blum
Date: Wed, 25 Nov 2009 16:51:24 -0800
Subject: added wrappers for the dxpsk2 blocks mod and demod

---
 grc/blocks/Makefile.am           | 2 ++
 grc/blocks/blks2_dxpsk_demod.xml | 2 +-
 grc/blocks/blks2_dxpsk_mod.xml   | 2 +-
 grc/blocks/block_tree.xml        | 3 +++
 4 files changed, 7 insertions(+), 2 deletions(-)

(limited to 'grc')

diff --git a/grc/blocks/Makefile.am b/grc/blocks/Makefile.am
index e436cc764..9c91af543 100644
--- a/grc/blocks/Makefile.am
+++ b/grc/blocks/Makefile.am
@@ -34,6 +34,8 @@ dist_ourdata_DATA = \
 	blks2_cvsd_decode.xml \
 	blks2_dxpsk_demod.xml \
 	blks2_dxpsk_mod.xml \
+	blks2_dxpsk2_demod.xml \
+	blks2_dxpsk2_mod.xml \
 	blks2_error_rate.xml \
 	blks2_fm_deemph.xml \
 	blks2_fm_demod_cf.xml \
diff --git a/grc/blocks/blks2_dxpsk_demod.xml b/grc/blocks/blks2_dxpsk_demod.xml
index 4c13b3415..1c96b6cec 100644
--- a/grc/blocks/blks2_dxpsk_demod.xml
+++ b/grc/blocks/blks2_dxpsk_demod.xml
@@ -76,7 +76,7 @@
 		<name>Gray Code</name>
 		<key>gray_code</key>
 		<value>True</value>
-		<type>enum</type>
+		<type>bool</type>
 		<option>
 			<name>Yes</name>
 			<key>True</key>
diff --git a/grc/blocks/blks2_dxpsk_mod.xml b/grc/blocks/blks2_dxpsk_mod.xml
index 28fd742fa..77505d8ad 100644
--- a/grc/blocks/blks2_dxpsk_mod.xml
+++ b/grc/blocks/blks2_dxpsk_mod.xml
@@ -48,7 +48,7 @@
 		<name>Gray Code</name>
 		<key>gray_code</key>
 		<value>True</value>
-		<type>enum</type>
+		<type>bool</type>
 		<option>
 			<name>Yes</name>
 			<key>True</key>
diff --git a/grc/blocks/block_tree.xml b/grc/blocks/block_tree.xml
index fc074cb69..57703f6d6 100644
--- a/grc/blocks/block_tree.xml
+++ b/grc/blocks/block_tree.xml
@@ -225,6 +225,9 @@
 		<block>blks2_dxpsk_mod</block>
 		<block>blks2_dxpsk_demod</block>
 
+		<block>blks2_dxpsk2_mod</block>
+		<block>blks2_dxpsk2_demod</block>
+
 		<block>blks2_gmsk_mod</block>
 		<block>blks2_gmsk_demod</block>
 
-- 
cgit 


From 7331b498973b1f1fd43e6770e60ef91150c06ed4 Mon Sep 17 00:00:00 2001
From: Josh Blum
Date: Wed, 25 Nov 2009 17:55:51 -0800
Subject: added missing block wrappers

---
 grc/blocks/blks2_dxpsk2_demod.xml | 122 ++++++++++++++++++++++++++++++++++++++
 grc/blocks/blks2_dxpsk2_mod.xml   |  95 +++++++++++++++++++++++++++++
 2 files changed, 217 insertions(+)
 create mode 100644 grc/blocks/blks2_dxpsk2_demod.xml
 create mode 100644 grc/blocks/blks2_dxpsk2_mod.xml

(limited to 'grc')

diff --git a/grc/blocks/blks2_dxpsk2_demod.xml b/grc/blocks/blks2_dxpsk2_demod.xml
new file mode 100644
index 000000000..98658442e
--- /dev/null
+++ b/grc/blocks/blks2_dxpsk2_demod.xml
@@ -0,0 +1,122 @@
+<?xml version="1.0"?>
+<!--
+###################################################
+##DPSK2 Demod - 2, 4
+###################################################
+ -->
+<block>
+	<name>DPSK2 Demod</name>
+	<key>blks2_dxpsk2_demod</key>
+	<import>from gnuradio import blks2</import>
+	<make>blks2.$(type)2_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,
+)</make>
+	<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>enum</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>
+	<sink>
+		<name>in</name>
+		<type>complex</type>
+	</sink>
+	<source>
+		<name>out</name>
+		<type>byte</type>
+	</source>
+</block>
diff --git a/grc/blocks/blks2_dxpsk2_mod.xml b/grc/blocks/blks2_dxpsk2_mod.xml
new file mode 100644
index 000000000..bf292be17
--- /dev/null
+++ b/grc/blocks/blks2_dxpsk2_mod.xml
@@ -0,0 +1,95 @@
+<?xml version="1.0"?>
+<!--
+###################################################
+##DPSK2 Mod - 2, 4
+###################################################
+ -->
+<block>
+	<name>DPSK2 Mod</name>
+	<key>blks2_dxpsk2_mod</key>
+	<import>from gnuradio import blks2</import>
+	<make>blks2.$(type)2_mod(
+	samples_per_symbol=$samples_per_symbol,
+	excess_bw=$excess_bw,
+	gray_code=$gray_code,
+	verbose=$verbose,
+	log=$log,
+)</make>
+	<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>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>
+	<sink>
+		<name>in</name>
+		<type>byte</type>
+	</sink>
+	<source>
+		<name>out</name>
+		<type>complex</type>
+	</source>
+</block>
-- 
cgit 


From a57968df0b3f85ebe1d2f0b70185f90430548a12 Mon Sep 17 00:00:00 2001
From: Josh Blum
Date: Wed, 25 Nov 2009 19:38:36 -0800
Subject: added sync output port to dxpsk2 demod

---
 grc/blocks/blks2_dxpsk2_demod.xml | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

(limited to 'grc')

diff --git a/grc/blocks/blks2_dxpsk2_demod.xml b/grc/blocks/blks2_dxpsk2_demod.xml
index 98658442e..c1af5368e 100644
--- a/grc/blocks/blks2_dxpsk2_demod.xml
+++ b/grc/blocks/blks2_dxpsk2_demod.xml
@@ -17,6 +17,7 @@
 	gray_code=$gray_code,
 	verbose=$verbose,
 	log=$log,
+	sync_out=$sync_out,
 )</make>
 	<param>
 		<name>Type</name>
@@ -71,7 +72,7 @@
 		<name>Gray Code</name>
 		<key>gray_code</key>
 		<value>True</value>
-		<type>enum</type>
+		<type>bool</type>
 		<option>
 			<name>Yes</name>
 			<key>True</key>
@@ -111,6 +112,20 @@
 			<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>
@@ -119,4 +134,9 @@
 		<name>out</name>
 		<type>byte</type>
 	</source>
+	<source>
+		<name>sync</name>
+		<type>complex</type>
+		<optional>1</optional>
+	</source>
 </block>
-- 
cgit 


From 2ff1da1f41d9604155cdec90a7b4aa992330e3bf Mon Sep 17 00:00:00 2001
From: Josh Blum
Date: Wed, 25 Nov 2009 20:09:07 -0800
Subject: added callbacks for setting alphas

---
 grc/blocks/blks2_dxpsk2_demod.xml | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'grc')

diff --git a/grc/blocks/blks2_dxpsk2_demod.xml b/grc/blocks/blks2_dxpsk2_demod.xml
index c1af5368e..ce8305c50 100644
--- a/grc/blocks/blks2_dxpsk2_demod.xml
+++ b/grc/blocks/blks2_dxpsk2_demod.xml
@@ -19,6 +19,9 @@
 	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>
-- 
cgit