diff options
| author | jblum | 2009-01-21 19:05:38 +0000 |
|---|---|---|
| committer | jblum | 2009-01-21 19:05:38 +0000 |
| commit | f1ee6a7c8ae0a57a119d167b6e767138f6c487d1 (patch) | |
| tree | 2f8e0f05f1757f0efdd92085cc4a946a50b02078 /grc/data/platforms | |
| parent | ec73b08c2d615f1a151eb7af0037ca95b22f8585 (diff) | |
| download | gnuradio-f1ee6a7c8ae0a57a119d167b6e767138f6c487d1.tar.gz gnuradio-f1ee6a7c8ae0a57a119d167b6e767138f6c487d1.tar.bz2 gnuradio-f1ee6a7c8ae0a57a119d167b6e767138f6c487d1.zip | |
usrp2 function names, usrp2 contructor usage
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@10277 221aa14e-8319-0410-a670-987f0aec2ac5
Diffstat (limited to 'grc/data/platforms')
| -rw-r--r-- | grc/data/platforms/python/blocks/usrp2_probe.xml | 2 | ||||
| -rw-r--r-- | grc/data/platforms/python/blocks/usrp2_sink_xxxx.xml | 16 | ||||
| -rw-r--r-- | grc/data/platforms/python/blocks/usrp2_source_xxxx.xml | 16 |
3 files changed, 23 insertions, 11 deletions
diff --git a/grc/data/platforms/python/blocks/usrp2_probe.xml b/grc/data/platforms/python/blocks/usrp2_probe.xml index afe5cf4f4..cc3f9c2fd 100644 --- a/grc/data/platforms/python/blocks/usrp2_probe.xml +++ b/grc/data/platforms/python/blocks/usrp2_probe.xml @@ -12,7 +12,7 @@ <param> <name>Interface</name> <key>interface</key> - <value>eth0</value> + <value></value> <type>string</type> </param> <param> diff --git a/grc/data/platforms/python/blocks/usrp2_sink_xxxx.xml b/grc/data/platforms/python/blocks/usrp2_sink_xxxx.xml index d8aef1fa6..352fe4ce0 100644 --- a/grc/data/platforms/python/blocks/usrp2_sink_xxxx.xml +++ b/grc/data/platforms/python/blocks/usrp2_sink_xxxx.xml @@ -8,9 +8,15 @@ <name>USRP2 Sink</name> <key>usrp2_sink_xxxx</key> <import>from gnuradio import usrp2</import> - <make>usrp2.sink_$(type.fcn)($interface, $mac_addr) -self.$(id).set_interp_rate($interpolation) -self.$(id).set_frequency($frequency) + <make>#if not $interface.eval and not $mac_addr.eval +usrp2.sink_$(type.fcn)() +#elif not $mac_addr.eval +usrp2.sink_$(type.fcn)($interface) +#else +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 $auto_tr.eval self.$(id).set_auto_tr($auto_tr) @@ -19,8 +25,8 @@ self.$(id).set_auto_tr($auto_tr) self.$(id).set_enable($tx_enb) #end if </make> - <callback>set_interp_rate($interpolation)</callback> - <callback>set_frequency($frequency)</callback> + <callback>set_interp($interpolation)</callback> + <callback>set_center_freq($frequency)</callback> <callback>set_gain($gain)</callback> <param> <name>Output Type</name> diff --git a/grc/data/platforms/python/blocks/usrp2_source_xxxx.xml b/grc/data/platforms/python/blocks/usrp2_source_xxxx.xml index 5ba4d3f64..548baa8d9 100644 --- a/grc/data/platforms/python/blocks/usrp2_source_xxxx.xml +++ b/grc/data/platforms/python/blocks/usrp2_source_xxxx.xml @@ -8,9 +8,15 @@ <name>USRP2 Source</name> <key>usrp2_source_xxxx</key> <import>from gnuradio import usrp2</import> - <make>usrp2.source_$(type.fcn)($interface, $mac_addr) -self.$(id).set_decim_rate($decimation) -self.$(id).set_frequency($frequency) + <make>#if not $interface.eval and not $mac_addr.eval +usrp2.source_$(type.fcn)() +#elif not $mac_addr.eval +usrp2.source_$(type.fcn)($interface) +#else +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 $auto_tr.eval self.$(id).set_auto_tr($auto_tr) @@ -19,8 +25,8 @@ self.$(id).set_auto_tr($auto_tr) self.$(id).select_rx_antenna($rx_ant) #end if </make> - <callback>set_decim_rate($decimation)</callback> - <callback>set_frequency($frequency)</callback> + <callback>set_decim($decimation)</callback> + <callback>set_center_freq($frequency)</callback> <callback>set_gain($gain)</callback> <param> <name>Output Type</name> |