summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gr-digital/grc/digital_gmsk_demod.xml30
-rw-r--r--gr-digital/grc/digital_psk_demod.xml59
-rw-r--r--gr-digital/grc/digital_qam_demod.xml60
3 files changed, 55 insertions, 94 deletions
diff --git a/gr-digital/grc/digital_gmsk_demod.xml b/gr-digital/grc/digital_gmsk_demod.xml
index e037b8ea0..5f73574fe 100644
--- a/gr-digital/grc/digital_gmsk_demod.xml
+++ b/gr-digital/grc/digital_gmsk_demod.xml
@@ -10,10 +10,8 @@
<import>from gnuradio import digital</import>
<make>digital.gmsk_demod(
samples_per_symbol=$samples_per_symbol,
- gain_mu=$gain_mu,
- mu=$mu,
- omega_relative_limit=$omega_relative_limit,
- freq_error=$freq_error,
+ bt=$bt,
+ timing_bw=$bw,
verbose=$verbose,
log=$log,
)</make>
@@ -24,27 +22,15 @@
<type>int</type>
</param>
<param>
- <name>Gain Mu</name>
- <key>gain_mu</key>
- <value>0.175</value>
+ <name>BW-Time Product</name>
+ <key>bt</key>
+ <value>0.35</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>
+ <name>Timing Loop BW</name>
+ <key>bw</key>
+ <value>6.28/100.0</value>
<type>real</type>
</param>
<param>
diff --git a/gr-digital/grc/digital_psk_demod.xml b/gr-digital/grc/digital_psk_demod.xml
index b2628ac88..7e0773a98 100644
--- a/gr-digital/grc/digital_psk_demod.xml
+++ b/gr-digital/grc/digital_psk_demod.xml
@@ -32,14 +32,12 @@
<import>from gnuradio import digital</import>
<make>digital.psk.psk_demod(
constellation_points=$constellation_points,
- mod_code=$mod_code,
differential=$differential,
samples_per_symbol=$samples_per_symbol,
excess_bw=$excess_bw,
- freq_alpha=$freq_alpha,
- timing_alpha=$timing_alpha,
- timing_max_dev=$timing_max_dev,
- phase_alpha=$phase_alpha,
+ phase_bw=$phase_bw,
+ timing_bw=$timing_bw,
+ gray_coded=$gray_coded,
verbose=$verbose,
log=$log,
)</make>
@@ -50,19 +48,6 @@
<type>int</type>
</param>
<param>
- <name>Gray Code</name>
- <key>mod_code</key>
- <type>enum</type>
- <option>
- <name>Yes</name>
- <key>gray</key>
- </option>
- <option>
- <name>No</name>
- <key>none</key>
- </option>
- </param>
- <param>
<name>Differential Encoding</name>
<key>differential</key>
<value>True</value>
@@ -89,28 +74,35 @@
<type>real</type>
</param>
<param>
- <name>Frequency Alpha</name>
- <key>freq_alpha</key>
- <value>0.01</value>
+ <name>Frequency BW</name>
+ <key>freq_bw</key>
+ <value>6.28/100.0</value>
<type>real</type>
</param>
<param>
- <name>Timing Alpha</name>
- <key>timing_alpha</key>
- <value>0.100</value>
+ <name>Timing BW</name>
+ <key>timing_bw</key>
+ <value>6.28/100.0</value>
<type>real</type>
</param>
<param>
- <name>Timing Max Dev</name>
- <key>timing_max_dev</key>
- <value>1.5</value>
+ <name>Phase BW</name>
+ <key>phase_bw</key>
+ <value>6.28/100.0</value>
<type>real</type>
</param>
<param>
- <name>Phase Alpha</name>
- <key>phase_alpha</key>
- <value>0.1</value>
- <type>real</type>
+ <name>Gray Code</name>
+ <key>gray_coded</key>
+ <type>enum</type>
+ <option>
+ <name>Yes</name>
+ <key>"gray"</key>
+ </option>
+ <option>
+ <name>No</name>
+ <key>"none"</key>
+ </option>
</param>
<param>
<name>Verbose</name>
@@ -150,9 +142,4 @@
<name>out</name>
<type>byte</type>
</source>
- <source>
- <name>sync</name>
- <type>complex</type>
- <optional>1</optional>
- </source>
</block>
diff --git a/gr-digital/grc/digital_qam_demod.xml b/gr-digital/grc/digital_qam_demod.xml
index 88b20293e..4db1327e8 100644
--- a/gr-digital/grc/digital_qam_demod.xml
+++ b/gr-digital/grc/digital_qam_demod.xml
@@ -32,14 +32,13 @@
<import>from gnuradio import digital</import>
<make>digital.qam.qam_demod(
constellation_points=$constellation_points,
- mod_code=$mod_code,
differential=$differential,
samples_per_symbol=$samples_per_symbol,
excess_bw=$excess_bw,
- freq_alpha=$freq_alpha,
- timing_alpha=$timing_alpha,
- timing_max_dev=$timing_max_dev,
- phase_alpha=$phase_alpha,
+ freq_bw=$freq_bw,
+ timing_bw=$timing_bw,
+ phase_bw=$phase_bw,
+ gray_coded=$gray_coded,
verbose=$verbose,
log=$log,
)</make>
@@ -50,19 +49,6 @@
<type>int</type>
</param>
<param>
- <name>Gray Code</name>
- <key>mod_code</key>
- <type>enum</type>
- <option>
- <name>Yes</name>
- <key>gray</key>
- </option>
- <option>
- <name>No</name>
- <key>none</key>
- </option>
- </param>
- <param>
<name>Differential Encoding</name>
<key>differential</key>
<value>True</value>
@@ -89,28 +75,35 @@
<type>real</type>
</param>
<param>
- <name>Frequency Alpha</name>
- <key>freq_alpha</key>
- <value>0.01</value>
+ <name>Frequency BW</name>
+ <key>freq_bw</key>
+ <value>6.28/100.0</value>
<type>real</type>
</param>
<param>
- <name>Timing Alpha</name>
- <key>timing_alpha</key>
- <value>0.100</value>
+ <name>Timing BW</name>
+ <key>timing_bw</key>
+ <value>6.28/100.0</value>
<type>real</type>
</param>
<param>
- <name>Timing Max Dev</name>
- <key>timing_max_dev</key>
- <value>1.5</value>
+ <name>Phase BW</name>
+ <key>phase_bw</key>
+ <value>6.28/100.0</value>
<type>real</type>
</param>
<param>
- <name>Phase Alpha</name>
- <key>phase_alpha</key>
- <value>0.1</value>
- <type>real</type>
+ <name>Gray Code</name>
+ <key>gray_coded</key>
+ <type>enum</type>
+ <option>
+ <name>Yes</name>
+ <key>"gray"</key>
+ </option>
+ <option>
+ <name>No</name>
+ <key>"none"</key>
+ </option>
</param>
<param>
<name>Verbose</name>
@@ -150,9 +143,4 @@
<name>out</name>
<type>byte</type>
</source>
- <source>
- <name>sync</name>
- <type>complex</type>
- <optional>1</optional>
- </source>
</block>