diff options
| author | Tom Rondeau | 2011-03-29 00:48:49 -0400 |
|---|---|---|
| committer | Tom Rondeau | 2011-03-29 00:48:49 -0400 |
| commit | b30c79326c3eedf5ebf20be62306f0511b98a0e7 (patch) | |
| tree | b99ee11afbbc2010c6aa459d62bbe27836c28207 /gr-digital/grc | |
| parent | aa7098456732b705e8de1d939fe9ce96243816d9 (diff) | |
| download | gnuradio-b30c79326c3eedf5ebf20be62306f0511b98a0e7.tar.gz gnuradio-b30c79326c3eedf5ebf20be62306f0511b98a0e7.tar.bz2 gnuradio-b30c79326c3eedf5ebf20be62306f0511b98a0e7.zip | |
gr-digital: restructured Costas loop to be specified in terms of the damping factor and natural frequency instead of randomly setting the gains. Much more robust in simulation.
Diffstat (limited to 'gr-digital/grc')
| -rw-r--r-- | gr-digital/grc/digital_costas_loop_cc.xml | 30 |
1 files changed, 11 insertions, 19 deletions
diff --git a/gr-digital/grc/digital_costas_loop_cc.xml b/gr-digital/grc/digital_costas_loop_cc.xml index a2e4a6e11..087535b87 100644 --- a/gr-digital/grc/digital_costas_loop_cc.xml +++ b/gr-digital/grc/digital_costas_loop_cc.xml @@ -8,27 +8,17 @@ <name>Costas Loop</name> <key>digital_costas_loop_cc</key> <import>from gnuradio import digital</import> - <make>digital.costas_loop_cc($alpha, $beta, $max_freq, $min_freq, $order)</make> - <callback>set_alpha($alpha)</callback> - <callback>set_beta($beta)</callback> + <make>digital.costas_loop_cc($eta, $w, $order)</make> + <callback>set_damping_factor($eta)</callback> + <callback>set_natural_freq($w)</callback> <param> - <name>Alpha</name> - <key>alpha</key> + <name>Damping Factor</name> + <key>eta</key> <type>real</type> </param> <param> - <name>Beta</name> - <key>beta</key> - <type>real</type> - </param> - <param> - <name>Max Freq</name> - <key>max_freq</key> - <type>real</type> - </param> - <param> - <name>Min Freq</name> - <key>min_freq</key> + <name>Natural Frequency</name> + <key>w</key> <type>real</type> </param> <param> @@ -44,9 +34,11 @@ <name>out</name> <type>complex</type> </source> + + <!-- Optional Outputs --> <source> - <name>out</name> - <type>complex</type> + <name>frequency</name> + <type>float</type> <optional>1</optional> </source> </block> |