summaryrefslogtreecommitdiff
path: root/grc/examples/usrp
diff options
context:
space:
mode:
Diffstat (limited to 'grc/examples/usrp')
-rw-r--r--grc/examples/usrp/Makefile.am30
-rw-r--r--grc/examples/usrp/usrp2_const_wave.grc168
-rw-r--r--grc/examples/usrp/usrp2_dpsk_mod.grc693
-rw-r--r--grc/examples/usrp/usrp2_fft.grc133
-rw-r--r--grc/examples/usrp/usrp_two_tone_loopback.grc527
-rw-r--r--grc/examples/usrp/usrp_wbfm_receive.grc294
6 files changed, 1347 insertions, 498 deletions
diff --git a/grc/examples/usrp/Makefile.am b/grc/examples/usrp/Makefile.am
deleted file mode 100644
index 4e969ebd4..000000000
--- a/grc/examples/usrp/Makefile.am
+++ /dev/null
@@ -1,30 +0,0 @@
-#
-# Copyright 2008, 2009 Free Software Foundation, Inc.
-#
-# This file is part of GNU Radio
-#
-# GNU Radio is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3, or (at your option)
-# any later version.
-#
-# GNU Radio is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with GNU Radio; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 51 Franklin Street,
-# Boston, MA 02110-1301, USA.
-#
-
-include $(top_srcdir)/grc/Makefile.inc
-
-ourdatadir = $(grc_examples_prefix)/usrp
-
-dist_ourdata_DATA = \
- usrp2_const_wave.grc \
- usrp2_fft.grc \
- usrp_two_tone_loopback.grc \
- usrp_wbfm_receive.grc
diff --git a/grc/examples/usrp/usrp2_const_wave.grc b/grc/examples/usrp/usrp2_const_wave.grc
index ac9570349..fdbd7c1f3 100644
--- a/grc/examples/usrp/usrp2_const_wave.grc
+++ b/grc/examples/usrp/usrp2_const_wave.grc
@@ -1,43 +1,93 @@
<?xml version='1.0' encoding='ASCII'?>
<flow_graph>
- <timestamp>Fri Jan 23 11:26:26 2009</timestamp>
+ <timestamp>Wed Apr 15 11:22:56 2009</timestamp>
<block>
- <key>options</key>
+ <key>const_source_x</key>
<param>
<key>id</key>
- <value>top_block</value>
+ <value>const_source_x_0</value>
</param>
<param>
<key>_enabled</key>
<value>True</value>
</param>
<param>
- <key>title</key>
- <value>USRP2 Const Wave</value>
+ <key>type</key>
+ <value>complex</value>
</param>
<param>
- <key>author</key>
- <value>Example</value>
+ <key>const</key>
+ <value>ampl</value>
</param>
<param>
- <key>description</key>
- <value>Carrier with constant amplitude</value>
+ <key>_coordinate</key>
+ <value>(284, 154)</value>
</param>
<param>
- <key>window_size</key>
- <value>1280, 1024</value>
+ <key>_rotation</key>
+ <value>0</value>
</param>
+ </block>
+ <block>
+ <key>usrp2_sink_xxxx</key>
<param>
- <key>generate_options</key>
- <value>wx_gui</value>
+ <key>id</key>
+ <value>usrp2_sink_xxxx_0</value>
</param>
<param>
- <key>category</key>
- <value>Custom</value>
+ <key>_enabled</key>
+ <value>True</value>
+ </param>
+ <param>
+ <key>type</key>
+ <value>complex</value>
+ </param>
+ <param>
+ <key>interface</key>
+ <value></value>
+ </param>
+ <param>
+ <key>mac_addr</key>
+ <value></value>
+ </param>
+ <param>
+ <key>interpolation</key>
+ <value>interp</value>
+ </param>
+ <param>
+ <key>frequency</key>
+ <value>tun_freq</value>
+ </param>
+ <param>
+ <key>gain</key>
+ <value>0</value>
</param>
<param>
<key>_coordinate</key>
- <value>(10, 10)</value>
+ <value>(493, 106)</value>
+ </param>
+ <param>
+ <key>_rotation</key>
+ <value>0</value>
+ </param>
+ </block>
+ <block>
+ <key>variable</key>
+ <param>
+ <key>id</key>
+ <value>interp</value>
+ </param>
+ <param>
+ <key>_enabled</key>
+ <value>True</value>
+ </param>
+ <param>
+ <key>value</key>
+ <value>16</value>
+ </param>
+ <param>
+ <key>_coordinate</key>
+ <value>(16, 255)</value>
</param>
<param>
<key>_rotation</key>
@@ -48,7 +98,7 @@
<key>variable_slider</key>
<param>
<key>id</key>
- <value>freq</value>
+ <value>tun_freq</value>
</param>
<param>
<key>_enabled</key>
@@ -56,19 +106,19 @@
</param>
<param>
<key>label</key>
- <value>Frequency (Hz)</value>
+ <value>USRP2 Freq (Hz)</value>
</param>
<param>
<key>value</key>
- <value>15e6</value>
+ <value>2.45e9</value>
</param>
<param>
<key>min</key>
- <value>10e6</value>
+ <value>2.4e9</value>
</param>
<param>
<key>max</key>
- <value>20e6</value>
+ <value>2.5e9</value>
</param>
<param>
<key>num_steps</key>
@@ -88,7 +138,7 @@
</param>
<param>
<key>_coordinate</key>
- <value>(12, 144)</value>
+ <value>(30, 376)</value>
</param>
<param>
<key>_rotation</key>
@@ -96,42 +146,50 @@
</param>
</block>
<block>
- <key>gr_sig_source_x</key>
+ <key>variable_slider</key>
<param>
<key>id</key>
- <value>gr_sig_source_x_0</value>
+ <value>ampl</value>
</param>
<param>
<key>_enabled</key>
<value>True</value>
</param>
<param>
- <key>type</key>
- <value>complex</value>
+ <key>label</key>
+ <value>Amplitude</value>
+ </param>
+ <param>
+ <key>value</key>
+ <value>.1</value>
</param>
<param>
- <key>samp_rate</key>
+ <key>min</key>
<value>0</value>
</param>
<param>
- <key>waveform</key>
- <value>gr.GR_CONST_WAVE</value>
+ <key>max</key>
+ <value>1</value>
</param>
<param>
- <key>freq</key>
- <value>0</value>
+ <key>num_steps</key>
+ <value>100</value>
+ </param>
+ <param>
+ <key>slider_length</key>
+ <value>200</value>
</param>
<param>
- <key>amp</key>
- <value>10e3</value>
+ <key>slider_type</key>
+ <value>horizontal</value>
</param>
<param>
- <key>offset</key>
- <value>0</value>
+ <key>grid_pos</key>
+ <value></value>
</param>
<param>
<key>_coordinate</key>
- <value>(225, 27)</value>
+ <value>(204, 376)</value>
</param>
<param>
<key>_rotation</key>
@@ -139,50 +197,46 @@
</param>
</block>
<block>
- <key>usrp2_sink_xxxx</key>
+ <key>options</key>
<param>
<key>id</key>
- <value>usrp2_sink_xxxx_0</value>
+ <value>usrp2_const_wave</value>
</param>
<param>
<key>_enabled</key>
<value>True</value>
</param>
<param>
- <key>type</key>
- <value>complex</value>
- </param>
- <param>
- <key>interface</key>
- <value></value>
+ <key>title</key>
+ <value>USRP2 Constant Wave</value>
</param>
<param>
- <key>mac_addr</key>
- <value></value>
+ <key>author</key>
+ <value>Example</value>
</param>
<param>
- <key>frequency</key>
- <value>freq</value>
+ <key>description</key>
+ <value>Tune USRP2</value>
</param>
<param>
- <key>interpolation</key>
- <value>101</value>
+ <key>window_size</key>
+ <value>1280, 1024</value>
</param>
<param>
- <key>gain</key>
- <value>0</value>
+ <key>generate_options</key>
+ <value>wx_gui</value>
</param>
<param>
- <key>auto_tr</key>
- <value></value>
+ <key>category</key>
+ <value>Custom</value>
</param>
<param>
- <key>tx_enb</key>
+ <key>realtime_scheduling</key>
<value></value>
</param>
<param>
<key>_coordinate</key>
- <value>(391, 190)</value>
+ <value>(10, 10)</value>
</param>
<param>
<key>_rotation</key>
@@ -190,7 +244,7 @@
</param>
</block>
<connection>
- <source_block_id>gr_sig_source_x_0</source_block_id>
+ <source_block_id>const_source_x_0</source_block_id>
<sink_block_id>usrp2_sink_xxxx_0</sink_block_id>
<source_key>0</source_key>
<sink_key>0</sink_key>
diff --git a/grc/examples/usrp/usrp2_dpsk_mod.grc b/grc/examples/usrp/usrp2_dpsk_mod.grc
new file mode 100644
index 000000000..e9f9b41ea
--- /dev/null
+++ b/grc/examples/usrp/usrp2_dpsk_mod.grc
@@ -0,0 +1,693 @@
+<?xml version='1.0' encoding='ASCII'?>
+<flow_graph>
+ <timestamp>Wed Apr 15 17:31:00 2009</timestamp>
+ <block>
+ <key>options</key>
+ <param>
+ <key>id</key>
+ <value>usrp2_dpsk_mod</value>
+ </param>
+ <param>
+ <key>_enabled</key>
+ <value>True</value>
+ </param>
+ <param>
+ <key>title</key>
+ <value>USRP2 DPSK Modulation</value>
+ </param>
+ <param>
+ <key>author</key>
+ <value>Example</value>
+ </param>
+ <param>
+ <key>description</key>
+ <value>Generate a DPSK signal</value>
+ </param>
+ <param>
+ <key>window_size</key>
+ <value>1280, 1024</value>
+ </param>
+ <param>
+ <key>generate_options</key>
+ <value>wx_gui</value>
+ </param>
+ <param>
+ <key>category</key>
+ <value>Custom</value>
+ </param>
+ <param>
+ <key>realtime_scheduling</key>
+ <value></value>
+ </param>
+ <param>
+ <key>_coordinate</key>
+ <value>(10, 10)</value>
+ </param>
+ <param>
+ <key>_rotation</key>
+ <value>0</value>
+ </param>
+ </block>
+ <block>
+ <key>variable</key>
+ <param>
+ <key>id</key>
+ <value>samp_rate</value>
+ </param>
+ <param>
+ <key>_enabled</key>
+ <value>True</value>
+ </param>
+ <param>
+ <key>value</key>
+ <value>100e6/interp</value>
+ </param>
+ <param>
+ <key>_coordinate</key>
+ <value>(52, 166)</value>
+ </param>
+ <param>
+ <key>_rotation</key>
+ <value>0</value>
+ </param>
+ </block>
+ <block>
+ <key>usrp2_sink_xxxx</key>
+ <param>
+ <key>id</key>
+ <value>usrp2_sink_xxxx_0</value>
+ </param>
+ <param>
+ <key>_enabled</key>
+ <value>True</value>
+ </param>
+ <param>
+ <key>type</key>
+ <value>complex</value>
+ </param>
+ <param>
+ <key>interface</key>
+ <value></value>
+ </param>
+ <param>
+ <key>mac_addr</key>
+ <value></value>
+ </param>
+ <param>
+ <key>interpolation</key>
+ <value>interp</value>
+ </param>
+ <param>
+ <key>frequency</key>
+ <value>tun_freq</value>
+ </param>
+ <param>
+ <key>gain</key>
+ <value>0</value>
+ </param>
+ <param>
+ <key>_coordinate</key>
+ <value>(1059, 56)</value>
+ </param>
+ <param>
+ <key>_rotation</key>
+ <value>0</value>
+ </param>
+ </block>
+ <block>
+ <key>gr_multiply_const_vxx</key>
+ <param>
+ <key>id</key>
+ <value>gr_multiply_const_vxx_0</value>
+ </param>
+ <param>
+ <key>_enabled</key>
+ <value>True</value>
+ </param>
+ <param>
+ <key>type</key>
+ <value>complex</value>
+ </param>
+ <param>
+ <key>const</key>
+ <value>ampl</value>
+ </param>
+ <param>
+ <key>vlen</key>
+ <value>1</value>
+ </param>
+ <param>
+ <key>_coordinate</key>
+ <value>(679, 58)</value>
+ </param>
+ <param>
+ <key>_rotation</key>
+ <value>0</value>
+ </param>
+ </block>
+ <block>
+ <key>blks2_dxpsk_mod</key>
+ <param>
+ <key>id</key>
+ <value>blks2_dxpsk_mod_0</value>
+ </param>
+ <param>
+ <key>_enabled</key>
+ <value>True</value>
+ </param>
+ <param>
+ <key>type</key>
+ <value>dqpsk</value>
+ </param>
+ <param>
+ <key>samples_per_symbol</key>
+ <value>samps_per_sym</value>
+ </param>
+ <param>
+ <key>excess_bw</key>
+ <value>0.35</value>
+ </param>
+ <param>
+ <key>gray_code</key>
+ <value>True</value>
+ </param>
+ <param>
+ <key>_coordinate</key>
+ <value>(468, 55)</value>
+ </param>
+ <param>
+ <key>_rotation</key>
+ <value>0</value>
+ </param>
+ </block>
+ <block>
+ <key>variable</key>
+ <param>
+ <key>id</key>
+ <value>interp</value>
+ </param>
+ <param>
+ <key>_enabled</key>
+ <value>True</value>
+ </param>
+ <param>
+ <key>value</key>
+ <value>100</value>
+ </param>
+ <param>
+ <key>_coordinate</key>
+ <value>(31, 256)</value>
+ </param>
+ <param>
+ <key>_rotation</key>
+ <value>0</value>
+ </param>
+ </block>
+ <block>
+ <key>variable</key>
+ <param>
+ <key>id</key>
+ <value>samps_per_sym</value>
+ </param>
+ <param>
+ <key>_enabled</key>
+ <value>True</value>
+ </param>
+ <param>
+ <key>value</key>
+ <value>8</value>
+ </param>
+ <param>
+ <key>_coordinate</key>
+ <value>(126, 250)</value>
+ </param>
+ <param>
+ <key>_rotation</key>
+ <value>0</value>
+ </param>
+ </block>
+ <block>
+ <key>random_source_x</key>
+ <param>
+ <key>id</key>
+ <value>random_source_x_0</value>
+ </param>
+ <param>
+ <key>_enabled</key>
+ <value>True</value>
+ </param>
+ <param>
+ <key>type</key>
+ <value>byte</value>
+ </param>
+ <param>
+ <key>min</key>
+ <value>0</value>
+ </param>
+ <param>
+ <key>max</key>
+ <value>256</value>
+ </param>
+ <param>
+ <key>num_samps</key>
+ <value>1000</value>
+ </param>
+ <param>
+ <key>repeat</key>
+ <value>True</value>
+ </param>
+ <param>
+ <key>_coordinate</key>
+ <value>(255, 39)</value>
+ </param>
+ <param>
+ <key>_rotation</key>
+ <value>0</value>
+ </param>
+ </block>
+ <block>
+ <key>variable_slider</key>
+ <param>
+ <key>id</key>
+ <value>ampl</value>
+ </param>
+ <param>
+ <key>_enabled</key>
+ <value>True</value>
+ </param>
+ <param>
+ <key>label</key>
+ <value>Amplitude</value>
+ </param>
+ <param>
+ <key>value</key>
+ <value>.1</value>
+ </param>
+ <param>
+ <key>min</key>
+ <value>0</value>
+ </param>
+ <param>
+ <key>max</key>
+ <value>1</value>
+ </param>
+ <param>
+ <key>num_steps</key>
+ <value>100</value>
+ </param>
+ <param>
+ <key>style</key>
+ <value>wx.SL_HORIZONTAL</value>
+ </param>
+ <param>
+ <key>converver</key>
+ <value>float_converter</value>
+ </param>
+ <param>
+ <key>grid_pos</key>
+ <value></value>
+ </param>
+ <param>
+ <key>_coordinate</key>
+ <value>(246, 372)</value>
+ </param>
+ <param>
+ <key>_rotation</key>
+ <value>0</value>
+ </param>
+ </block>
+ <block>
+ <key>variable_slider</key>
+ <param>
+ <key>id</key>
+ <value>rx_freq_off</value>
+ </param>
+ <param>
+ <key>_enabled</key>
+ <value>True</value>
+ </param>
+ <param>
+ <key>label</key>
+ <value>RX Freq Offset (Hz)</value>
+ </param>
+ <param>
+ <key>value</key>
+ <value>-20e3</value>
+ </param>
+ <param>
+ <key>min</key>
+ <value>-50e3</value>
+ </param>
+ <param>
+ <key>max</key>
+ <value>+50e3</value>
+ </param>
+ <param>
+ <key>num_steps</key>
+ <value>100</value>
+ </param>
+ <param>
+ <key>style</key>
+ <value>wx.SL_HORIZONTAL</value>
+ </param>
+ <param>
+ <key>converver</key>
+ <value>float_converter</value>
+ </param>
+ <param>
+ <key>grid_pos</key>
+ <value></value>
+ </param>
+ <param>
+ <key>_coordinate</key>
+ <value>(247, 508)</value>
+ </param>
+ <param>
+ <key>_rotation</key>
+ <value>0</value>
+ </param>
+ </block>
+ <block>
+ <key>variable_slider</key>
+ <param>
+ <key>id</key>
+ <value>tun_freq</value>
+ </param>
+ <param>
+ <key>_enabled</key>
+ <value>True</value>
+ </param>
+ <param>
+ <key>label</key>
+ <value>USRP2 Freq (Hz)</value>
+ </param>
+ <param>
+ <key>value</key>
+ <value>2.45e9</value>
+ </param>
+ <param>
+ <key>min</key>
+ <value>2.4e9</value>
+ </param>
+ <param>
+ <key>max</key>
+ <value>2.5e9</value>
+ </param>
+ <param>
+ <key>num_steps</key>
+ <value>100</value>
+ </param>
+ <param>
+ <key>style</key>
+ <value>wx.SL_HORIZONTAL</value>
+ </param>
+ <param>
+ <key>converver</key>
+ <value>float_converter</value>
+ </param>
+ <param>
+ <key>grid_pos</key>
+ <value></value>
+ </param>
+ <param>
+ <key>_coordinate</key>
+ <value>(49, 341)</value>
+ </param>
+ <param>
+ <key>_rotation</key>
+ <value>0</value>
+ </param>
+ </block>
+ <block>
+ <key>wxgui_constellationsink2</key>
+ <param>
+ <key>id</key>
+ <value>wxgui_constellationsink2_0</value>
+ </param>
+ <param>
+ <key>_enabled</key>
+ <value>True</value>
+ </param>
+ <param>
+ <key>title</key>
+ <value>Constellation Plot</value>
+ </param>
+ <param>
+ <key>samp_rate</key>
+ <value>samp_rate</value>
+ </param>
+ <param>
+ <key>frame_rate</key>
+ <value>5</value>
+ </param>
+ <param>
+ <key>const_size</key>
+ <value>2048</value>
+ </param>
+ <param>
+ <key>M</key>
+ <value>4</value>
+ </param>
+ <param>
+ <key>theta</key>
+ <value>0</value>
+ </param>
+ <param>
+ <key>alpha</key>
+ <value>0.005</value>
+ </param>
+ <param>
+ <key>fmax</key>
+ <value>0.06</value>
+ </param>
+ <param>
+ <key>mu</key>
+ <value>0.5</value>
+ </param>
+ <param>
+ <key>gain_mu</key>
+ <value>0.005</value>
+ </param>
+ <param>
+ <key>symbol_rate</key>
+ <value>samp_rate/samps_per_sym</value>
+ </param>
+ <param>
+ <key>omega_limit</key>
+ <value>0.005</value>
+ </param>
+ <param>
+ <key>grid_pos</key>
+ <value></value>
+ </param>
+ <param>
+ <key>_coordinate</key>
+ <value>(920, 202)</value>
+ </param>
+ <param>
+ <key>_rotation</key>
+ <value>0</value>
+ </param>
+ </block>
+ <block>
+ <key>wxgui_fftsink2</key>
+ <param>
+ <key>id</key>
+ <value>wxgui_fftsink2_0</value>
+ </param>
+ <param>
+ <key>_enabled</key>
+ <value>True</value>
+ </param>
+ <param>
+ <key>type</key>
+ <value>complex</value>
+ </param>
+ <param>
+ <key>title</key>
+ <value>FFT Plot</value>
+ </param>
+ <param>
+ <key>samp_rate</key>
+ <value>samp_rate</value>
+ </param>
+ <param>
+ <key>baseband_freq</key>
+ <value>tun_freq</value>
+ </param>
+ <param>
+ <key>y_per_div</key>
+ <value>10</value>
+ </param>
+ <param>
+ <key>ref_level</key>
+ <value>10</value>
+ </param>
+ <param>
+ <key>fft_size</key>
+ <value>1024</value>
+ </param>
+ <param>
+ <key>fft_rate</key>
+ <value>30</value>
+ </param>
+ <param>
+ <key>peak_hold</key>
+ <value>False</value>
+ </param>
+ <param>
+ <key>average</key>
+ <value>False</value>
+ </param>
+ <param>
+ <key>avg_alpha</key>
+ <value>0</value>
+ </param>
+ <param>
+ <key>grid_pos</key>
+ <value></value>
+ </param>
+ <param>
+ <key>_coordinate</key>
+ <value>(691, 155)</value>
+ </param>
+ <param>
+ <key>_rotation</key>
+ <value>0</value>
+ </param>
+ </block>
+ <block>
+ <key>wxgui_scopesink2</key>
+ <param>
+ <key>id</key>
+ <value>wxgui_scopesink2_0</value>
+ </param>
+ <param>
+ <key>_enabled</key>
+ <value>False</value>
+ </param>
+ <param>
+ <key>type</key>
+ <value>complex</value>
+ </param>
+ <param>
+ <key>title</key>
+ <value>Scope Plot</value>
+ </param>
+ <param>
+ <key>samp_rate</key>
+ <value>samp_rate</value>
+ </param>
+ <param>
+ <key>v_scale</key>
+ <value>0</value>
+ </param>
+ <param>
+ <key>t_scale</key>
+ <value>1e-6</value>
+ </param>
+ <param>
+ <key>ac_couple</key>
+ <value>False</value>
+ </param>
+ <param>
+ <key>xy_mode</key>
+ <value>True</value>
+ </param>
+ <param>
+ <key>num_inputs</key>
+ <value>1</value>
+ </param>
+ <param>
+ <key>grid_pos</key>
+ <value></value>
+ </param>
+ <param>
+ <key>_coordinate</key>
+ <value>(515, 272)</value>
+ </param>
+ <param>
+ <key>_rotation</key>
+ <value>0</value>
+ </param>
+ </block>
+ <block>
+ <key>usrp2_source_xxxx</key>
+ <param>
+ <key>id</key>
+ <value>usrp2_source_xxxx_0</value>
+ </param>
+ <param>
+ <key>_enabled</key>
+ <value>True</value>
+ </param>
+ <param>
+ <key>type</key>
+ <value>complex</value>
+ </param>
+ <param>
+ <key>interface</key>
+ <value>eth1</value>
+ </param>
+ <param>
+ <key>mac_addr</key>
+ <value></value>
+ </param>
+ <param>
+ <key>decimation</key>
+ <value>interp</value>
+ </param>
+ <param>
+ <key>frequency</key>
+ <value>tun_freq + rx_freq_off</value>
+ </param>
+ <param>
+ <key>gain</key>
+ <value>30</value>
+ </param>
+ <param>
+ <key>_coordinate</key>
+ <value>(270, 200)</value>
+ </param>
+ <param>
+ <key>_rotation</key>
+ <value>0</value>
+ </param>
+ </block>
+ <connection>
+ <source_block_id>random_source_x_0</source_block_id>
+ <sink_block_id>blks2_dxpsk_mod_0</sink_block_id>
+ <source_key>0</source_key>
+ <sink_key>0</sink_key>
+ </connection>
+ <connection>
+ <source_block_id>blks2_dxpsk_mod_0</source_block_id>
+ <sink_block_id>gr_multiply_const_vxx_0</sink_block_id>
+ <source_key>0</source_key>
+ <sink_key>0</sink_key>
+ </connection>
+ <connection>
+ <source_block_id>gr_multiply_const_vxx_0</source_block_id>
+ <sink_block_id>usrp2_sink_xxxx_0</sink_block_id>
+ <source_key>0</source_key>
+ <sink_key>0</sink_key>
+ </connection>
+ <connection>
+ <source_block_id>usrp2_source_xxxx_0</source_block_id>
+ <sink_block_id>wxgui_constellationsink2_0</sink_block_id>
+ <source_key>0</source_key>
+ <sink_key>0</sink_key>
+ </connection>
+ <connection>
+ <source_block_id>usrp2_source_xxxx_0</source_block_id>
+ <sink_block_id>wxgui_scopesink2_0</sink_block_id>
+ <source_key>0</source_key>
+ <sink_key>0</sink_key>
+ </connection>
+ <connection>
+ <source_block_id>usrp2_source_xxxx_0</source_block_id>
+ <sink_block_id>wxgui_fftsink2_0</sink_block_id>
+ <source_key>0</source_key>
+ <sink_key>0</sink_key>
+ </connection>
+</flow_graph>
diff --git a/grc/examples/usrp/usrp2_fft.grc b/grc/examples/usrp/usrp2_fft.grc
index e7e93b3ff..134bd4614 100644
--- a/grc/examples/usrp/usrp2_fft.grc
+++ b/grc/examples/usrp/usrp2_fft.grc
@@ -1,11 +1,11 @@
<?xml version='1.0' encoding='ASCII'?>
<flow_graph>
- <timestamp>Fri Jan 23 11:38:11 2009</timestamp>
+ <timestamp>Wed Apr 15 17:30:20 2009</timestamp>
<block>
<key>options</key>
<param>
<key>id</key>
- <value>top_block</value>
+ <value>usrp2_fft</value>
</param>
<param>
<key>_enabled</key>
@@ -13,7 +13,7 @@
</param>
<param>
<key>title</key>
- <value>USRP2 FFT</value>
+ <value>USRP2 FFT Plotter</value>
</param>
<param>
<key>author</key>
@@ -21,7 +21,7 @@
</param>
<param>
<key>description</key>
- <value>FFT of Spectrum</value>
+ <value>FFT waveform plot</value>
</param>
<param>
<key>window_size</key>
@@ -36,6 +36,10 @@
<value>Custom</value>
</param>
<param>
+ <key>realtime_scheduling</key>
+ <value></value>
+ </param>
+ <param>
<key>_coordinate</key>
<value>(10, 10)</value>
</param>
@@ -48,6 +52,29 @@
<key>variable</key>
<param>
<key>id</key>
+ <value>samp_rate</value>
+ </param>
+ <param>
+ <key>_enabled</key>
+ <value>True</value>
+ </param>
+ <param>
+ <key>value</key>
+ <value>100e6/decim</value>
+ </param>
+ <param>
+ <key>_coordinate</key>
+ <value>(10, 170)</value>
+ </param>
+ <param>
+ <key>_rotation</key>
+ <value>0</value>
+ </param>
+ </block>
+ <block>
+ <key>variable</key>
+ <param>
+ <key>id</key>
<value>decim</value>
</param>
<param>
@@ -56,11 +83,11 @@
</param>
<param>
<key>value</key>
- <value>4</value>
+ <value>16</value>
</param>
<param>
<key>_coordinate</key>
- <value>(35, 149)</value>
+ <value>(24, 267)</value>
</param>
<param>
<key>_rotation</key>
@@ -68,50 +95,50 @@
</param>
</block>
<block>
- <key>usrp2_source_xxxx</key>
+ <key>variable_slider</key>
<param>
<key>id</key>
- <value>usrp2_source_xxxx_0</value>
+ <value>tun_freq</value>
</param>
<param>
<key>_enabled</key>
<value>True</value>
</param>
<param>
- <key>type</key>
- <value>complex</value>
+ <key>label</key>
+ <value>USRP2 Freq (Hz)</value>
</param>
<param>
- <key>interface</key>
- <value></value>
+ <key>value</key>
+ <value>2.45e9</value>
</param>
<param>
- <key>mac_addr</key>
- <value></value>
+ <key>min</key>
+ <value>2.4e9</value>
</param>
<param>
- <key>frequency</key>
- <value>freq</value>
+ <key>max</key>
+ <value>2.5e9</value>
</param>
<param>
- <key>decimation</key>
- <value>decim</value>
+ <key>num_steps</key>
+ <value>100</value>
</param>
<param>
- <key>gain</key>
- <value>0</value>
+ <key>style</key>
+ <value>wx.SL_HORIZONTAL</value>
</param>
<param>
- <key>auto_tr</key>
- <value></value>
+ <key>converver</key>
+ <value>float_converter</value>
</param>
<param>
- <key>rx_ant</key>
+ <key>grid_pos</key>
<value></value>
</param>
<param>
<key>_coordinate</key>
- <value>(177, 271)</value>
+ <value>(32, 365)</value>
</param>
<param>
<key>_rotation</key>
@@ -138,23 +165,19 @@
</param>
<param>
<key>samp_rate</key>
- <value>100e6/decim</value>
+ <value>samp_rate</value>
</param>
<param>
<key>baseband_freq</key>
- <value>freq</value>
+ <value>tun_freq</value>
</param>
<param>
<key>y_per_div</key>
<value>10</value>
</param>
<param>
- <key>y_divs</key>
- <value>12</value>
- </param>
- <param>
<key>ref_level</key>
- <value>20</value>
+ <value>10</value>
</param>
<param>
<key>fft_size</key>
@@ -165,16 +188,16 @@
<value>30</value>
</param>
<param>
- <key>avg_alpha</key>
- <value>0</value>
+ <key>peak_hold</key>
+ <value>False</value>
</param>
<param>
<key>average</key>
<value>False</value>
</param>
<param>
- <key>peak_hold</key>
- <value>False</value>
+ <key>avg_alpha</key>
+ <value>0</value>
</param>
<param>
<key>grid_pos</key>
@@ -182,7 +205,7 @@
</param>
<param>
<key>_coordinate</key>
- <value>(384, 72)</value>
+ <value>(466, 100)</value>
</param>
<param>
<key>_rotation</key>
@@ -190,50 +213,42 @@
</param>
</block>
<block>
- <key>variable_slider</key>
+ <key>usrp2_source_xxxx</key>
<param>
<key>id</key>
- <value>freq</value>
+ <value>usrp2_source_xxxx_0</value>
</param>
<param>
<key>_enabled</key>
<value>True</value>
</param>
<param>
- <key>label</key>
- <value>Frequency (Hz)</value>
- </param>
- <param>
- <key>value</key>
- <value>0</value>
- </param>
- <param>
- <key>min</key>
- <value>-100e6</value>
+ <key>type</key>
+ <value>complex</value>
</param>
<param>
- <key>max</key>
- <value>100e6</value>
+ <key>interface</key>
+ <value></value>
</param>
<param>
- <key>num_steps</key>
- <value>100</value>
+ <key>mac_addr</key>
+ <value></value>
</param>
<param>
- <key>slider_length</key>
- <value>200</value>
+ <key>decimation</key>
+ <value>decim</value>
</param>
<param>
- <key>slider_type</key>
- <value>horizontal</value>
+ <key>frequency</key>
+ <value>tun_freq</value>
</param>
<param>
- <key>grid_pos</key>
- <value></value>
+ <key>gain</key>
+ <value>0</value>
</param>
<param>
<key>_coordinate</key>
- <value>(139, 129)</value>
+ <value>(211, 200)</value>
</param>
<param>
<key>_rotation</key>
diff --git a/grc/examples/usrp/usrp_two_tone_loopback.grc b/grc/examples/usrp/usrp_two_tone_loopback.grc
index e3c635d46..3df977044 100644
--- a/grc/examples/usrp/usrp_two_tone_loopback.grc
+++ b/grc/examples/usrp/usrp_two_tone_loopback.grc
@@ -1,43 +1,46 @@
<?xml version='1.0' encoding='ASCII'?>
<flow_graph>
- <timestamp>Mon Sep 8 21:47:19 2008</timestamp>
+ <timestamp>Fri Apr 17 18:23:35 2009</timestamp>
<block>
- <key>options</key>
+ <key>variable</key>
<param>
<key>id</key>
- <value>top_block</value>
+ <value>samp_rate</value>
</param>
<param>
<key>_enabled</key>
<value>True</value>
</param>
<param>
- <key>title</key>
- <value>USRP Loopback - 2 Tone</value>
+ <key>value</key>
+ <value>64e6/200</value>
</param>
<param>
- <key>author</key>
- <value>Example</value>
+ <key>_coordinate</key>
+ <value>(9, 166)</value>
</param>
<param>
- <key>description</key>
- <value>Loopback test with basic rx and basic tx</value>
+ <key>_rotation</key>
+ <value>0</value>
</param>
+ </block>
+ <block>
+ <key>variable</key>
<param>
- <key>window_size</key>
- <value>1280, 1024</value>
+ <key>id</key>
+ <value>tun_freq</value>
</param>
<param>
- <key>generate_options</key>
- <value>wx_gui</value>
+ <key>_enabled</key>
+ <value>True</value>
</param>
<param>
- <key>category</key>
- <value>Custom</value>
+ <key>value</key>
+ <value>int(100e6)</value>
</param>
<param>
<key>_coordinate</key>
- <value>(10, 10)</value>
+ <value>(116, 166)</value>
</param>
<param>
<key>_rotation</key>
@@ -45,10 +48,10 @@
</param>
</block>
<block>
- <key>usrp_simple_source_x</key>
+ <key>gr_sig_source_x</key>
<param>
<key>id</key>
- <value>usrp_simple_source_x</value>
+ <value>gr_sig_source_x</value>
</param>
<param>
<key>_enabled</key>
@@ -59,40 +62,28 @@
<value>complex</value>
</param>
<param>
- <key>number</key>
- <value>0</value>
- </param>
- <param>
- <key>subdev_spec</key>
- <value>None</value>
- </param>
- <param>
- <key>frequency</key>
- <value>tun_freq</value>
- </param>
- <param>
- <key>decimation</key>
- <value>200</value>
+ <key>samp_rate</key>
+ <value>samp_rate</value>
</param>
<param>
- <key>gain</key>
- <value>20</value>
+ <key>waveform</key>
+ <value>gr.GR_COS_WAVE</value>
</param>
<param>
- <key>mux</key>
- <value>0x0</value>
+ <key>freq</key>
+ <value>tone1</value>
</param>
<param>
- <key>auto_tr</key>
- <value>None</value>
+ <key>amp</key>
+ <value>tone_ampl</value>
</param>
<param>
- <key>rx_ant</key>
- <value>None</value>
+ <key>offset</key>
+ <value>0</value>
</param>
<param>
<key>_coordinate</key>
- <value>(578, 319)</value>
+ <value>(258, 20)</value>
</param>
<param>
<key>_rotation</key>
@@ -100,10 +91,10 @@
</param>
</block>
<block>
- <key>wxgui_fftsink2</key>
+ <key>gr_sig_source_x</key>
<param>
<key>id</key>
- <value>wxgui_fftsink2</value>
+ <value>gr_sig_source_x0</value>
</param>
<param>
<key>_enabled</key>
@@ -114,56 +105,59 @@
<value>complex</value>
</param>
<param>
- <key>title</key>
- <value>FFT Plot</value>
- </param>
- <param>
<key>samp_rate</key>
<value>samp_rate</value>
</param>
<param>
- <key>baseband_freq</key>
- <value>0</value>
+ <key>waveform</key>
+ <value>gr.GR_COS_WAVE</value>
</param>
<param>
- <key>y_per_div</key>
- <value>10</value>
+ <key>freq</key>
+ <value>tone2</value>
</param>
<param>
- <key>y_divs</key>
- <value>8</value>
+ <key>amp</key>
+ <value>tone_ampl</value>
</param>
<param>
- <key>ref_level</key>
- <value>100</value>
+ <key>offset</key>
+ <value>0</value>
</param>
<param>
- <key>fft_size</key>
- <value>512*2</value>
+ <key>_coordinate</key>
+ <value>(255, 179)</value>
</param>
<param>
- <key>fft_rate</key>
- <value>15</value>
+ <key>_rotation</key>
+ <value>0</value>
</param>
+ </block>
+ <block>
+ <key>gr_add_xx</key>
<param>
- <key>avg_alpha</key>
- <value>0</value>
+ <key>id</key>
+ <value>gr_add_xx</value>
</param>
<param>
- <key>average</key>
- <value>False</value>
+ <key>_enabled</key>
+ <value>True</value>
</param>
<param>
- <key>peak_hold</key>
- <value>False</value>
+ <key>type</key>
+ <value>complex</value>
</param>
<param>
- <key>grid_pos</key>
- <value>1, 2, 2, 4</value>
+ <key>num_inputs</key>
+ <value>3</value>
+ </param>
+ <param>
+ <key>vlen</key>
+ <value>1</value>
</param>
<param>
<key>_coordinate</key>
- <value>(845, 228)</value>
+ <value>(528, 78)</value>
</param>
<param>
<key>_rotation</key>
@@ -171,10 +165,10 @@
</param>
</block>
<block>
- <key>variable_slider</key>
+ <key>parameter</key>
<param>
<key>id</key>
- <value>tone2</value>
+ <value>tx_side</value>
</param>
<param>
<key>_enabled</key>
@@ -182,35 +176,19 @@
</param>
<param>
<key>label</key>
- <value>Tone 2</value>
+ <value></value>
</param>
<param>
<key>value</key>
- <value>75e3</value>
+ <value>A</value>
</param>
<param>
- <key>min</key>
- <value>0</value>
- </param>
- <param>
- <key>max</key>
- <value>150000</value>
- </param>
- <param>
- <key>num_steps</key>
- <value>100</value>
- </param>
- <param>
- <key>slider_type</key>
- <value>horizontal</value>
- </param>
- <param>
- <key>grid_pos</key>
- <value>0, 4, 1, 2</value>
+ <key>type</key>
+ <value>string</value>
</param>
<param>
<key>_coordinate</key>
- <value>(397, 478)</value>
+ <value>(688, 384)</value>
</param>
<param>
<key>_rotation</key>
@@ -218,46 +196,50 @@
</param>
</block>
<block>
- <key>variable_slider</key>
+ <key>usrp_simple_sink_x</key>
<param>
<key>id</key>
- <value>tone1</value>
+ <value>usrp_simple_sink_x</value>
</param>
<param>
<key>_enabled</key>
<value>True</value>
</param>
<param>
- <key>label</key>
- <value>Tone 1</value>
+ <key>type</key>
+ <value>complex</value>
</param>
<param>
- <key>value</key>
- <value>50e3</value>
+ <key>format</key>
+ <value></value>
</param>
<param>
- <key>min</key>
+ <key>which</key>
<value>0</value>
</param>
<param>
- <key>max</key>
- <value>150000</value>
+ <key>interpolation</key>
+ <value>400</value>
</param>
<param>
- <key>num_steps</key>
- <value>100</value>
+ <key>frequency</key>
+ <value>tun_freq</value>
</param>
<param>
- <key>slider_type</key>
- <value>horizontal</value>
+ <key>gain</key>
+ <value>0</value>
</param>
<param>
- <key>grid_pos</key>
- <value>0, 2, 1, 2</value>
+ <key>side</key>
+ <value>tx_side</value>
+ </param>
+ <param>
+ <key>transmit</key>
+ <value></value>
</param>
<param>
<key>_coordinate</key>
- <value>(220, 475)</value>
+ <value>(835, 5)</value>
</param>
<param>
<key>_rotation</key>
@@ -265,46 +247,54 @@
</param>
</block>
<block>
- <key>variable_slider</key>
+ <key>usrp_simple_source_x</key>
<param>
<key>id</key>
- <value>noise_ampl</value>
+ <value>usrp_simple_source_x</value>
</param>
<param>
<key>_enabled</key>
<value>True</value>
</param>
<param>
- <key>label</key>
- <value>Noise Ampl</value>
+ <key>type</key>
+ <value>complex</value>
</param>
<param>
- <key>value</key>
- <value>2000</value>
+ <key>format</key>
+ <value></value>
</param>
<param>
- <key>min</key>
+ <key>which</key>
<value>0</value>
</param>
<param>
- <key>max</key>
- <value>5000</value>
+ <key>decimation</key>
+ <value>200</value>
</param>
<param>
- <key>num_steps</key>
- <value>100</value>
+ <key>frequency</key>
+ <value>tun_freq</value>
</param>
<param>
- <key>slider_type</key>
- <value>vertical</value>
+ <key>gain</key>
+ <value>20</value>
</param>
<param>
- <key>grid_pos</key>
- <value>1, 1, 2, 1</value>
+ <key>side</key>
+ <value>rx_side</value>
+ </param>
+ <param>
+ <key>rx_ant</key>
+ <value>rx_ant</value>
+ </param>
+ <param>
+ <key>hb_filters</key>
+ <value></value>
</param>
<param>
<key>_coordinate</key>
- <value>(20, 243)</value>
+ <value>(479, 224)</value>
</param>
<param>
<key>_rotation</key>
@@ -312,22 +302,30 @@
</param>
</block>
<block>
- <key>variable</key>
+ <key>parameter</key>
<param>
<key>id</key>
- <value>samp_rate</value>
+ <value>rx_ant</value>
</param>
<param>
<key>_enabled</key>
<value>True</value>
</param>
<param>
+ <key>label</key>
+ <value></value>
+ </param>
+ <param>
<key>value</key>
- <value>64e6/200</value>
+ <value>RXA</value>
+ </param>
+ <param>
+ <key>type</key>
+ <value>string</value>
</param>
<param>
<key>_coordinate</key>
- <value>(9, 166)</value>
+ <value>(802, 384)</value>
</param>
<param>
<key>_rotation</key>
@@ -335,65 +333,66 @@
</param>
</block>
<block>
- <key>variable</key>
+ <key>wxgui_fftsink2</key>
<param>
<key>id</key>
- <value>tun_freq</value>
+ <value>wxgui_fftsink2</value>
</param>
<param>
<key>_enabled</key>
<value>True</value>
</param>
<param>
- <key>value</key>
- <value>int(100e6)</value>
+ <key>type</key>
+ <value>complex</value>
</param>
<param>
- <key>_coordinate</key>
- <value>(116, 166)</value>
+ <key>title</key>
+ <value>FFT Plot</value>
</param>
<param>
- <key>_rotation</key>
- <value>0</value>
+ <key>samp_rate</key>
+ <value>samp_rate</value>
</param>
- </block>
- <block>
- <key>gr_sig_source_x</key>
<param>
- <key>id</key>
- <value>gr_sig_source_x</value>
+ <key>baseband_freq</key>
+ <value>0</value>
</param>
<param>
- <key>_enabled</key>
- <value>True</value>
+ <key>y_per_div</key>
+ <value>10</value>
</param>
<param>
- <key>type</key>
- <value>complex</value>
+ <key>ref_level</key>
+ <value>100</value>
</param>
<param>
- <key>samp_rate</key>
- <value>samp_rate</value>
+ <key>fft_size</key>
+ <value>512*2</value>
</param>
<param>
- <key>waveform</key>
- <value>gr.GR_COS_WAVE</value>
+ <key>fft_rate</key>
+ <value>15</value>
</param>
<param>
- <key>freq</key>
- <value>tone1</value>
+ <key>peak_hold</key>
+ <value>False</value>
</param>
<param>
- <key>amp</key>
- <value>tone_ampl</value>
+ <key>average</key>
+ <value>False</value>
</param>
<param>
- <key>offset</key>
+ <key>avg_alpha</key>
<value>0</value>
</param>
<param>
+ <key>grid_pos</key>
+ <value>1, 2, 2, 4</value>
+ </param>
+ <param>
<key>_coordinate</key>
- <value>(258, 20)</value>
+ <value>(746, 133)</value>
</param>
<param>
<key>_rotation</key>
@@ -401,42 +400,30 @@
</param>
</block>
<block>
- <key>gr_sig_source_x</key>
+ <key>parameter</key>
<param>
<key>id</key>
- <value>gr_sig_source_x0</value>
+ <value>rx_side</value>
</param>
<param>
<key>_enabled</key>
<value>True</value>
</param>
<param>
- <key>type</key>
- <value>complex</value>
- </param>
- <param>
- <key>samp_rate</key>
- <value>samp_rate</value>
- </param>
- <param>
- <key>waveform</key>
- <value>gr.GR_COS_WAVE</value>
- </param>
- <param>
- <key>freq</key>
- <value>tone2</value>
+ <key>label</key>
+ <value></value>
</param>
<param>
- <key>amp</key>
- <value>tone_ampl</value>
+ <key>value</key>
+ <value>A</value>
</param>
<param>
- <key>offset</key>
- <value>0</value>
+ <key>type</key>
+ <value>string</value>
</param>
<param>
<key>_coordinate</key>
- <value>(255, 179)</value>
+ <value>(568, 382)</value>
</param>
<param>
<key>_rotation</key>
@@ -471,7 +458,7 @@
</param>
<param>
<key>_coordinate</key>
- <value>(257, 337)</value>
+ <value>(276, 312)</value>
</param>
<param>
<key>_rotation</key>
@@ -479,30 +466,50 @@
</param>
</block>
<block>
- <key>gr_add_xx</key>
+ <key>variable_slider</key>
<param>
<key>id</key>
- <value>gr_add_xx</value>
+ <value>noise_ampl</value>
</param>
<param>
<key>_enabled</key>
<value>True</value>
</param>
<param>
- <key>type</key>
- <value>complex</value>
+ <key>label</key>
+ <value>Noise Ampl</value>
</param>
<param>
- <key>num_inputs</key>
- <value>3</value>
+ <key>value</key>
+ <value>2000</value>
</param>
<param>
- <key>vlen</key>
- <value>1</value>
+ <key>min</key>
+ <value>0</value>
+ </param>
+ <param>
+ <key>max</key>
+ <value>5000</value>
+ </param>
+ <param>
+ <key>num_steps</key>
+ <value>100</value>
+ </param>
+ <param>
+ <key>style</key>
+ <value>wx.SL_VERTICAL</value>
+ </param>
+ <param>
+ <key>converver</key>
+ <value>float_converter</value>
+ </param>
+ <param>
+ <key>grid_pos</key>
+ <value>1, 1, 2, 1</value>
</param>
<param>
<key>_coordinate</key>
- <value>(528, 78)</value>
+ <value>(20, 243)</value>
</param>
<param>
<key>_rotation</key>
@@ -510,54 +517,101 @@
</param>
</block>
<block>
- <key>usrp_simple_sink_x</key>
+ <key>variable_slider</key>
<param>
<key>id</key>
- <value>usrp_simple_sink_x</value>
+ <value>tone_ampl</value>
</param>
<param>
<key>_enabled</key>
<value>True</value>
</param>
<param>
- <key>type</key>
- <value>complex</value>
+ <key>label</key>
+ <value>Tone Ampl</value>
</param>
<param>
- <key>number</key>
+ <key>value</key>
+ <value>5000</value>
+ </param>
+ <param>
+ <key>min</key>
<value>0</value>
</param>
<param>
- <key>subdev_spec</key>
- <value>None</value>
+ <key>max</key>
+ <value>10e3</value>
</param>
<param>
- <key>frequency</key>
- <value>tun_freq</value>
+ <key>num_steps</key>
+ <value>100</value>
</param>
<param>
- <key>interpolation</key>
- <value>400</value>
+ <key>style</key>
+ <value>wx.SL_VERTICAL</value>
</param>
<param>
- <key>gain</key>
+ <key>converver</key>
+ <value>float_converter</value>
+ </param>
+ <param>
+ <key>grid_pos</key>
+ <value>1, 0, 2, 1</value>
+ </param>
+ <param>
+ <key>_coordinate</key>
+ <value>(28, 437)</value>
+ </param>
+ <param>
+ <key>_rotation</key>
<value>0</value>
</param>
+ </block>
+ <block>
+ <key>variable_slider</key>
<param>
- <key>mux</key>
- <value>0x0</value>
+ <key>id</key>
+ <value>tone1</value>
</param>
<param>
- <key>auto_tr</key>
- <value>None</value>
+ <key>_enabled</key>
+ <value>True</value>
</param>
<param>
- <key>tx_enb</key>
- <value>None</value>
+ <key>label</key>
+ <value>Tone 1</value>
+ </param>
+ <param>
+ <key>value</key>
+ <value>50e3</value>
+ </param>
+ <param>
+ <key>min</key>
+ <value>-samp_rate/2</value>
+ </param>
+ <param>
+ <key>max</key>
+ <value>samp_rate/2</value>
+ </param>
+ <param>
+ <key>num_steps</key>
+ <value>100</value>
+ </param>
+ <param>
+ <key>style</key>
+ <value>wx.SL_HORIZONTAL</value>
+ </param>
+ <param>
+ <key>converver</key>
+ <value>float_converter</value>
+ </param>
+ <param>
+ <key>grid_pos</key>
+ <value>0, 0, 1, 4</value>
</param>
<param>
<key>_coordinate</key>
- <value>(835, 5)</value>
+ <value>(190, 436)</value>
</param>
<param>
<key>_rotation</key>
@@ -568,7 +622,7 @@
<key>variable_slider</key>
<param>
<key>id</key>
- <value>tone_ampl</value>
+ <value>tone2</value>
</param>
<param>
<key>_enabled</key>
@@ -576,11 +630,11 @@
</param>
<param>
<key>label</key>
- <value>Tone Ampl</value>
+ <value>Tone 2</value>
</param>
<param>
<key>value</key>
- <value>5000</value>
+ <value>75e3</value>
</param>
<param>
<key>min</key>
@@ -595,16 +649,67 @@
<value>100</value>
</param>
<param>
- <key>slider_type</key>
- <value>vertical</value>
+ <key>style</key>
+ <value>wx.SL_HORIZONTAL</value>
+ </param>
+ <param>
+ <key>converver</key>
+ <value>float_converter</value>
</param>
<param>
<key>grid_pos</key>
- <value>1, 0, 2, 1</value>
+ <value>0, 4, 1, 4</value>
</param>
<param>
<key>_coordinate</key>
- <value>(21, 422)</value>
+ <value>(367, 439)</value>
+ </param>
+ <param>
+ <key>_rotation</key>
+ <value>0</value>
+ </param>
+ </block>
+ <block>
+ <key>options</key>
+ <param>
+ <key>id</key>
+ <value>usrp_two_tone_loopback</value>
+ </param>
+ <param>
+ <key>_enabled</key>
+ <value>True</value>
+ </param>
+ <param>
+ <key>title</key>
+ <value>USRP Loopback - 2 Tone</value>
+ </param>
+ <param>
+ <key>author</key>
+ <value>Example</value>
+ </param>
+ <param>
+ <key>description</key>
+ <value>Loopback test with basic rx and basic tx</value>
+ </param>
+ <param>
+ <key>window_size</key>
+ <value>1280, 1024</value>
+ </param>
+ <param>
+ <key>generate_options</key>
+ <value>wx_gui</value>
+ </param>
+ <param>
+ <key>category</key>
+ <value>Custom</value>
+ </param>
+ <param>
+ <key>realtime_scheduling</key>
+ <value></value>
+ </param>
+ <param>
+ <key>_coordinate</key>
+ <value>(10, 10)</value>
</param>
<param>
<key>_rotation</key>
diff --git a/grc/examples/usrp/usrp_wbfm_receive.grc b/grc/examples/usrp/usrp_wbfm_receive.grc
index 7fb621241..8f53475ab 100644
--- a/grc/examples/usrp/usrp_wbfm_receive.grc
+++ b/grc/examples/usrp/usrp_wbfm_receive.grc
@@ -1,11 +1,11 @@
<?xml version='1.0' encoding='ASCII'?>
<flow_graph>
- <timestamp>Thu Jul 24 14:27:45 2008</timestamp>
+ <timestamp>Fri Apr 17 19:06:07 2009</timestamp>
<block>
<key>options</key>
<param>
<key>id</key>
- <value>top_block</value>
+ <value>usrp_wbfm_receive</value>
</param>
<param>
<key>_enabled</key>
@@ -36,6 +36,10 @@
<value>Custom</value>
</param>
<param>
+ <key>realtime_scheduling</key>
+ <value></value>
+ </param>
+ <param>
<key>_coordinate</key>
<value>(10, 10)</value>
</param>
@@ -45,54 +49,22 @@
</param>
</block>
<block>
- <key>usrp_simple_source_x</key>
+ <key>variable</key>
<param>
<key>id</key>
- <value>usrp_simple_source_x</value>
+ <value>decim</value>
</param>
<param>
<key>_enabled</key>
<value>True</value>
</param>
<param>
- <key>type</key>
- <value>complex</value>
- </param>
- <param>
- <key>number</key>
- <value>0</value>
- </param>
- <param>
- <key>subdev_spec</key>
- <value>None</value>
- </param>
- <param>
- <key>frequency</key>
- <value>(freq+fine)*1e6</value>
- </param>
- <param>
- <key>decimation</key>
- <value>decim</value>
- </param>
- <param>
- <key>gain</key>
- <value>20</value>
- </param>
- <param>
- <key>mux</key>
- <value>0x0</value>
- </param>
- <param>
- <key>auto_tr</key>
- <value>None</value>
- </param>
- <param>
- <key>rx_ant</key>
- <value>None</value>
+ <key>value</key>
+ <value>200</value>
</param>
<param>
<key>_coordinate</key>
- <value>(277, 29)</value>
+ <value>(14, 173)</value>
</param>
<param>
<key>_rotation</key>
@@ -103,7 +75,7 @@
<key>variable_slider</key>
<param>
<key>id</key>
- <value>fine</value>
+ <value>volume</value>
</param>
<param>
<key>_enabled</key>
@@ -111,62 +83,39 @@
</param>
<param>
<key>label</key>
- <value>Fine Freq</value>
+ <value>Volume</value>
</param>
<param>
<key>value</key>
- <value>0</value>
+ <value>1</value>
</param>
<param>
<key>min</key>
- <value>-.1</value>
+ <value>0</value>
</param>
<param>
<key>max</key>
- <value>.1</value>
+ <value>10</value>
</param>
<param>
<key>num_steps</key>
<value>100</value>
</param>
<param>
- <key>slider_type</key>
- <value>horizontal</value>
- </param>
- <param>
- <key>grid_pos</key>
- <value>0, 2, 1, 2</value>
+ <key>style</key>
+ <value>wx.SL_HORIZONTAL</value>
</param>
<param>
- <key>_coordinate</key>
- <value>(275, 246)</value>
+ <key>converver</key>
+ <value>float_converter</value>
</param>
<param>
- <key>_rotation</key>
- <value>0</value>
- </param>
- </block>
- <block>
- <key>blks2_wfm_rcv</key>
- <param>
- <key>id</key>
- <value>blks2_wfm_rcv</value>
- </param>
- <param>
- <key>_enabled</key>
- <value>True</value>
- </param>
- <param>
- <key>quad_rate</key>
- <value>64e6/decim</value>
- </param>
- <param>
- <key>audio_decimation</key>
- <value>10</value>
+ <key>grid_pos</key>
+ <value>1, 0, 1, 4</value>
</param>
<param>
<key>_coordinate</key>
- <value>(510, 37)</value>
+ <value>(991, 40)</value>
</param>
<param>
<key>_rotation</key>
@@ -174,65 +123,54 @@
</param>
</block>
<block>
- <key>audio_sink</key>
+ <key>usrp_simple_source_x</key>
<param>
<key>id</key>
- <value>audio_sink</value>
+ <value>usrp_simple_source_x</value>
</param>
<param>
<key>_enabled</key>
<value>True</value>
</param>
<param>
- <key>samp_rate</key>
- <value>32000</value>
- </param>
- <param>
- <key>device_name</key>
- <value/>
+ <key>type</key>
+ <value>complex</value>
</param>
<param>
- <key>ok_to_block</key>
- <value>True</value>
+ <key>format</key>
+ <value></value>
</param>
<param>
- <key>num_inputs</key>
- <value>1</value>
- </param>
- <param>
- <key>_coordinate</key>
- <value>(703, 241)</value>
+ <key>which</key>
+ <value>0</value>
</param>
<param>
- <key>_rotation</key>
- <value>180</value>
+ <key>decimation</key>
+ <value>decim</value>
</param>
- </block>
- <block>
- <key>gr_multiply_const_vxx</key>
<param>
- <key>id</key>
- <value>gr_multiply_const_vxx</value>
+ <key>frequency</key>
+ <value>(freq+fine)*1e6</value>
</param>
<param>
- <key>_enabled</key>
- <value>True</value>
+ <key>gain</key>
+ <value>20</value>
</param>
<param>
- <key>type</key>
- <value>float</value>
+ <key>side</key>
+ <value>A</value>
</param>
<param>
- <key>const</key>
- <value>volume</value>
+ <key>rx_ant</key>
+ <value>None</value>
</param>
<param>
- <key>vlen</key>
- <value>1</value>
+ <key>hb_filters</key>
+ <value></value>
</param>
<param>
<key>_coordinate</key>
- <value>(764, 55)</value>
+ <value>(277, 29)</value>
</param>
<param>
<key>_rotation</key>
@@ -263,17 +201,13 @@
</param>
<param>
<key>baseband_freq</key>
- <value>0</value>
+ <value>(freq+fine)*1e6</value>
</param>
<param>
<key>y_per_div</key>
<value>10</value>
</param>
<param>
- <key>y_divs</key>
- <value>8</value>
- </param>
- <param>
<key>ref_level</key>
<value>50</value>
</param>
@@ -286,16 +220,16 @@
<value>15</value>
</param>
<param>
- <key>avg_alpha</key>
- <value>0</value>
+ <key>peak_hold</key>
+ <value>False</value>
</param>
<param>
<key>average</key>
<value>False</value>
</param>
<param>
- <key>peak_hold</key>
- <value>False</value>
+ <key>avg_alpha</key>
+ <value>0</value>
</param>
<param>
<key>grid_pos</key>
@@ -314,7 +248,7 @@
<key>variable_slider</key>
<param>
<key>id</key>
- <value>volume</value>
+ <value>freq</value>
</param>
<param>
<key>_enabled</key>
@@ -322,35 +256,39 @@
</param>
<param>
<key>label</key>
- <value>Volume</value>
+ <value>Frequency (MHz)</value>
</param>
<param>
<key>value</key>
- <value>1</value>
+ <value>100</value>
</param>
<param>
<key>min</key>
- <value>0</value>
+ <value>87.5</value>
</param>
<param>
<key>max</key>
- <value>10</value>
+ <value>108.0</value>
</param>
<param>
<key>num_steps</key>
- <value>100</value>
+ <value>1000</value>
</param>
<param>
- <key>slider_type</key>
- <value>horizontal</value>
+ <key>style</key>
+ <value>wx.SL_HORIZONTAL</value>
+ </param>
+ <param>
+ <key>converver</key>
+ <value>float_converter</value>
</param>
<param>
<key>grid_pos</key>
- <value>1, 1, 1, 2</value>
+ <value>0, 0, 1, 2</value>
</param>
<param>
<key>_coordinate</key>
- <value>(991, 40)</value>
+ <value>(104, 243)</value>
</param>
<param>
<key>_rotation</key>
@@ -361,7 +299,7 @@
<key>variable_slider</key>
<param>
<key>id</key>
- <value>freq</value>
+ <value>fine</value>
</param>
<param>
<key>_enabled</key>
@@ -369,35 +307,39 @@
</param>
<param>
<key>label</key>
- <value>Frequency</value>
+ <value>Fine Freq (MHz)</value>
</param>
<param>
<key>value</key>
- <value>100</value>
+ <value>0</value>
</param>
<param>
<key>min</key>
- <value>87.5</value>
+ <value>-.1</value>
</param>
<param>
<key>max</key>
- <value>108.0</value>
+ <value>.1</value>
</param>
<param>
<key>num_steps</key>
- <value>1000</value>
+ <value>100</value>
+ </param>
+ <param>
+ <key>style</key>
+ <value>wx.SL_HORIZONTAL</value>
</param>
<param>
- <key>slider_type</key>
- <value>horizontal</value>
+ <key>converver</key>
+ <value>float_converter</value>
</param>
<param>
<key>grid_pos</key>
- <value>0, 0, 1, 2</value>
+ <value>0, 2, 1, 2</value>
</param>
<param>
<key>_coordinate</key>
- <value>(104, 243)</value>
+ <value>(275, 246)</value>
</param>
<param>
<key>_rotation</key>
@@ -405,28 +347,98 @@
</param>
</block>
<block>
- <key>variable</key>
+ <key>blks2_wfm_rcv</key>
<param>
<key>id</key>
- <value>decim</value>
+ <value>blks2_wfm_rcv</value>
</param>
<param>
<key>_enabled</key>
<value>True</value>
</param>
<param>
- <key>value</key>
- <value>200</value>
+ <key>quad_rate</key>
+ <value>64e6/decim</value>
+ </param>
+ <param>
+ <key>audio_decimation</key>
+ <value>10</value>
</param>
<param>
<key>_coordinate</key>
- <value>(14, 173)</value>
+ <value>(510, 37)</value>
</param>
<param>
<key>_rotation</key>
<value>0</value>
</param>
</block>
+ <block>
+ <key>gr_multiply_const_vxx</key>
+ <param>
+ <key>id</key>
+ <value>gr_multiply_const_vxx</value>
+ </param>
+ <param>
+ <key>_enabled</key>
+ <value>True</value>
+ </param>
+ <param>
+ <key>type</key>
+ <value>float</value>
+ </param>
+ <param>
+ <key>const</key>
+ <value>volume</value>
+ </param>
+ <param>
+ <key>vlen</key>
+ <value>1</value>
+ </param>
+ <param>
+ <key>_coordinate</key>
+ <value>(764, 55)</value>
+ </param>
+ <param>
+ <key>_rotation</key>
+ <value>0</value>
+ </param>
+ </block>
+ <block>
+ <key>audio_sink</key>
+ <param>
+ <key>id</key>
+ <value>audio_sink</value>
+ </param>
+ <param>
+ <key>_enabled</key>
+ <value>True</value>
+ </param>
+ <param>
+ <key>samp_rate</key>
+ <value>32000</value>
+ </param>
+ <param>
+ <key>device_name</key>
+ <value></value>
+ </param>
+ <param>
+ <key>ok_to_block</key>
+ <value>True</value>
+ </param>
+ <param>
+ <key>num_inputs</key>
+ <value>1</value>
+ </param>
+ <param>
+ <key>_coordinate</key>
+ <value>(703, 241)</value>
+ </param>
+ <param>
+ <key>_rotation</key>
+ <value>180</value>
+ </param>
+ </block>
<connection>
<source_block_id>usrp_simple_source_x</source_block_id>
<sink_block_id>blks2_wfm_rcv</sink_block_id>
@@ -451,4 +463,4 @@
<source_key>0</source_key>
<sink_key>0</sink_key>
</connection>
-</flow_graph> \ No newline at end of file
+</flow_graph>