diff options
| author | Johnathan Corgan | 2009-09-02 14:34:18 -0700 |
|---|---|---|
| committer | Johnathan Corgan | 2009-09-02 14:34:18 -0700 |
| commit | a36c92ed48fb80c78a97a200b92b98d36a7d4c05 (patch) | |
| tree | de1d9bddd0e6b1c356caff974da29d3147a717c1 /grc/blocks/usrp_simple_source_x.xml | |
| parent | 6fb2acc3c49e3bb7b8845d517c4bff4a8f5b0fa8 (diff) | |
| parent | 5c93024bc2d5235579bd3e815d56483935e9c48e (diff) | |
| download | gnuradio-a36c92ed48fb80c78a97a200b92b98d36a7d4c05.tar.gz gnuradio-a36c92ed48fb80c78a97a200b92b98d36a7d4c05.tar.bz2 gnuradio-a36c92ed48fb80c78a97a200b92b98d36a7d4c05.zip | |
Merge branch 'lo_fix' from http://gnuradio.org/git/jblum.git into master
* Modifications to usrp2 source and sink so that set center freq is called afer set lo offset.
* Modifications to the usrp blocks and wrapper so that the lo offset is set with the lo frequency.
Diffstat (limited to 'grc/blocks/usrp_simple_source_x.xml')
| -rw-r--r-- | grc/blocks/usrp_simple_source_x.xml | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/grc/blocks/usrp_simple_source_x.xml b/grc/blocks/usrp_simple_source_x.xml index 1a777bd63..7fcc7a22c 100644 --- a/grc/blocks/usrp_simple_source_x.xml +++ b/grc/blocks/usrp_simple_source_x.xml @@ -13,14 +13,18 @@ self.$(id).set_format(width=$format.width, shift=$format.shift) #end if self.$(id).set_decim_rate($decimation) -self.$(id).set_frequency($frequency, verbose=True) -self.$(id).set_gain($gain) +self.$(id).set_frequency($frequency, verbose=True#slurp #if $lo_offset() != float('inf') -self.$(id).set_lo_offset($lo_offset) -#end if</make> - <callback>set_lo_offset($lo_offset)</callback> +, lo_offset=$lo_offset#slurp +#end if +) +self.$(id).set_gain($gain)</make> <callback>set_decim_rate($decimation)</callback> - <callback>set_frequency($frequency)</callback> + <callback>set_frequency($frequency#slurp +#if $lo_offset() != float('inf') +, lo_offset=$lo_offset#slurp +#end if +)</callback> <callback>set_gain($gain)</callback> <param> <name>Output Type</name> |