diff options
| -rw-r--r-- | gr-digital/grc/Makefile.am | 4 | ||||
| -rw-r--r-- | gr-digital/grc/digital_block_tree.xml | 2 | ||||
| -rw-r--r-- | gr-digital/grc/digital_fll_band_edge_cc.xml (renamed from grc/blocks/gr_fll_band_edge_cc.xml) | 16 | ||||
| -rw-r--r-- | gr-digital/grc/digital_mpsk_receiver_cc.xml (renamed from grc/blocks/gr_mpsk_receiver_cc.xml) | 14 | ||||
| -rw-r--r-- | grc/blocks/Makefile.am | 2 | ||||
| -rw-r--r-- | grc/blocks/block_tree.xml | 3 |
6 files changed, 14 insertions, 27 deletions
diff --git a/gr-digital/grc/Makefile.am b/gr-digital/grc/Makefile.am index d271ca06a..963939f12 100644 --- a/gr-digital/grc/Makefile.am +++ b/gr-digital/grc/Makefile.am @@ -34,4 +34,6 @@ dist_grcblocks_DATA = \ digital_psk_mod.xml \ digital_psk_demod.xml \ digital_qam_mod.xml \ - digital_qam_demod.xml + digital_qam_demod.xml \ + digital_fll_band_edge_cc.xml \ + digital_mpsk_receiver_cc.xml diff --git a/gr-digital/grc/digital_block_tree.xml b/gr-digital/grc/digital_block_tree.xml index 1be4110e1..3432d876c 100644 --- a/gr-digital/grc/digital_block_tree.xml +++ b/gr-digital/grc/digital_block_tree.xml @@ -34,6 +34,8 @@ <block>digital_cma_equalizer_cc</block> <block>digital_lms_dd_equalizer_cc</block> <block>digital_kurtotic_equalizer_cc</block> + <block>digital_fll_band_edge_cc</block> + <block>digital_mpsk_receiver_cc</block> </cat> <cat> <name>Digital Modulators</name> diff --git a/grc/blocks/gr_fll_band_edge_cc.xml b/gr-digital/grc/digital_fll_band_edge_cc.xml index 5a13ac49b..1c5a34e54 100644 --- a/grc/blocks/gr_fll_band_edge_cc.xml +++ b/gr-digital/grc/digital_fll_band_edge_cc.xml @@ -8,10 +8,8 @@ <name>FLL Band-Edge</name> <key>gr_fll_band_edge_cc</key> <import>from gnuradio import gr</import> - <make>gr.fll_band_edge_cc($samps_per_sym, $rolloff, $filter_size, $alpha, $beta)</make> - <callback>set_alpha($alpha)</callback> - <callback>set_beta($beta)</callback> - + <make>gr.fll_band_edge_cc($samps_per_sym, $rolloff, $filter_size, $w)</make> + <callback>set_loop_bandwidth($w)</callback> <param> <name>Type</name> <key>type</key> @@ -41,15 +39,11 @@ </param> <param> - <name>Alpha</name> - <key>alpha</key> - <type>real</type> - </param> - <param> - <name>Beta</name> - <key>beta</key> + <name>Loop Bandwidth</name> + <key>w</key> <type>real</type> </param> + <sink> <name>in</name> <type>$type.input</type> diff --git a/grc/blocks/gr_mpsk_receiver_cc.xml b/gr-digital/grc/digital_mpsk_receiver_cc.xml index 843c3a4c1..948f18b6e 100644 --- a/grc/blocks/gr_mpsk_receiver_cc.xml +++ b/gr-digital/grc/digital_mpsk_receiver_cc.xml @@ -8,9 +8,8 @@ <name>MPSK Receiver</name> <key>gr_mpsk_receiver_cc</key> <import>from gnuradio import gr</import> - <make>gr.mpsk_receiver_cc($M, $theta, $alpha, $beta, $fmin, $fmax, $mu, $gain_mu, $omega, $gain_omega, $omega_relative_limit)</make> - <callback>set_alpha($alpha)</callback> - <callback>set_beta($beta)</callback> + <make>gr.mpsk_receiver_cc($M, $theta, $w, $fmin, $fmax, $mu, $gain_mu, $omega, $gain_omega, $omega_relative_limit)</make> + <callback>set_loop_bandwidth($w)</callback> <callback>set_mu($mu)</callback> <callback>set_gain_mu($gain_mu)</callback> <callback>set_omega($omega)</callback> @@ -26,13 +25,8 @@ <type>real</type> </param> <param> - <name>Alpha</name> - <key>alpha</key> - <type>real</type> - </param> - <param> - <name>Beta</name> - <key>beta</key> + <name>Loop Bandwidth</name> + <key>w</key> <type>real</type> </param> <param> diff --git a/grc/blocks/Makefile.am b/grc/blocks/Makefile.am index 0360ebc80..6f72fe399 100644 --- a/grc/blocks/Makefile.am +++ b/grc/blocks/Makefile.am @@ -109,7 +109,6 @@ dist_ourdata_DATA = \ gr_file_source.xml \ gr_filter_delay_fc.xml \ gr_fir_filter_xxx.xml \ - gr_fll_band_edge_cc.xml \ gr_float_to_char.xml \ gr_float_to_complex.xml \ gr_float_to_short.xml \ @@ -136,7 +135,6 @@ dist_ourdata_DATA = \ gr_message_sink.xml \ gr_message_source.xml \ gr_moving_average_xx.xml \ - gr_mpsk_receiver_cc.xml \ gr_mpsk_sync_cc.xml \ gr_multiply_const_vxx.xml \ gr_multiply_xx.xml \ diff --git a/grc/blocks/block_tree.xml b/grc/blocks/block_tree.xml index 3dc247aec..f5365dcb5 100644 --- a/grc/blocks/block_tree.xml +++ b/grc/blocks/block_tree.xml @@ -121,14 +121,11 @@ <block>gr_costas_loop_cc</block> <block>gr_mpsk_sync_cc</block> - <block>gr_mpsk_receiver_cc</block> <block>gr_pll_carriertracking_cc</block> <block>gr_pll_freqdet_cf</block> <block>gr_pll_refout_cc</block> - <block>gr_fll_band_edge_cc</block> - <block>gr_correlate_access_code_bb</block> <block>gr_pn_correlator_cc</block> <block>gr_simple_correlator</block> |