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/usrp2_source_xxxx.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/usrp2_source_xxxx.xml')
| -rw-r--r-- | grc/blocks/usrp2_source_xxxx.xml | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/grc/blocks/usrp2_source_xxxx.xml b/grc/blocks/usrp2_source_xxxx.xml index 6c776d0ad..02046e609 100644 --- a/grc/blocks/usrp2_source_xxxx.xml +++ b/grc/blocks/usrp2_source_xxxx.xml @@ -2,6 +2,7 @@ <!-- ################################################### ##USRP2 Source +## Note: the center freq must be set after the lo offset ################################################### --> <block> @@ -16,14 +17,16 @@ usrp2.source_$(type.fcn)($interface) usrp2.source_$(type.fcn)($interface, $mac_addr) #end if self.$(id).set_decim($decimation) -self.$(id).set_center_freq($frequency) -self.$(id).set_gain($gain) #if $lo_offset() != float('inf') self.$(id).set_lo_offset($lo_offset) -#end if</make> - <callback>set_lo_offset($lo_offset)</callback> +#end if +self.$(id).set_center_freq($frequency) +self.$(id).set_gain($gain)</make> <callback>set_decim($decimation)</callback> - <callback>set_center_freq($frequency)</callback> + <callback>#if $lo_offset() != float('inf') +self.$(id).set_lo_offset($lo_offset) +#end if +self.$(id).set_center_freq($frequency)</callback> <callback>set_gain($gain)</callback> <param> <name>Output Type</name> |