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-digital
parent: 1155ff1e58fc3311f55f28d2e95f057708b99c7d (diff)
2 files changed, 155 insertions, 159 deletions
diff --git a/gr-digital/examples/demod/ber_simulation.grc b/gr-digital/examples/demod/ber_simulation.grc
index f41b9cf79b..3097aa8fa5 100644
--- a/gr-digital/examples/demod/ber_simulation.grc
+++ b/gr-digital/examples/demod/ber_simulation.grc
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='ASCII'?>
 <flow_graph>
-  <timestamp>Mon Jul 16 21:09:12 2012</timestamp>
+  <timestamp>Sat Nov 10 15:31:44 2012</timestamp>
   <block>
     <key>options</key>
     <param>
@@ -354,41 +354,6 @@
     </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>
-    </param>
-    <param>
-      <key>type</key>
-      <value>complex</value>
-    </param>
-    <param>
-      <key>noise_type</key>
-      <value>gr.GR_GAUSSIAN</value>
-    </param>
-    <param>
-      <key>amp</key>
-      <value>1.0 / math.sqrt(2.0 * const.bits_per_symbol() * 10**(EbN0/10))</value>
-    </param>
-    <param>
-      <key>seed</key>
-      <value>42</value>
-    </param>
-    <param>
-      <key>_coordinate</key>
-      <value>(16, 224)</value>
-    </param>
-    <param>
-      <key>_rotation</key>
-      <value>0</value>
-    </param>
-  </block>
-  <block>
     <key>variable_slider</key>
     <param>
       <key>id</key>
@@ -522,6 +487,29 @@
     </param>
   </block>
   <block>
+    <key>digital_constellation_decoder_cb</key>
+    <param>
+      <key>id</key>
+      <value>digital_constellation_decoder_cb_0</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>constellation</key>
+      <value>const.base()</value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(622, 164)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
     <key>gr_add_xx</key>
     <param>
       <key>id</key>
@@ -553,22 +541,34 @@
     </param>
   </block>
   <block>
-    <key>digital_constellation_decoder_cb</key>
+    <key>analog_noise_source_x</key>
     <param>
       <key>id</key>
-      <value>digital_constellation_decoder_cb_0</value>
+      <value>analog_noise_source_x_0</value>
     </param>
     <param>
       <key>_enabled</key>
       <value>True</value>
     </param>
     <param>
-      <key>constellation</key>
-      <value>const.base()</value>
+      <key>type</key>
+      <value>complex</value>
+    </param>
+    <param>
+      <key>noise_type</key>
+      <value>analog.GR_GAUSSIAN</value>
+    </param>
+    <param>
+      <key>amp</key>
+      <value>1.0/math.sqrt(2.0 * const.bits_per_symbol() * 10*(EbN0/10))</value>
+    </param>
+    <param>
+      <key>seed</key>
+      <value>-42</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(622, 164)</value>
+      <value>(16, 224)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -588,12 +588,6 @@
     <sink_key>0</sink_key>
   </connection>
   <connection>
-    <source_block_id>gr_noise_source_x</source_block_id>
-    <sink_block_id>gr_add_xx</sink_block_id>
-    <source_key>0</source_key>
-    <sink_key>1</sink_key>
-  </connection>
-  <connection>
     <source_block_id>random_source_x</source_block_id>
     <sink_block_id>gr_throttle</sink_block_id>
     <source_key>0</source_key>
@@ -629,4 +623,10 @@
     <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</sink_block_id>
+    <source_key>0</source_key>
+    <sink_key>1</sink_key>
+  </connection>
 </flow_graph>
diff --git a/gr-digital/examples/demod/dpsk_loopback.grc b/gr-digital/examples/demod/dpsk_loopback.grc
index c9867bea20..7a6b2d293f 100644
--- a/gr-digital/examples/demod/dpsk_loopback.grc
+++ b/gr-digital/examples/demod/dpsk_loopback.grc
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='ASCII'?>
 <flow_graph>
-  <timestamp>Thu Jul  5 16:26:53 2012</timestamp>
+  <timestamp>Sat Nov 10 15:13:23 2012</timestamp>
   <block>
     <key>options</key>
     <param>
@@ -139,10 +139,10 @@
     </param>
   </block>
   <block>
-    <key>gr_sig_source_x</key>
+    <key>gr_throttle</key>
     <param>
       <key>id</key>
-      <value>gr_sig_source_x_0</value>
+      <value>gr_throttle_0_0</value>
     </param>
     <param>
       <key>_enabled</key>
@@ -153,28 +153,16 @@
       <value>float</value>
     </param>
     <param>
-      <key>samp_rate</key>
+      <key>samples_per_second</key>
       <value>samp_rate</value>
     </param>
     <param>
-      <key>waveform</key>
-      <value>gr.GR_COS_WAVE</value>
-    </param>
-    <param>
-      <key>freq</key>
-      <value>freq</value>
-    </param>
-    <param>
-      <key>amp</key>
+      <key>vlen</key>
       <value>1</value>
     </param>
     <param>
-      <key>offset</key>
-      <value>0</value>
-    </param>
-    <param>
       <key>_coordinate</key>
-      <value>(184, 9)</value>
+      <value>(381, 51)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -182,10 +170,10 @@
     </param>
   </block>
   <block>
-    <key>digital_dxpsk_mod</key>
+    <key>blks2_packet_encoder</key>
     <param>
       <key>id</key>
-      <value>digital_dxpsk_mod_1</value>
+      <value>blks2_packet_encoder_0</value>
     </param>
     <param>
       <key>_enabled</key>
@@ -193,62 +181,31 @@
     </param>
     <param>
       <key>type</key>
-      <value>dbpsk</value>
+      <value>float</value>
     </param>
     <param>
       <key>samples_per_symbol</key>
       <value>2</value>
     </param>
     <param>
-      <key>excess_bw</key>
-      <value>0.35</value>
-    </param>
-    <param>
-      <key>gray_coded</key>
-      <value>True</value>
-    </param>
-    <param>
-      <key>verbose</key>
-      <value>False</value>
-    </param>
-    <param>
-      <key>log</key>
-      <value>False</value>
-    </param>
-    <param>
-      <key>_coordinate</key>
-      <value>(745, 16)</value>
-    </param>
-    <param>
-      <key>_rotation</key>
-      <value>0</value>
+      <key>bits_per_symbol</key>
+      <value>1</value>
     </param>
-  </block>
-  <block>
-    <key>gr_throttle</key>
     <param>
-      <key>id</key>
-      <value>gr_throttle_0_0</value>
+      <key>access_code</key>
+      <value></value>
     </param>
     <param>
-      <key>_enabled</key>
+      <key>pad_for_usrp</key>
       <value>True</value>
     </param>
     <param>
-      <key>type</key>
-      <value>float</value>
-    </param>
-    <param>
-      <key>samples_per_second</key>
-      <value>samp_rate</value>
-    </param>
-    <param>
-      <key>vlen</key>
-      <value>1</value>
+      <key>payload_length</key>
+      <value>0</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(358, 39)</value>
+      <value>(598, 19)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -256,10 +213,10 @@
     </param>
   </block>
   <block>
-    <key>blks2_packet_encoder</key>
+    <key>digital_dxpsk_mod</key>
     <param>
       <key>id</key>
-      <value>blks2_packet_encoder_0</value>
+      <value>digital_dxpsk_mod_1</value>
     </param>
     <param>
       <key>_enabled</key>
@@ -267,31 +224,31 @@
     </param>
     <param>
       <key>type</key>
-      <value>float</value>
+      <value>dbpsk</value>
     </param>
     <param>
       <key>samples_per_symbol</key>
       <value>2</value>
     </param>
     <param>
-      <key>bits_per_symbol</key>
-      <value>1</value>
+      <key>excess_bw</key>
+      <value>0.35</value>
     </param>
     <param>
-      <key>access_code</key>
-      <value></value>
+      <key>mod_code</key>
+      <value>"gray"</value>
     </param>
     <param>
-      <key>pad_for_usrp</key>
-      <value>True</value>
+      <key>verbose</key>
+      <value>False</value>
     </param>
     <param>
-      <key>payload_length</key>
-      <value>0</value>
+      <key>log</key>
+      <value>False</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(541, 9)</value>
+      <value>(806, 27)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -333,12 +290,8 @@
       <value>6.28/100.0</value>
     </param>
     <param>
-      <key>omega_relative_limit</key>
-      <value>0.005</value>
-    </param>
-    <param>
-      <key>gray_coded</key>
-      <value>True</value>
+      <key>mod_code</key>
+      <value>"gray"</value>
     </param>
     <param>
       <key>verbose</key>
@@ -354,38 +307,7 @@
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(746, 135)</value>
-    </param>
-    <param>
-      <key>_rotation</key>
-      <value>180</value>
-    </param>
-  </block>
-  <block>
-    <key>blks2_packet_decoder</key>
-    <param>
-      <key>id</key>
-      <value>blks2_packet_decoder_0</value>
-    </param>
-    <param>
-      <key>_enabled</key>
-      <value>True</value>
-    </param>
-    <param>
-      <key>type</key>
-      <value>float</value>
-    </param>
-    <param>
-      <key>access_code</key>
-      <value></value>
-    </param>
-    <param>
-      <key>threshold</key>
-      <value>-1</value>
-    </param>
-    <param>
-      <key>_coordinate</key>
-      <value>(545, 187)</value>
+      <value>(745, 139)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -460,7 +382,81 @@
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(184, 165)</value>
+      <value>(184, 163)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>180</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>float</value>
+    </param>
+    <param>
+      <key>samp_rate</key>
+      <value>samp_rate</value>
+    </param>
+    <param>
+      <key>waveform</key>
+      <value>analog.GR_COS_WAVE</value>
+    </param>
+    <param>
+      <key>freq</key>
+      <value>freq</value>
+    </param>
+    <param>
+      <key>amp</key>
+      <value>1</value>
+    </param>
+    <param>
+      <key>offset</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(190, 19)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>blks2_packet_decoder</key>
+    <param>
+      <key>id</key>
+      <value>blks2_packet_decoder_0</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>type</key>
+      <value>float</value>
+    </param>
+    <param>
+      <key>access_code</key>
+      <value></value>
+    </param>
+    <param>
+      <key>threshold</key>
+      <value>-1</value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(545, 187)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -498,7 +494,7 @@
     <sink_key>0</sink_key>
   </connection>
   <connection>
-    <source_block_id>gr_sig_source_x_0</source_block_id>
+    <source_block_id>analog_sig_source_x_0</source_block_id>
     <sink_block_id>gr_throttle_0_0</sink_block_id>
     <source_key>0</source_key>
     <sink_key>0</sink_key>
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-digital
parent	1155ff1e58fc3311f55f28d2e95f057708b99c7d (diff)