analog: fixing up GRC and other examples to use gr-analog for sig and noise sources.

author: Tom Rondeau <trondeau@vt.edu> 2012-11-10 15:43:21 -0500
committer: Tom Rondeau <trondeau@vt.edu> 2012-11-10 15:43:21 -0500
commit: 611f7e45e7a793f2489d76670a61493327838e3e (patch)
tree: 9c97a36fc0f5bdd8b6078fe110f330dde81a625d /gr-uhd/examples/grc
parent: 1155ff1e58fc3311f55f28d2e95f057708b99c7d (diff)
1 files changed, 315 insertions, 227 deletions
diff --git a/gr-uhd/examples/grc/uhd_two_tone_loopback.grc b/gr-uhd/examples/grc/uhd_two_tone_loopback.grc
index 8bcbc07927..b186c2f2bc 100644
--- a/gr-uhd/examples/grc/uhd_two_tone_loopback.grc
+++ b/gr-uhd/examples/grc/uhd_two_tone_loopback.grc
@@ -1,6 +1,65 @@
 <?xml version='1.0' encoding='ASCII'?>
 <flow_graph>
-  <timestamp>Sat Oct  8 15:27:04 2011</timestamp>
+  <timestamp>Sat Nov 10 14:55:26 2012</timestamp>
+  <block>
+    <key>options</key>
+    <param>
+      <key>id</key>
+      <value>uhd_two_tone_loopback</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>title</key>
+      <value>UHD Loopback - 2 Tone</value>
+    </param>
+    <param>
+      <key>author</key>
+      <value>Example</value>
+    </param>
+    <param>
+      <key>description</key>
+      <value>Loopback test</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>run_options</key>
+      <value>prompt</value>
+    </param>
+    <param>
+      <key>run</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>max_nouts</key>
+      <value>0</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>parameter</key>
     <param>
@@ -177,53 +236,10 @@
     </param>
   </block>
   <block>
-    <key>gr_sig_source_x</key>
-    <param>
-      <key>id</key>
-      <value>gr_sig_source_x</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>tone1</value>
-    </param>
-    <param>
-      <key>amp</key>
-      <value>tone_ampl</value>
-    </param>
-    <param>
-      <key>offset</key>
-      <value>0</value>
-    </param>
-    <param>
-      <key>_coordinate</key>
-      <value>(258, 136)</value>
-    </param>
-    <param>
-      <key>_rotation</key>
-      <value>0</value>
-    </param>
-  </block>
-  <block>
-    <key>gr_sig_source_x</key>
+    <key>uhd_usrp_sink</key>
     <param>
       <key>id</key>
-      <value>gr_sig_source_x0</value>
+      <value>uhd_usrp_sink_0</value>
     </param>
     <param>
       <key>_enabled</key>
@@ -231,160 +247,122 @@
     </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>
-    </param>
-    <param>
-      <key>amp</key>
-      <value>tone_ampl</value>
-    </param>
-    <param>
-      <key>offset</key>
-      <value>0</value>
+      <value>fc32</value>
     </param>
     <param>
-      <key>_coordinate</key>
-      <value>(259, 248)</value>
-    </param>
-    <param>
-      <key>_rotation</key>
-      <value>0</value>
-    </param>
-  </block>
-  <block>
-    <key>gr_noise_source_x</key>
-    <param>
-      <key>id</key>
-      <value>gr_noise_source_x</value>
-    </param>
-    <param>
-      <key>_enabled</key>
-      <value>True</value>
+      <key>otw</key>
+      <value></value>
     </param>
     <param>
-      <key>type</key>
-      <value>complex</value>
+      <key>stream_args</key>
+      <value></value>
     </param>
     <param>
-      <key>noise_type</key>
-      <value>gr.GR_GAUSSIAN</value>
+      <key>dev_addr</key>
+      <value>address0</value>
     </param>
     <param>
-      <key>amp</key>
-      <value>noise_ampl</value>
+      <key>sync</key>
+      <value></value>
     </param>
     <param>
-      <key>seed</key>
-      <value>42</value>
+      <key>clock_rate</key>
+      <value>0.0</value>
     </param>
     <param>
-      <key>_coordinate</key>
-      <value>(279, 364)</value>
+      <key>num_mboards</key>
+      <value>1</value>
     </param>
     <param>
-      <key>_rotation</key>
-      <value>0</value>
+      <key>clock_source0</key>
+      <value></value>
     </param>
-  </block>
-  <block>
-    <key>uhd_usrp_sink</key>
     <param>
-      <key>id</key>
-      <value>uhd_usrp_sink_0</value>
+      <key>time_source0</key>
+      <value></value>
     </param>
     <param>
-      <key>_enabled</key>
-      <value>True</value>
+      <key>sd_spec0</key>
+      <value></value>
     </param>
     <param>
-      <key>type</key>
-      <value>complex</value>
+      <key>clock_source1</key>
+      <value></value>
     </param>
     <param>
-      <key>dev_addr</key>
-      <value>address0</value>
+      <key>time_source1</key>
+      <value></value>
     </param>
     <param>
-      <key>sync</key>
+      <key>sd_spec1</key>
       <value></value>
     </param>
     <param>
-      <key>clock_rate</key>
-      <value>0.0</value>
+      <key>clock_source2</key>
+      <value></value>
     </param>
     <param>
-      <key>num_mboards</key>
-      <value>1</value>
+      <key>time_source2</key>
+      <value></value>
     </param>
     <param>
-      <key>ref_source0</key>
+      <key>sd_spec2</key>
       <value></value>
     </param>
     <param>
-      <key>sd_spec0</key>
+      <key>clock_source3</key>
       <value></value>
     </param>
     <param>
-      <key>ref_source1</key>
+      <key>time_source3</key>
       <value></value>
     </param>
     <param>
-      <key>sd_spec1</key>
+      <key>sd_spec3</key>
       <value></value>
     </param>
     <param>
-      <key>ref_source2</key>
+      <key>clock_source4</key>
       <value></value>
     </param>
     <param>
-      <key>sd_spec2</key>
+      <key>time_source4</key>
       <value></value>
     </param>
     <param>
-      <key>ref_source3</key>
+      <key>sd_spec4</key>
       <value></value>
     </param>
     <param>
-      <key>sd_spec3</key>
+      <key>clock_source5</key>
       <value></value>
     </param>
     <param>
-      <key>ref_source4</key>
+      <key>time_source5</key>
       <value></value>
     </param>
     <param>
-      <key>sd_spec4</key>
+      <key>sd_spec5</key>
       <value></value>
     </param>
     <param>
-      <key>ref_source5</key>
+      <key>clock_source6</key>
       <value></value>
     </param>
     <param>
-      <key>sd_spec5</key>
+      <key>time_source6</key>
       <value></value>
     </param>
     <param>
-      <key>ref_source6</key>
+      <key>sd_spec6</key>
       <value></value>
     </param>
     <param>
-      <key>sd_spec6</key>
+      <key>clock_source7</key>
       <value></value>
     </param>
     <param>
-      <key>ref_source7</key>
+      <key>time_source7</key>
       <value></value>
     </param>
     <param>
@@ -1242,7 +1220,15 @@
     </param>
     <param>
       <key>type</key>
-      <value>complex</value>
+      <value>fc32</value>
+    </param>
+    <param>
+      <key>otw</key>
+      <value></value>
+    </param>
+    <param>
+      <key>stream_args</key>
+      <value></value>
     </param>
     <param>
       <key>dev_addr</key>
@@ -1261,7 +1247,11 @@
       <value>1</value>
     </param>
     <param>
-      <key>ref_source0</key>
+      <key>clock_source0</key>
+      <value></value>
+    </param>
+    <param>
+      <key>time_source0</key>
       <value></value>
     </param>
     <param>
@@ -1269,7 +1259,11 @@
       <value></value>
     </param>
     <param>
-      <key>ref_source1</key>
+      <key>clock_source1</key>
+      <value></value>
+    </param>
+    <param>
+      <key>time_source1</key>
       <value></value>
     </param>
     <param>
@@ -1277,7 +1271,11 @@
       <value></value>
     </param>
     <param>
-      <key>ref_source2</key>
+      <key>clock_source2</key>
+      <value></value>
+    </param>
+    <param>
+      <key>time_source2</key>
       <value></value>
     </param>
     <param>
@@ -1285,7 +1283,11 @@
       <value></value>
     </param>
     <param>
-      <key>ref_source3</key>
+      <key>clock_source3</key>
+      <value></value>
+    </param>
+    <param>
+      <key>time_source3</key>
       <value></value>
     </param>
     <param>
@@ -1293,7 +1295,11 @@
       <value></value>
     </param>
     <param>
-      <key>ref_source4</key>
+      <key>clock_source4</key>
+      <value></value>
+    </param>
+    <param>
+      <key>time_source4</key>
       <value></value>
     </param>
     <param>
@@ -1301,7 +1307,11 @@
       <value></value>
     </param>
     <param>
-      <key>ref_source5</key>
+      <key>clock_source5</key>
+      <value></value>
+    </param>
+    <param>
+      <key>time_source5</key>
       <value></value>
     </param>
     <param>
@@ -1309,7 +1319,11 @@
       <value></value>
     </param>
     <param>
-      <key>ref_source6</key>
+      <key>clock_source6</key>
+      <value></value>
+    </param>
+    <param>
+      <key>time_source6</key>
       <value></value>
     </param>
     <param>
@@ -1317,7 +1331,11 @@
       <value></value>
     </param>
     <param>
-      <key>ref_source7</key>
+      <key>clock_source7</key>
+      <value></value>
+    </param>
+    <param>
+      <key>time_source7</key>
       <value></value>
     </param>
     <param>
@@ -1964,10 +1982,10 @@
     </param>
   </block>
   <block>
-    <key>gr_add_xx</key>
+    <key>wxgui_fftsink2</key>
     <param>
       <key>id</key>
-      <value>gr_add_xx</value>
+      <value>wxgui_fftsink2</value>
     </param>
     <param>
       <key>_enabled</key>
@@ -1978,71 +1996,76 @@
       <value>complex</value>
     </param>
     <param>
-      <key>num_inputs</key>
-      <value>3</value>
+      <key>title</key>
+      <value>FFT Plot</value>
     </param>
     <param>
-      <key>vlen</key>
-      <value>1</value>
+      <key>samp_rate</key>
+      <value>samp_rate</value>
     </param>
     <param>
-      <key>_coordinate</key>
-      <value>(529, 172)</value>
+      <key>baseband_freq</key>
+      <value>0</value>
     </param>
     <param>
-      <key>_rotation</key>
-      <value>0</value>
+      <key>y_per_div</key>
+      <value>10</value>
     </param>
-  </block>
-  <block>
-    <key>options</key>
     <param>
-      <key>id</key>
-      <value>uhd_two_tone_loopback</value>
+      <key>y_divs</key>
+      <value>10</value>
     </param>
     <param>
-      <key>_enabled</key>
-      <value>True</value>
+      <key>ref_level</key>
+      <value>0</value>
     </param>
     <param>
-      <key>title</key>
-      <value>UHD Loopback - 2 Tone</value>
+      <key>ref_scale</key>
+      <value>2.0</value>
     </param>
     <param>
-      <key>author</key>
-      <value>Example</value>
+      <key>fft_size</key>
+      <value>512*2</value>
     </param>
     <param>
-      <key>description</key>
-      <value>Loopback test</value>
+      <key>fft_rate</key>
+      <value>15</value>
     </param>
     <param>
-      <key>window_size</key>
-      <value>1280, 1024</value>
+      <key>peak_hold</key>
+      <value>False</value>
     </param>
     <param>
-      <key>generate_options</key>
-      <value>wx_gui</value>
+      <key>average</key>
+      <value>False</value>
     </param>
     <param>
-      <key>category</key>
-      <value>Custom</value>
+      <key>avg_alpha</key>
+      <value>0</value>
     </param>
     <param>
-      <key>run_options</key>
-      <value>prompt</value>
+      <key>win</key>
+      <value>window.blackmanharris</value>
     </param>
     <param>
-      <key>run</key>
-      <value>True</value>
+      <key>win_size</key>
+      <value></value>
     </param>
     <param>
-      <key>realtime_scheduling</key>
+      <key>grid_pos</key>
+      <value>1, 2, 2, 4</value>
+    </param>
+    <param>
+      <key>notebook</key>
       <value></value>
     </param>
     <param>
+      <key>freqvar</key>
+      <value>None</value>
+    </param>
+    <param>
       <key>_coordinate</key>
-      <value>(10, 10)</value>
+      <value>(1114, 264)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -2050,86 +2073,120 @@
     </param>
   </block>
   <block>
-    <key>wxgui_fftsink2</key>
+    <key>parameter</key>
     <param>
       <key>id</key>
-      <value>wxgui_fftsink2</value>
+      <value>samp_rate</value>
     </param>
     <param>
       <key>_enabled</key>
       <value>True</value>
     </param>
     <param>
+      <key>label</key>
+      <value>Sample Rate</value>
+    </param>
+    <param>
+      <key>value</key>
+      <value>500e3</value>
+    </param>
+    <param>
       <key>type</key>
-      <value>complex</value>
+      <value>eng_float</value>
     </param>
     <param>
-      <key>title</key>
-      <value>FFT Plot</value>
+      <key>short_id</key>
+      <value>s</value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(539, 11)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>analog_sig_source_x</key>
+    <param>
+      <key>id</key>
+      <value>analog_sig_source_x_0</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>baseband_freq</key>
-      <value>0</value>
+      <key>waveform</key>
+      <value>analog.GR_COS_WAVE</value>
     </param>
     <param>
-      <key>y_per_div</key>
-      <value>10</value>
+      <key>freq</key>
+      <value>tone1</value>
     </param>
     <param>
-      <key>y_divs</key>
-      <value>10</value>
+      <key>amp</key>
+      <value>tone_ampl</value>
     </param>
     <param>
-      <key>ref_level</key>
+      <key>offset</key>
       <value>0</value>
     </param>
     <param>
-      <key>ref_scale</key>
-      <value>2.0</value>
+      <key>_coordinate</key>
+      <value>(264, 136)</value>
     </param>
     <param>
-      <key>fft_size</key>
-      <value>512*2</value>
+      <key>_rotation</key>
+      <value>0</value>
     </param>
+  </block>
+  <block>
+    <key>analog_sig_source_x</key>
     <param>
-      <key>fft_rate</key>
-      <value>15</value>
+      <key>id</key>
+      <value>analog_sig_source_x_1</value>
     </param>
     <param>
-      <key>peak_hold</key>
-      <value>False</value>
+      <key>_enabled</key>
+      <value>True</value>
     </param>
     <param>
-      <key>average</key>
-      <value>False</value>
+      <key>type</key>
+      <value>complex</value>
     </param>
     <param>
-      <key>avg_alpha</key>
-      <value>0</value>
+      <key>samp_rate</key>
+      <value>samp_rate</value>
     </param>
     <param>
-      <key>win</key>
-      <value>window.blackmanharris</value>
+      <key>waveform</key>
+      <value>analog.GR_COS_WAVE</value>
     </param>
     <param>
-      <key>win_size</key>
-      <value></value>
+      <key>freq</key>
+      <value>tone2</value>
     </param>
     <param>
-      <key>grid_pos</key>
-      <value>1, 2, 2, 4</value>
+      <key>amp</key>
+      <value>tone_ampl</value>
     </param>
     <param>
-      <key>notebook</key>
-      <value></value>
+      <key>offset</key>
+      <value>0</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(1114, 264)</value>
+      <value>(265, 247)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -2137,34 +2194,65 @@
     </param>
   </block>
   <block>
-    <key>parameter</key>
+    <key>gr_add_xx</key>
     <param>
       <key>id</key>
-      <value>samp_rate</value>
+      <value>gr_add_xx</value>
     </param>
     <param>
       <key>_enabled</key>
       <value>True</value>
     </param>
     <param>
-      <key>label</key>
-      <value>Sample Rate</value>
+      <key>type</key>
+      <value>complex</value>
     </param>
     <param>
-      <key>value</key>
-      <value>500e3</value>
+      <key>num_inputs</key>
+      <value>3</value>
+    </param>
+    <param>
+      <key>vlen</key>
+      <value>1</value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(529, 172)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>analog_noise_source_x</key>
+    <param>
+      <key>id</key>
+      <value>analog_noise_source_x_0</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
     </param>
     <param>
       <key>type</key>
-      <value>eng_float</value>
+      <value>complex</value>
     </param>
     <param>
-      <key>short_id</key>
-      <value>s</value>
+      <key>noise_type</key>
+      <value>analog.GR_GAUSSIAN</value>
+    </param>
+    <param>
+      <key>amp</key>
+      <value>noise_ampl</value>
+    </param>
+    <param>
+      <key>seed</key>
+      <value>-42</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(539, 11)</value>
+      <value>(288, 359)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -2172,33 +2260,33 @@
     </param>
   </block>
   <connection>
-    <source_block_id>gr_noise_source_x</source_block_id>
-    <sink_block_id>gr_add_xx</sink_block_id>
+    <source_block_id>gr_add_xx</source_block_id>
+    <sink_block_id>uhd_usrp_sink_0</sink_block_id>
     <source_key>0</source_key>
-    <sink_key>2</sink_key>
+    <sink_key>0</sink_key>
   </connection>
   <connection>
-    <source_block_id>gr_sig_source_x0</source_block_id>
-    <sink_block_id>gr_add_xx</sink_block_id>
+    <source_block_id>uhd_usrp_source_0</source_block_id>
+    <sink_block_id>wxgui_fftsink2</sink_block_id>
     <source_key>0</source_key>
-    <sink_key>1</sink_key>
+    <sink_key>0</sink_key>
   </connection>
   <connection>
-    <source_block_id>gr_sig_source_x</source_block_id>
+    <source_block_id>analog_sig_source_x_0</source_block_id>
     <sink_block_id>gr_add_xx</sink_block_id>
     <source_key>0</source_key>
     <sink_key>0</sink_key>
   </connection>
   <connection>
-    <source_block_id>gr_add_xx</source_block_id>
-    <sink_block_id>uhd_usrp_sink_0</sink_block_id>
+    <source_block_id>analog_sig_source_x_1</source_block_id>
+    <sink_block_id>gr_add_xx</sink_block_id>
     <source_key>0</source_key>
-    <sink_key>0</sink_key>
+    <sink_key>1</sink_key>
   </connection>
   <connection>
-    <source_block_id>uhd_usrp_source_0</source_block_id>
-    <sink_block_id>wxgui_fftsink2</sink_block_id>
+    <source_block_id>analog_noise_source_x_0</source_block_id>
+    <sink_block_id>gr_add_xx</sink_block_id>
     <source_key>0</source_key>
-    <sink_key>0</sink_key>
+    <sink_key>2</sink_key>
   </connection>
 </flow_graph>
author	Tom Rondeau <trondeau@vt.edu>	2012-11-10 15:43:21 -0500
committer	Tom Rondeau <trondeau@vt.edu>	2012-11-10 15:43:21 -0500
commit	611f7e45e7a793f2489d76670a61493327838e3e (patch)
tree	9c97a36fc0f5bdd8b6078fe110f330dde81a625d /gr-uhd/examples/grc
parent	1155ff1e58fc3311f55f28d2e95f057708b99c7d (diff)