diff options
| author | Josh Blum | 2009-09-02 13:41:56 -0700 |
|---|---|---|
| committer | Josh Blum | 2009-09-02 13:41:56 -0700 |
| commit | 5c93024bc2d5235579bd3e815d56483935e9c48e (patch) | |
| tree | 689e373f6156108d46a3f98cd4c20123481e596e | |
| parent | 3d27662913c78f672e3f7d7d1ebc2013ee038387 (diff) | |
| download | gnuradio-5c93024bc2d5235579bd3e815d56483935e9c48e.tar.gz gnuradio-5c93024bc2d5235579bd3e815d56483935e9c48e.tar.bz2 gnuradio-5c93024bc2d5235579bd3e815d56483935e9c48e.zip | |
Modifications to usrp2 source and sink so that set center freq is called afer set lo offset.
| -rw-r--r-- | grc/blocks/usrp2_sink_xxxx.xml | 13 | ||||
| -rw-r--r-- | grc/blocks/usrp2_source_xxxx.xml | 13 |
2 files changed, 16 insertions, 10 deletions
diff --git a/grc/blocks/usrp2_sink_xxxx.xml b/grc/blocks/usrp2_sink_xxxx.xml index 639f96cf4..f2ee4d151 100644 --- a/grc/blocks/usrp2_sink_xxxx.xml +++ b/grc/blocks/usrp2_sink_xxxx.xml @@ -2,6 +2,7 @@ <!-- ################################################### ##USRP2 Sink +## Note: the center freq must be set after the lo offset ################################################### --> <block> @@ -16,14 +17,16 @@ usrp2.sink_$(type.fcn)($interface) usrp2.sink_$(type.fcn)($interface, $mac_addr) #end if self.$(id).set_interp($interpolation) -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_interp($interpolation)</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> 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> |