summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjblum2009-05-05 23:45:16 +0000
committerjblum2009-05-05 23:45:16 +0000
commit7fd0afc85027948ae5303763ba4ad7e61a370b54 (patch)
tree28dee0cd133d6d71d7bd650fa3001237db329a1a
parentea38be33a7eeaa8f83e08417dbb660e09eb1a07d (diff)
downloadgnuradio-7fd0afc85027948ae5303763ba4ad7e61a370b54.tar.gz
gnuradio-7fd0afc85027948ae5303763ba4ad7e61a370b54.tar.bz2
gnuradio-7fd0afc85027948ae5303763ba4ad7e61a370b54.zip
lo offset for usrp2 wrappers
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@10970 221aa14e-8319-0410-a670-987f0aec2ac5
-rw-r--r--grc/data/platforms/python/blocks/usrp2_sink_xxxx.xml23
-rw-r--r--grc/data/platforms/python/blocks/usrp2_source_xxxx.xml21
2 files changed, 38 insertions, 6 deletions
diff --git a/grc/data/platforms/python/blocks/usrp2_sink_xxxx.xml b/grc/data/platforms/python/blocks/usrp2_sink_xxxx.xml
index 264ed4f20..279f65765 100644
--- a/grc/data/platforms/python/blocks/usrp2_sink_xxxx.xml
+++ b/grc/data/platforms/python/blocks/usrp2_sink_xxxx.xml
@@ -17,7 +17,11 @@ 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)</make>
+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>
<callback>set_interp($interpolation)</callback>
<callback>set_center_freq($frequency)</callback>
<callback>set_gain($gain)</callback>
@@ -54,12 +58,23 @@ self.$(id).set_gain($gain)</make>
<type>int</type>
</param>
<param>
- <name>Frequency</name>
+ <name>Frequency (Hz)</name>
<key>frequency</key>
<type>real</type>
</param>
<param>
- <name>Gain</name>
+ <name>LO Offset (Hz)</name>
+ <key>lo_offset</key>
+ <value>float('inf')</value>
+ <type>real</type>
+ <hide>#if $lo_offset() == float('inf') then 'part' else 'none'#</hide>
+ <option>
+ <name>Default</name>
+ <key>float('inf')</key>
+ </option>
+ </param>
+ <param>
+ <name>Gain (dB)</name>
<key>gain</key>
<type>real</type>
</param>
@@ -70,6 +85,8 @@ self.$(id).set_gain($gain)</make>
<doc>
The USRP2 sink inputs 100 Megasamples per second / interpolation.
+Input amplitude should be between 0.0 and 1.0.
+
To use the default ethernet device, leave interface blank. \
For systems with only 1 USRP2, you may leave the mac address blank. \
For multi-USRP2 systems, specify the mac address in the form 00:50:C2:85:3x:xx.
diff --git a/grc/data/platforms/python/blocks/usrp2_source_xxxx.xml b/grc/data/platforms/python/blocks/usrp2_source_xxxx.xml
index 54bea7a49..5ec45aeba 100644
--- a/grc/data/platforms/python/blocks/usrp2_source_xxxx.xml
+++ b/grc/data/platforms/python/blocks/usrp2_source_xxxx.xml
@@ -17,7 +17,11 @@ 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)</make>
+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>
<callback>set_decim($decimation)</callback>
<callback>set_center_freq($frequency)</callback>
<callback>set_gain($gain)</callback>
@@ -54,12 +58,23 @@ self.$(id).set_gain($gain)</make>
<type>int</type>
</param>
<param>
- <name>Frequency</name>
+ <name>Frequency (Hz)</name>
<key>frequency</key>
<type>real</type>
</param>
+ <param>
+ <name>LO Offset (Hz)</name>
+ <key>lo_offset</key>
+ <value>float('inf')</value>
+ <type>real</type>
+ <hide>#if $lo_offset() == float('inf') then 'part' else 'none'#</hide>
+ <option>
+ <name>Default</name>
+ <key>float('inf')</key>
+ </option>
+ </param>
<param>
- <name>Gain</name>
+ <name>Gain (dB)</name>
<key>gain</key>
<type>real</type>
</param>