4 files changed, 178 insertions, 15 deletions
diff --git a/gr-digital/grc/digital_dxpsk_demod.xml b/gr-digital/grc/digital_dxpsk_demod.xml
index 6366596d9..f3e9ee6fc 100644
--- a/gr-digital/grc/digital_dxpsk_demod.xml
+++ b/gr-digital/grc/digital_dxpsk_demod.xml
@@ -36,7 +36,7 @@
 	freq_bw=$freq_bw,
 	phase_bw=$phase_bw,
 	timing_bw=$timing_bw,
-	mod_code=$mod_code,
+	gray_coded=$gray_coded,
 	verbose=$verbose,
 	log=$log
 )</make>
@@ -86,23 +86,17 @@
 		<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>mod_code</key>
+		<key>gray_coded</key>
 		<value>True</value>
 		<type>enum</type>
 		<option>
 			<name>Yes</name>
-			<key>"gray"</key>
+			<key>True</key>
 		</option>
 		<option>
 			<name>No</name>
-			<key>"none"</key>
+			<key>False</key>
 		</option>
 	</param>
 	<param>
diff --git a/gr-digital/grc/digital_dxpsk_mod.xml b/gr-digital/grc/digital_dxpsk_mod.xml
index 58e30436d..93334d27d 100644
--- a/gr-digital/grc/digital_dxpsk_mod.xml
+++ b/gr-digital/grc/digital_dxpsk_mod.xml
@@ -33,7 +33,7 @@
 	<make>digital.$(type)_mod(
 	samples_per_symbol=$samples_per_symbol,
 	excess_bw=$excess_bw,
-	mod_code=$mod_code,
+	gray_coded=$gray_coded,
 	verbose=$verbose,
 	log=$log)
 	</make>
@@ -68,16 +68,16 @@
 	</param>
 	<param>
 		<name>Gray Code</name>
-		<key>mod_code</key>
-		<value>"gray"</value>
+		<key>gray_coded</key>
+		<value>True</value>
 		<type>enum</type>
 		<option>
 			<name>Yes</name>
-			<key>"gray"</key>
+			<key>True</key>
 		</option>
 		<option>
 			<name>No</name>
-			<key>"none"</key>
+			<key>False</key>
 		</option>
 	</param>
 	<param>
diff --git a/gr-digital/grc/digital_gfsk_demod.xml b/gr-digital/grc/digital_gfsk_demod.xml
new file mode 100644
index 000000000..ce3024d89
--- /dev/null
+++ b/gr-digital/grc/digital_gfsk_demod.xml
@@ -0,0 +1,95 @@
+<?xml version="1.0"?>
+<!--
+###################################################
+##GFSK Demod
+###################################################
+ -->
+<block>
+	<name>GFSK Demod</name>
+	<key>digital_gfsk_demod</key>
+	<import>from gnuradio import digital</import>
+	<make>digital.gfsk_demod(
+	samples_per_symbol=$samples_per_symbol,
+	sensitivity=$sensitivity,
+	gain_mu=$gain_mu,
+	mu=$mu,
+	omega_relative_limit=$omega_relative_limit,
+	freq_error=$freq_error,
+	verbose=$verbose,
+	log=$log,
+)</make>
+	<param>
+		<name>Samples/Symbol</name>
+		<key>samples_per_symbol</key>
+		<value>2</value>
+		<type>int</type>
+	</param>
+	<param>
+		<name>Sensitivity</name>
+		<key>sensitivity</key>
+		<value>1.0</value>
+		<type>real</type>
+	</param>
+	<param>
+		<name>Gain Mu</name>
+		<key>gain_mu</key>
+		<value>0.175</value>
+		<type>real</type>
+	</param>
+	<param>
+		<name>Mu</name>
+		<key>mu</key>
+		<value>0.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>Freq Error</name>
+		<key>freq_error</key>
+		<value>0.0</value>
+		<type>real</type>
+	</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/gr-digital/grc/digital_gfsk_mod.xml b/gr-digital/grc/digital_gfsk_mod.xml
new file mode 100644
index 000000000..2d6cd1ea5
--- /dev/null
+++ b/gr-digital/grc/digital_gfsk_mod.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0"?>
+<!--
+###################################################
+##GFSK Mod
+###################################################
+ -->
+<block>
+	<name>GFSK Mod</name>
+	<key>digital_gfsk_mod</key>
+	<import>from gnuradio import digital</import>
+	<make>digital.gfsk_mod(
+	samples_per_symbol=$samples_per_symbol,
+	sensitivity=$sensitivity,
+	bt=$bt,
+	verbose=$verbose,
+	log=$log,
+)</make>
+	<param>
+		<name>Samples/Symbol</name>
+		<key>samples_per_symbol</key>
+		<value>2</value>
+		<type>int</type>
+	</param>
+	<param>
+		<name>Sensitivity</name>
+		<key>sensitivity</key>
+		<value>1.0</value>
+		<type>real</type>
+	</param>
+	<param>
+		<name>BT</name>
+		<key>bt</key>
+		<value>0.35</value>
+		<type>real</type>
+	</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>