diff options
| author | Tom Rondeau <trondeau@vt.edu> | 2013-05-23 15:37:59 -0400 |
|---|---|---|
| committer | Tom Rondeau <trondeau@vt.edu> | 2013-05-23 15:41:44 -0400 |
| commit | 5bdd638f56775e50cce23ffe3bef241de53dcad1 (patch) | |
| tree | 828e51ccef639e691abccb58116777949de28ad8 /gr-analog/grc | |
| parent | 58fbb1695f17bb44ecc0ef268e2640a1f7f71906 (diff) | |
analog: updated AGC loops to have same interface; can init gain, max_gain defaults to 2e16, reset using set_max_gain.
Diffstat (limited to 'gr-analog/grc')
| -rw-r--r-- | gr-analog/grc/analog_agc2_xx.xml | 5 | ||||
| -rw-r--r-- | gr-analog/grc/analog_agc3_xx.xml | 17 | ||||
| -rw-r--r-- | gr-analog/grc/analog_agc_xx.xml | 5 |
3 files changed, 22 insertions, 5 deletions
diff --git a/gr-analog/grc/analog_agc2_xx.xml b/gr-analog/grc/analog_agc2_xx.xml index e57666873..04e9ad3ad 100644 --- a/gr-analog/grc/analog_agc2_xx.xml +++ b/gr-analog/grc/analog_agc2_xx.xml @@ -8,7 +8,8 @@ <name>AGC2</name> <key>analog_agc2_xx</key> <import>from gnuradio import analog</import> - <make>analog.agc2_$(type.fcn)($attack_rate, $decay_rate, $reference, $gain, $max_gain)</make> + <make>analog.agc2_$(type.fcn)($attack_rate, $decay_rate, $reference, $gain) +self.$(id).set_max_gain($max_gain)</make> <callback>set_attack_rate($attack_rate)</callback> <callback>set_decay_rate($decay_rate)</callback> <callback>set_reference($reference)</callback> @@ -56,7 +57,7 @@ <param> <name>Max Gain</name> <key>max_gain</key> - <value>0.0</value> + <value>2e16</value> <type>real</type> </param> <sink> diff --git a/gr-analog/grc/analog_agc3_xx.xml b/gr-analog/grc/analog_agc3_xx.xml index d39e81e66..9a3ad7930 100644 --- a/gr-analog/grc/analog_agc3_xx.xml +++ b/gr-analog/grc/analog_agc3_xx.xml @@ -8,10 +8,13 @@ <name>AGC3</name> <key>analog_agc3_xx</key> <import>from gnuradio import analog</import> - <make>analog.agc3_$(type.fcn)($attack_rate, $decay_rate, $reference)</make> + <make>analog.agc3_$(type.fcn)($attack_rate, $decay_rate, $reference, $gain) +self.$(id).set_max_gain($max_gain)</make> <callback>set_attack_rate($attack_rate)</callback> <callback>set_decay_rate($decay_rate)</callback> <callback>set_reference($reference)</callback> + <callback>set_gain($gain)</callback> + <callback>set_max_gain($max_gain)</callback> <param> <name>Type</name> <key>type</key> @@ -45,6 +48,18 @@ <value>1.0</value> <type>real</type> </param> + <param> + <name>Gain</name> + <key>gain</key> + <value>1.0</value> + <type>real</type> + </param> + <param> + <name>Max Gain</name> + <key>max_gain</key> + <value>2e16</value> + <type>real</type> + </param> <sink> <name>in</name> <type>$type</type> diff --git a/gr-analog/grc/analog_agc_xx.xml b/gr-analog/grc/analog_agc_xx.xml index 46797bff9..452cdc38f 100644 --- a/gr-analog/grc/analog_agc_xx.xml +++ b/gr-analog/grc/analog_agc_xx.xml @@ -8,7 +8,8 @@ <name>AGC</name> <key>analog_agc_xx</key> <import>from gnuradio import analog</import> - <make>analog.agc_$(type.fcn)($rate, $reference, $gain, $max_gain)</make> + <make>analog.agc_$(type.fcn)($rate, $reference, $gain) +self.$(id).set_max_gain($max_gain)</make> <callback>set_rate($rate)</callback> <callback>set_reference($reference)</callback> <callback>set_gain($gain)</callback> @@ -49,7 +50,7 @@ <param> <name>Max Gain</name> <key>max_gain</key> - <value>0.0</value> + <value>2e16</value> <type>real</type> </param> <sink> |