diff options
author | Tom Rondeau | 2011-12-30 13:49:14 -0500 |
---|---|---|
committer | Tom Rondeau | 2011-12-30 13:49:14 -0500 |
commit | dd84c8dfcb30617dbac56f49a57c1e363afe643b (patch) | |
tree | e6e4e71634dc4dc3f5e85ab5ff2c92e7ada8fa78 /gr-digital/grc | |
parent | 0cdc6e67f575f6c86ad12734f87cf83aed72b102 (diff) | |
parent | 9838bb040af5eb21cd88dbc9aae8d4bdf2838854 (diff) | |
download | gnuradio-dd84c8dfcb30617dbac56f49a57c1e363afe643b.tar.gz gnuradio-dd84c8dfcb30617dbac56f49a57c1e363afe643b.tar.bz2 gnuradio-dd84c8dfcb30617dbac56f49a57c1e363afe643b.zip |
Merge branch 'master' into next
Conflicts:
gr-digital/examples/Makefile.am
gr-digital/include/Makefile.am
gr-digital/lib/Makefile.am
gr-digital/python/Makefile.am
gr-digital/swig/Makefile.am
Diffstat (limited to 'gr-digital/grc')
-rw-r--r-- | gr-digital/grc/digital_dxpsk_demod.xml | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/gr-digital/grc/digital_dxpsk_demod.xml b/gr-digital/grc/digital_dxpsk_demod.xml index d5e742097..cfd474f68 100644 --- a/gr-digital/grc/digital_dxpsk_demod.xml +++ b/gr-digital/grc/digital_dxpsk_demod.xml @@ -33,6 +33,7 @@ <make>digital.$(type)_demod( samples_per_symbol=$samples_per_symbol, excess_bw=$excess_bw, + freq_bw=$freq_bw, phase_bw=$phase_bw, timing_bw=$timing_bw, gray_coded=$gray_coded, @@ -67,6 +68,12 @@ <type>real</type> </param> <param> + <name>FLL Bandwidth</name> + <key>freq_bw</key> + <value>6.28/100.0</value> + <type>real</type> + </param> + <param> <name>Phase Loop Bandwidth</name> <key>phase_bw</key> <value>6.28/100.0</value> |