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-trellis/src/examples/grc/sccc1.grc
parent: 1155ff1e58fc3311f55f28d2e95f057708b99c7d (diff)
1 files changed, 119 insertions, 107 deletions
diff --git a/gr-trellis/src/examples/grc/sccc1.grc b/gr-trellis/src/examples/grc/sccc1.grc
index 0be59d0c47..17626e3dce 100644
--- a/gr-trellis/src/examples/grc/sccc1.grc
+++ b/gr-trellis/src/examples/grc/sccc1.grc
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='ASCII'?>
 <flow_graph>
-  <timestamp>Wed Aug 31 20:09:23 2011</timestamp>
+  <timestamp>Sat Nov 10 15:41:10 2012</timestamp>
   <block>
     <key>options</key>
     <param>
@@ -44,6 +44,10 @@
       <value>True</value>
     </param>
     <param>
+      <key>max_nouts</key>
+      <value>0</value>
+    </param>
+    <param>
       <key>realtime_scheduling</key>
       <value></value>
     </param>
@@ -425,6 +429,14 @@
       <value>True</value>
     </param>
     <param>
+      <key>vlen</key>
+      <value>1</value>
+    </param>
+    <param>
+      <key>scale</key>
+      <value>1</value>
+    </param>
+    <param>
       <key>_coordinate</key>
       <value>(535, 609)</value>
     </param>
@@ -521,10 +533,10 @@
     </param>
   </block>
   <block>
-    <key>gr_noise_source_x</key>
+    <key>trellis_metrics_x</key>
     <param>
       <key>id</key>
-      <value>gr_noise_source_x_0</value>
+      <value>trellis_metrics_x_0</value>
     </param>
     <param>
       <key>_enabled</key>
@@ -532,23 +544,27 @@
     </param>
     <param>
       <key>type</key>
-      <value>float</value>
+      <value>f</value>
     </param>
     <param>
-      <key>noise_type</key>
-      <value>gr.GR_GAUSSIAN</value>
+      <key>card</key>
+      <value>8</value>
     </param>
     <param>
-      <key>amp</key>
-      <value>noisevar</value>
+      <key>dim</key>
+      <value>1</value>
     </param>
     <param>
-      <key>seed</key>
-      <value>42</value>
+      <key>table</key>
+      <value>-7, -5, -3, -1, 1, 3, 5, 7</value>
+    </param>
+    <param>
+      <key>metric_type</key>
+      <value>digital.TRELLIS_EUCLIDEAN</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(672, 290)</value>
+      <value>(58, 354)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -556,69 +572,74 @@
     </param>
   </block>
   <block>
-    <key>gr_add_xx</key>
+    <key>wxgui_scopesink2</key>
     <param>
       <key>id</key>
-      <value>gr_add_xx_1</value>
+      <value>wxgui_scopesink2_0</value>
     </param>
     <param>
       <key>_enabled</key>
-      <value>True</value>
+      <value>False</value>
     </param>
     <param>
       <key>type</key>
       <value>float</value>
     </param>
     <param>
-      <key>num_inputs</key>
-      <value>2</value>
+      <key>title</key>
+      <value>Scope Plot</value>
     </param>
     <param>
-      <key>vlen</key>
-      <value>1</value>
+      <key>samp_rate</key>
+      <value>R</value>
     </param>
     <param>
-      <key>_coordinate</key>
-      <value>(951, 256)</value>
+      <key>v_scale</key>
+      <value>0</value>
     </param>
     <param>
-      <key>_rotation</key>
+      <key>v_offset</key>
       <value>0</value>
     </param>
-  </block>
-  <block>
-    <key>trellis_metrics_x</key>
     <param>
-      <key>id</key>
-      <value>trellis_metrics_x_0</value>
+      <key>t_scale</key>
+      <value>0</value>
     </param>
     <param>
-      <key>_enabled</key>
-      <value>True</value>
+      <key>ac_couple</key>
+      <value>False</value>
     </param>
     <param>
-      <key>type</key>
-      <value>f</value>
+      <key>xy_mode</key>
+      <value>False</value>
     </param>
     <param>
-      <key>card</key>
-      <value>8</value>
+      <key>num_inputs</key>
+      <value>1</value>
     </param>
     <param>
-      <key>dim</key>
-      <value>1</value>
+      <key>win_size</key>
+      <value></value>
     </param>
     <param>
-      <key>table</key>
-      <value>-7, -5, -3, -1, 1, 3, 5, 7</value>
+      <key>grid_pos</key>
+      <value></value>
     </param>
     <param>
-      <key>metric_type</key>
-      <value>trellis.TRELLIS_EUCLIDEAN</value>
+      <key>notebook</key>
+      <value></value>
+    </param>
+    <param>
+      <key>trig_mode</key>
+      <value>gr.gr_TRIG_MODE_AUTO</value>
+    </param>
+    <param>
+      <key>y_axis_label</key>
+      <value>Counts</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(58, 354)</value>
+      <value>(952, 73)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -657,74 +678,69 @@
     </param>
   </block>
   <block>
-    <key>wxgui_scopesink2</key>
+    <key>digital_chunks_to_symbols_xx</key>
     <param>
       <key>id</key>
-      <value>wxgui_scopesink2_0</value>
+      <value>digital_chunks_to_symbols_xx_0</value>
     </param>
     <param>
       <key>_enabled</key>
-      <value>False</value>
-    </param>
-    <param>
-      <key>type</key>
-      <value>float</value>
-    </param>
-    <param>
-      <key>title</key>
-      <value>Scope Plot</value>
+      <value>True</value>
     </param>
     <param>
-      <key>samp_rate</key>
-      <value>R</value>
+      <key>in_type</key>
+      <value>short</value>
     </param>
     <param>
-      <key>v_scale</key>
-      <value>0</value>
+      <key>out_type</key>
+      <value>float</value>
     </param>
     <param>
-      <key>v_offset</key>
-      <value>0</value>
+      <key>symbol_table</key>
+      <value>-7,-5,-3,-1,1,3,5,7</value>
     </param>
     <param>
-      <key>t_scale</key>
-      <value>0</value>
+      <key>dimension</key>
+      <value>1</value>
     </param>
     <param>
-      <key>ac_couple</key>
-      <value>False</value>
+      <key>num_ports</key>
+      <value>1</value>
     </param>
     <param>
-      <key>xy_mode</key>
-      <value>False</value>
+      <key>_coordinate</key>
+      <value>(607, 175)</value>
     </param>
     <param>
-      <key>num_inputs</key>
-      <value>1</value>
+      <key>_rotation</key>
+      <value>0</value>
     </param>
+  </block>
+  <block>
+    <key>gr_add_xx</key>
     <param>
-      <key>win_size</key>
-      <value></value>
+      <key>id</key>
+      <value>gr_add_xx_1</value>
     </param>
     <param>
-      <key>grid_pos</key>
-      <value></value>
+      <key>_enabled</key>
+      <value>True</value>
     </param>
     <param>
-      <key>notebook</key>
-      <value></value>
+      <key>type</key>
+      <value>float</value>
     </param>
     <param>
-      <key>trig_mode</key>
-      <value>gr.gr_TRIG_MODE_AUTO</value>
+      <key>num_inputs</key>
+      <value>2</value>
     </param>
     <param>
-      <key>y_axis_label</key>
-      <value>Counts</value>
+      <key>vlen</key>
+      <value>1</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(952, 73)</value>
+      <value>(951, 256)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -732,38 +748,34 @@
     </param>
   </block>
   <block>
-    <key>gr_chunks_to_symbols_xx</key>
+    <key>analog_noise_source_x</key>
     <param>
       <key>id</key>
-      <value>gr_chunks_to_symbols_xx_0</value>
+      <value>analog_noise_source_x_0</value>
     </param>
     <param>
       <key>_enabled</key>
       <value>True</value>
     </param>
     <param>
-      <key>in_type</key>
-      <value>short</value>
-    </param>
-    <param>
-      <key>out_type</key>
+      <key>type</key>
       <value>float</value>
     </param>
     <param>
-      <key>symbol_table</key>
-      <value>-7, -5, -3, -1, 1, 3, 5, 7</value>
+      <key>noise_type</key>
+      <value>analog.GR_GAUSSIAN</value>
     </param>
     <param>
-      <key>dimension</key>
-      <value>1</value>
+      <key>amp</key>
+      <value>noisevar</value>
     </param>
     <param>
-      <key>num_ports</key>
-      <value>1</value>
+      <key>seed</key>
+      <value>-42</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(551, 184)</value>
+      <value>(632, 254)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -777,30 +789,12 @@
     <sink_key>0</sink_key>
   </connection>
   <connection>
-    <source_block_id>gr_throttle_0</source_block_id>
-    <sink_block_id>gr_chunks_to_symbols_xx_0</sink_block_id>
-    <source_key>0</source_key>
-    <sink_key>0</sink_key>
-  </connection>
-  <connection>
     <source_block_id>gr_add_xx_1</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>gr_noise_source_x_0</source_block_id>
-    <sink_block_id>gr_add_xx_1</sink_block_id>
-    <source_key>0</source_key>
-    <sink_key>1</sink_key>
-  </connection>
-  <connection>
-    <source_block_id>gr_chunks_to_symbols_xx_0</source_block_id>
-    <sink_block_id>gr_add_xx_1</sink_block_id>
-    <source_key>0</source_key>
-    <sink_key>0</sink_key>
-  </connection>
-  <connection>
     <source_block_id>random_source_x_0</source_block_id>
     <sink_block_id>trellis_sccc_encoder_xx_0</sink_block_id>
     <source_key>0</source_key>
@@ -854,4 +848,22 @@
     <source_key>0</source_key>
     <sink_key>1</sink_key>
   </connection>
+  <connection>
+    <source_block_id>gr_throttle_0</source_block_id>
+    <sink_block_id>digital_chunks_to_symbols_xx_0</sink_block_id>
+    <source_key>0</source_key>
+    <sink_key>0</sink_key>
+  </connection>
+  <connection>
+    <source_block_id>digital_chunks_to_symbols_xx_0</source_block_id>
+    <sink_block_id>gr_add_xx_1</sink_block_id>
+    <source_key>0</source_key>
+    <sink_key>0</sink_key>
+  </connection>
+  <connection>
+    <source_block_id>analog_noise_source_x_0</source_block_id>
+    <sink_block_id>gr_add_xx_1</sink_block_id>
+    <source_key>0</source_key>
+    <sink_key>1</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-trellis/src/examples/grc/sccc1.grc
parent	1155ff1e58fc3311f55f28d2e95f057708b99c7d (diff)