diff options
| author | Johnathan Corgan | 2010-07-21 18:30:01 -0700 |
|---|---|---|
| committer | Johnathan Corgan | 2010-07-21 18:30:01 -0700 |
| commit | b055c7b35144093aa31830bf891c18a9751beb86 (patch) | |
| tree | 8c884a89dcfb8c5d7461edde361f9eafce4ee61b /grc | |
| parent | 22bc2fabead56a409315d6e7632494140680de36 (diff) | |
| parent | 9df7bb4aafc6196f15d2d2b4f4458368c6a685e8 (diff) | |
| download | gnuradio-b055c7b35144093aa31830bf891c18a9751beb86.tar.gz gnuradio-b055c7b35144093aa31830bf891c18a9751beb86.tar.bz2 gnuradio-b055c7b35144093aa31830bf891c18a9751beb86.zip | |
Merge branch 'master' into next
* master:
gnuradio-core: export missing public methods in gr.agc2
wxgui: fix to use wx.Colour which is the actual name of the class (wx python wrapper may be missing wx.Color wrapper)
From my reading, we should never need to define the timespec struct (so we will wait until this bites me).
Checking for clock_gettime and timespec defined; use gettimeofday if not, but put it into a timespec structure.
Reformatting highResTimeFunction.h for better readibility.
Diffstat (limited to 'grc')
| -rw-r--r-- | grc/blocks/gr_agc2_xx.xml | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/grc/blocks/gr_agc2_xx.xml b/grc/blocks/gr_agc2_xx.xml index fb3ae5704..55b20d4e8 100644 --- a/grc/blocks/gr_agc2_xx.xml +++ b/grc/blocks/gr_agc2_xx.xml @@ -9,6 +9,11 @@ <key>gr_agc2_xx</key> <import>from gnuradio import gr</import> <make>gr.agc2_$(type.fcn)($attack_rate, $decay_rate, $reference, $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> |