analog: removing frequency mod, phase mod, quad demod, and rail from gnuradio-core.

author: Tom Rondeau <trondeau@vt.edu> 2012-11-06 21:17:03 -0500
committer: Tom Rondeau <trondeau@vt.edu> 2012-11-06 21:17:03 -0500
commit: 2553961b6e6a2543a81463b9a1ad2a44bf11bdf6 (patch)
tree: 1048fd7b9f1193bd40f00464a25ff96b559eaec4 /gr-digital
parent: 111ec357548f3c810739a12ed8faead0a5935e0b (diff)
7 files changed, 322 insertions, 392 deletions
diff --git a/gr-digital/examples/demod/gfsk_loopback.grc b/gr-digital/examples/demod/gfsk_loopback.grc
index 364314aa9a..51f5ade77a 100644
--- a/gr-digital/examples/demod/gfsk_loopback.grc
+++ b/gr-digital/examples/demod/gfsk_loopback.grc
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='ASCII'?>
 <flow_graph>
-  <timestamp>Mon Aug 20 19:52:22 2012</timestamp>
+  <timestamp>Tue Nov  6 20:52:00 2012</timestamp>
   <block>
     <key>options</key>
     <param>
@@ -61,37 +61,6 @@
     </param>
   </block>
   <block>
-    <key>gr_throttle</key>
-    <param>
-      <key>id</key>
-      <value>gr_throttle_0_0</value>
-    </param>
-    <param>
-      <key>_enabled</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>
-    </param>
-    <param>
-      <key>_coordinate</key>
-      <value>(413, 50)</value>
-    </param>
-    <param>
-      <key>_rotation</key>
-      <value>0</value>
-    </param>
-  </block>
-  <block>
     <key>variable</key>
     <param>
       <key>id</key>
@@ -138,49 +107,6 @@
     </param>
   </block>
   <block>
-    <key>gr_sig_source_x</key>
-    <param>
-      <key>id</key>
-      <value>gr_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>gr.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>(215, 18)</value>
-    </param>
-    <param>
-      <key>_rotation</key>
-      <value>0</value>
-    </param>
-  </block>
-  <block>
     <key>variable</key>
     <param>
       <key>id</key>
@@ -281,10 +207,18 @@
       <value>1024</value>
     </param>
     <param>
-      <key>bw</key>
+      <key>srate</key>
       <value>samp_rate</value>
     </param>
     <param>
+      <key>ymin</key>
+      <value>-1</value>
+    </param>
+    <param>
+      <key>ymax</key>
+      <value>1</value>
+    </param>
+    <param>
       <key>nconnections</key>
       <value>1</value>
     </param>
@@ -302,10 +236,10 @@
     </param>
   </block>
   <block>
-    <key>qtgui_time_sink_x</key>
+    <key>blks2_packet_encoder</key>
     <param>
       <key>id</key>
-      <value>qtgui_time_sink_x_1_0</value>
+      <value>blks2_packet_encoder_0</value>
     </param>
     <param>
       <key>_enabled</key>
@@ -316,28 +250,28 @@
       <value>float</value>
     </param>
     <param>
-      <key>name</key>
-      <value>QT GUI Plot</value>
+      <key>samples_per_symbol</key>
+      <value>sps</value>
     </param>
     <param>
-      <key>size</key>
-      <value>1024</value>
+      <key>bits_per_symbol</key>
+      <value>1</value>
     </param>
     <param>
-      <key>bw</key>
-      <value>samp_rate</value>
+      <key>access_code</key>
+      <value></value>
     </param>
     <param>
-      <key>nconnections</key>
-      <value>1</value>
+      <key>pad_for_usrp</key>
+      <value>True</value>
     </param>
     <param>
-      <key>gui_hint</key>
-      <value></value>
+      <key>payload_length</key>
+      <value>0</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(888, 386)</value>
+      <value>(237, 261)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -345,38 +279,30 @@
     </param>
   </block>
   <block>
-    <key>digital_gfsk_mod</key>
+    <key>blks2_packet_decoder</key>
     <param>
       <key>id</key>
-      <value>digital_gfsk_mod_0</value>
+      <value>blks2_packet_decoder_0</value>
     </param>
     <param>
       <key>_enabled</key>
-      <value>False</value>
-    </param>
-    <param>
-      <key>samples_per_symbol</key>
-      <value>sps</value>
-    </param>
-    <param>
-      <key>sensitivity</key>
-      <value>fm_sensitivity</value>
+      <value>True</value>
     </param>
     <param>
-      <key>bt</key>
-      <value>0.35</value>
+      <key>type</key>
+      <value>float</value>
     </param>
     <param>
-      <key>verbose</key>
-      <value>False</value>
+      <key>access_code</key>
+      <value></value>
     </param>
     <param>
-      <key>log</key>
-      <value>False</value>
+      <key>threshold</key>
+      <value>-1</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(456, 277)</value>
+      <value>(720, 130)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -384,50 +310,30 @@
     </param>
   </block>
   <block>
-    <key>digital_gfsk_demod</key>
+    <key>gr_throttle</key>
     <param>
       <key>id</key>
-      <value>digital_gfsk_demod_0</value>
+      <value>gr_throttle_0_0</value>
     </param>
     <param>
       <key>_enabled</key>
-      <value>False</value>
-    </param>
-    <param>
-      <key>samples_per_symbol</key>
-      <value>sps</value>
-    </param>
-    <param>
-      <key>sensitivity</key>
-      <value>fm_sensitivity</value>
-    </param>
-    <param>
-      <key>gain_mu</key>
-      <value>0.175</value>
-    </param>
-    <param>
-      <key>mu</key>
-      <value>0.5</value>
-    </param>
-    <param>
-      <key>omega_relative_limit</key>
-      <value>0.005</value>
+      <value>True</value>
     </param>
     <param>
-      <key>freq_error</key>
-      <value>0.0</value>
+      <key>type</key>
+      <value>float</value>
     </param>
     <param>
-      <key>verbose</key>
-      <value>False</value>
+      <key>samples_per_second</key>
+      <value>samp_rate</value>
     </param>
     <param>
-      <key>log</key>
-      <value>False</value>
+      <key>vlen</key>
+      <value>1</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(670, 253)</value>
+      <value>(413, 50)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -435,10 +341,10 @@
     </param>
   </block>
   <block>
-    <key>blks2_packet_encoder</key>
+    <key>analog_sig_source_x</key>
     <param>
       <key>id</key>
-      <value>blks2_packet_encoder_0</value>
+      <value>analog_sig_source_x_0</value>
     </param>
     <param>
       <key>_enabled</key>
@@ -449,28 +355,28 @@
       <value>float</value>
     </param>
     <param>
-      <key>samples_per_symbol</key>
-      <value>sps</value>
+      <key>samp_rate</key>
+      <value>samp_rate</value>
     </param>
     <param>
-      <key>bits_per_symbol</key>
-      <value>1</value>
+      <key>waveform</key>
+      <value>analog.GR_COS_WAVE</value>
     </param>
     <param>
-      <key>access_code</key>
-      <value></value>
+      <key>freq</key>
+      <value>freq</value>
     </param>
     <param>
-      <key>pad_for_usrp</key>
-      <value>True</value>
+      <key>amp</key>
+      <value>1</value>
     </param>
     <param>
-      <key>payload_length</key>
+      <key>offset</key>
       <value>0</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(237, 261)</value>
+      <value>(214, 18)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -478,10 +384,10 @@
     </param>
   </block>
   <block>
-    <key>digital_gmsk_mod</key>
+    <key>digital_gfsk_demod</key>
     <param>
       <key>id</key>
-      <value>digital_gmsk_mod_0</value>
+      <value>digital_gfsk_demod_0</value>
     </param>
     <param>
       <key>_enabled</key>
@@ -489,11 +395,27 @@
     </param>
     <param>
       <key>samples_per_symbol</key>
-      <value>2</value>
+      <value>sps</value>
     </param>
     <param>
-      <key>bt</key>
-      <value>0.35</value>
+      <key>sensitivity</key>
+      <value>fm_sensitivity</value>
+    </param>
+    <param>
+      <key>gain_mu</key>
+      <value>0.175</value>
+    </param>
+    <param>
+      <key>mu</key>
+      <value>0.5</value>
+    </param>
+    <param>
+      <key>omega_relative_limit</key>
+      <value>0.005</value>
+    </param>
+    <param>
+      <key>freq_error</key>
+      <value>0.0</value>
     </param>
     <param>
       <key>verbose</key>
@@ -505,7 +427,7 @@
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(342, 457)</value>
+      <value>(670, 253)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -513,22 +435,38 @@
     </param>
   </block>
   <block>
-    <key>gr_quadrature_demod_cf</key>
+    <key>digital_gfsk_mod</key>
     <param>
       <key>id</key>
-      <value>gr_quadrature_demod_cf_0</value>
+      <value>digital_gfsk_mod_0</value>
     </param>
     <param>
       <key>_enabled</key>
       <value>True</value>
     </param>
     <param>
-      <key>gain</key>
-      <value>1</value>
+      <key>samples_per_symbol</key>
+      <value>sps</value>
+    </param>
+    <param>
+      <key>sensitivity</key>
+      <value>fm_sensitivity</value>
+    </param>
+    <param>
+      <key>bt</key>
+      <value>0.35</value>
+    </param>
+    <param>
+      <key>verbose</key>
+      <value>False</value>
+    </param>
+    <param>
+      <key>log</key>
+      <value>False</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(679, 402)</value>
+      <value>(456, 277)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -536,10 +474,10 @@
     </param>
   </block>
   <block>
-    <key>blks2_packet_decoder</key>
+    <key>qtgui_time_sink_x</key>
     <param>
       <key>id</key>
-      <value>blks2_packet_decoder_0</value>
+      <value>qtgui_time_sink_x_1_0</value>
     </param>
     <param>
       <key>_enabled</key>
@@ -550,63 +488,59 @@
       <value>float</value>
     </param>
     <param>
-      <key>access_code</key>
-      <value></value>
+      <key>name</key>
+      <value>QT GUI Plot</value>
     </param>
     <param>
-      <key>threshold</key>
-      <value>-1</value>
+      <key>size</key>
+      <value>1024</value>
     </param>
     <param>
-      <key>_coordinate</key>
-      <value>(720, 130)</value>
+      <key>srate</key>
+      <value>samp_rate</value>
     </param>
     <param>
-      <key>_rotation</key>
-      <value>0</value>
-    </param>
-  </block>
-  <block>
-    <key>digital_gmsk_demod</key>
-    <param>
-      <key>id</key>
-      <value>digital_gmsk_demod_0</value>
+      <key>ymin</key>
+      <value>-1</value>
     </param>
     <param>
-      <key>_enabled</key>
-      <value>True</value>
+      <key>ymax</key>
+      <value>1</value>
     </param>
     <param>
-      <key>samples_per_symbol</key>
-      <value>2</value>
+      <key>nconnections</key>
+      <value>1</value>
     </param>
     <param>
-      <key>gain_mu</key>
-      <value>0.175</value>
+      <key>gui_hint</key>
+      <value></value>
     </param>
     <param>
-      <key>mu</key>
-      <value>0.5</value>
+      <key>_coordinate</key>
+      <value>(888, 386)</value>
     </param>
     <param>
-      <key>omega_relative_limit</key>
-      <value>0.005</value>
+      <key>_rotation</key>
+      <value>0</value>
     </param>
+  </block>
+  <block>
+    <key>analog_quadrature_demod_cf</key>
     <param>
-      <key>freq_error</key>
-      <value>0.0</value>
+      <key>id</key>
+      <value>analog_quadrature_demod_cf_0</value>
     </param>
     <param>
-      <key>verbose</key>
-      <value>False</value>
+      <key>_enabled</key>
+      <value>True</value>
     </param>
     <param>
-      <key>log</key>
-      <value>False</value>
+      <key>gain</key>
+      <value>1</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(622, 498)</value>
+      <value>(673, 403)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -614,12 +548,6 @@
     </param>
   </block>
   <connection>
-    <source_block_id>gr_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>
-  </connection>
-  <connection>
     <source_block_id>blks2_packet_encoder_0</source_block_id>
     <sink_block_id>digital_gfsk_mod_0</sink_block_id>
     <source_key>0</source_key>
@@ -632,12 +560,6 @@
     <sink_key>0</sink_key>
   </connection>
   <connection>
-    <source_block_id>digital_gfsk_mod_0</source_block_id>
-    <sink_block_id>gr_quadrature_demod_cf_0</sink_block_id>
-    <source_key>0</source_key>
-    <sink_key>0</sink_key>
-  </connection>
-  <connection>
     <source_block_id>digital_gfsk_demod_0</source_block_id>
     <sink_block_id>blks2_packet_decoder_0</sink_block_id>
     <source_key>0</source_key>
@@ -656,32 +578,20 @@
     <sink_key>0</sink_key>
   </connection>
   <connection>
-    <source_block_id>gr_quadrature_demod_cf_0</source_block_id>
-    <sink_block_id>qtgui_time_sink_x_1_0</sink_block_id>
-    <source_key>0</source_key>
-    <sink_key>0</sink_key>
-  </connection>
-  <connection>
-    <source_block_id>blks2_packet_encoder_0</source_block_id>
-    <sink_block_id>digital_gmsk_mod_0</sink_block_id>
-    <source_key>0</source_key>
-    <sink_key>0</sink_key>
-  </connection>
-  <connection>
-    <source_block_id>digital_gmsk_mod_0</source_block_id>
-    <sink_block_id>digital_gmsk_demod_0</sink_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>
   </connection>
   <connection>
-    <source_block_id>digital_gmsk_mod_0</source_block_id>
-    <sink_block_id>gr_quadrature_demod_cf_0</sink_block_id>
+    <source_block_id>digital_gfsk_mod_0</source_block_id>
+    <sink_block_id>analog_quadrature_demod_cf_0</sink_block_id>
     <source_key>0</source_key>
     <sink_key>0</sink_key>
   </connection>
   <connection>
-    <source_block_id>digital_gmsk_demod_0</source_block_id>
-    <sink_block_id>blks2_packet_decoder_0</sink_block_id>
+    <source_block_id>analog_quadrature_demod_cf_0</source_block_id>
+    <sink_block_id>qtgui_time_sink_x_1_0</sink_block_id>
     <source_key>0</source_key>
     <sink_key>0</sink_key>
   </connection>
diff --git a/gr-digital/examples/demod/gmsk_loopback.grc b/gr-digital/examples/demod/gmsk_loopback.grc
index 84912ac58b..c4361fbed8 100644
--- a/gr-digital/examples/demod/gmsk_loopback.grc
+++ b/gr-digital/examples/demod/gmsk_loopback.grc
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='ASCII'?>
 <flow_graph>
-  <timestamp>Mon Aug 20 19:53:13 2012</timestamp>
+  <timestamp>Tue Nov  6 20:49:18 2012</timestamp>
   <block>
     <key>options</key>
     <param>
@@ -61,37 +61,6 @@
     </param>
   </block>
   <block>
-    <key>gr_throttle</key>
-    <param>
-      <key>id</key>
-      <value>gr_throttle_0_0</value>
-    </param>
-    <param>
-      <key>_enabled</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>
-    </param>
-    <param>
-      <key>_coordinate</key>
-      <value>(413, 50)</value>
-    </param>
-    <param>
-      <key>_rotation</key>
-      <value>0</value>
-    </param>
-  </block>
-  <block>
     <key>variable</key>
     <param>
       <key>id</key>
@@ -138,49 +107,6 @@
     </param>
   </block>
   <block>
-    <key>gr_sig_source_x</key>
-    <param>
-      <key>id</key>
-      <value>gr_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>gr.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>(215, 18)</value>
-    </param>
-    <param>
-      <key>_rotation</key>
-      <value>0</value>
-    </param>
-  </block>
-  <block>
     <key>variable</key>
     <param>
       <key>id</key>
@@ -281,10 +207,18 @@
       <value>1024</value>
     </param>
     <param>
-      <key>bw</key>
+      <key>srate</key>
       <value>samp_rate</value>
     </param>
     <param>
+      <key>ymin</key>
+      <value>-1</value>
+    </param>
+    <param>
+      <key>ymax</key>
+      <value>1</value>
+    </param>
+    <param>
       <key>nconnections</key>
       <value>1</value>
     </param>
@@ -302,10 +236,10 @@
     </param>
   </block>
   <block>
-    <key>qtgui_time_sink_x</key>
+    <key>blks2_packet_encoder</key>
     <param>
       <key>id</key>
-      <value>qtgui_time_sink_x_1_0</value>
+      <value>blks2_packet_encoder_0</value>
     </param>
     <param>
       <key>_enabled</key>
@@ -316,28 +250,28 @@
       <value>float</value>
     </param>
     <param>
-      <key>name</key>
-      <value>QT GUI Plot</value>
+      <key>samples_per_symbol</key>
+      <value>sps</value>
     </param>
     <param>
-      <key>size</key>
-      <value>1024</value>
+      <key>bits_per_symbol</key>
+      <value>1</value>
     </param>
     <param>
-      <key>bw</key>
-      <value>samp_rate</value>
+      <key>access_code</key>
+      <value></value>
     </param>
     <param>
-      <key>nconnections</key>
-      <value>1</value>
+      <key>pad_for_usrp</key>
+      <value>True</value>
     </param>
     <param>
-      <key>gui_hint</key>
-      <value></value>
+      <key>payload_length</key>
+      <value>0</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(888, 386)</value>
+      <value>(237, 261)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -345,10 +279,10 @@
     </param>
   </block>
   <block>
-    <key>blks2_packet_encoder</key>
+    <key>blks2_packet_decoder</key>
     <param>
       <key>id</key>
-      <value>blks2_packet_encoder_0</value>
+      <value>blks2_packet_decoder_0</value>
     </param>
     <param>
       <key>_enabled</key>
@@ -359,28 +293,63 @@
       <value>float</value>
     </param>
     <param>
-      <key>samples_per_symbol</key>
-      <value>sps</value>
+      <key>access_code</key>
+      <value></value>
     </param>
     <param>
-      <key>bits_per_symbol</key>
-      <value>1</value>
+      <key>threshold</key>
+      <value>-1</value>
     </param>
     <param>
-      <key>access_code</key>
-      <value></value>
+      <key>_coordinate</key>
+      <value>(720, 130)</value>
     </param>
     <param>
-      <key>pad_for_usrp</key>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>digital_gmsk_demod</key>
+    <param>
+      <key>id</key>
+      <value>digital_gmsk_demod_0</value>
+    </param>
+    <param>
+      <key>_enabled</key>
       <value>True</value>
     </param>
     <param>
-      <key>payload_length</key>
-      <value>0</value>
+      <key>samples_per_symbol</key>
+      <value>2</value>
+    </param>
+    <param>
+      <key>gain_mu</key>
+      <value>0.175</value>
+    </param>
+    <param>
+      <key>mu</key>
+      <value>0.5</value>
+    </param>
+    <param>
+      <key>omega_relative_limit</key>
+      <value>0.005</value>
+    </param>
+    <param>
+      <key>freq_error</key>
+      <value>0.0</value>
+    </param>
+    <param>
+      <key>verbose</key>
+      <value>False</value>
+    </param>
+    <param>
+      <key>log</key>
+      <value>False</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(237, 261)</value>
+      <value>(666, 261)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -388,22 +357,30 @@
     </param>
   </block>
   <block>
-    <key>gr_quadrature_demod_cf</key>
+    <key>gr_throttle</key>
     <param>
       <key>id</key>
-      <value>gr_quadrature_demod_cf_0</value>
+      <value>gr_throttle_0_0</value>
     </param>
     <param>
       <key>_enabled</key>
       <value>True</value>
     </param>
     <param>
-      <key>gain</key>
+      <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>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(679, 402)</value>
+      <value>(413, 50)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -411,10 +388,10 @@
     </param>
   </block>
   <block>
-    <key>blks2_packet_decoder</key>
+    <key>analog_sig_source_x</key>
     <param>
       <key>id</key>
-      <value>blks2_packet_decoder_0</value>
+      <value>analog_sig_source_x_0</value>
     </param>
     <param>
       <key>_enabled</key>
@@ -425,16 +402,28 @@
       <value>float</value>
     </param>
     <param>
-      <key>access_code</key>
-      <value></value>
+      <key>samp_rate</key>
+      <value>samp_rate</value>
     </param>
     <param>
-      <key>threshold</key>
-      <value>-1</value>
+      <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>(720, 130)</value>
+      <value>(210, 18)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -442,34 +431,50 @@
     </param>
   </block>
   <block>
-    <key>digital_gmsk_mod</key>
+    <key>qtgui_time_sink_x</key>
     <param>
       <key>id</key>
-      <value>digital_gmsk_mod_0</value>
+      <value>qtgui_time_sink_x_1_0</value>
     </param>
     <param>
       <key>_enabled</key>
       <value>True</value>
     </param>
     <param>
-      <key>samples_per_symbol</key>
-      <value>2</value>
+      <key>type</key>
+      <value>float</value>
     </param>
     <param>
-      <key>bt</key>
-      <value>0.35</value>
+      <key>name</key>
+      <value>QT GUI Plot</value>
     </param>
     <param>
-      <key>verbose</key>
-      <value>False</value>
+      <key>size</key>
+      <value>1024</value>
     </param>
     <param>
-      <key>log</key>
-      <value>False</value>
+      <key>srate</key>
+      <value>samp_rate</value>
+    </param>
+    <param>
+      <key>ymin</key>
+      <value>-1</value>
+    </param>
+    <param>
+      <key>ymax</key>
+      <value>1</value>
+    </param>
+    <param>
+      <key>nconnections</key>
+      <value>1</value>
+    </param>
+    <param>
+      <key>gui_hint</key>
+      <value></value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(446, 285)</value>
+      <value>(888, 386)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -477,10 +482,10 @@
     </param>
   </block>
   <block>
-    <key>digital_gmsk_demod</key>
+    <key>digital_gmsk_mod</key>
     <param>
       <key>id</key>
-      <value>digital_gmsk_demod_0</value>
+      <value>digital_gmsk_mod_0</value>
     </param>
     <param>
       <key>_enabled</key>
@@ -491,32 +496,43 @@
       <value>2</value>
     </param>
     <param>
-      <key>gain_mu</key>
-      <value>0.175</value>
+      <key>bt</key>
+      <value>0.35</value>
     </param>
     <param>
-      <key>mu</key>
-      <value>0.5</value>
+      <key>verbose</key>
+      <value>False</value>
     </param>
     <param>
-      <key>omega_relative_limit</key>
-      <value>0.005</value>
+      <key>log</key>
+      <value>False</value>
     </param>
     <param>
-      <key>freq_error</key>
-      <value>0.0</value>
+      <key>_coordinate</key>
+      <value>(446, 285)</value>
     </param>
     <param>
-      <key>verbose</key>
-      <value>False</value>
+      <key>_rotation</key>
+      <value>0</value>
     </param>
+  </block>
+  <block>
+    <key>analog_quadrature_demod_cf</key>
     <param>
-      <key>log</key>
-      <value>False</value>
+      <key>id</key>
+      <value>analog_quadrature_demod_cf_0</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>gain</key>
+      <value>1</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(666, 261)</value>
+      <value>(675, 402)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -524,12 +540,6 @@
     </param>
   </block>
   <connection>
-    <source_block_id>gr_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>
-  </connection>
-  <connection>
     <source_block_id>gr_throttle_0_0</source_block_id>
     <sink_block_id>blks2_packet_encoder_0</sink_block_id>
     <source_key>0</source_key>
@@ -542,12 +552,6 @@
     <sink_key>0</sink_key>
   </connection>
   <connection>
-    <source_block_id>gr_quadrature_demod_cf_0</source_block_id>
-    <sink_block_id>qtgui_time_sink_x_1_0</sink_block_id>
-    <source_key>0</source_key>
-    <sink_key>0</sink_key>
-  </connection>
-  <connection>
     <source_block_id>blks2_packet_encoder_0</source_block_id>
     <sink_block_id>digital_gmsk_mod_0</sink_block_id>
     <source_key>0</source_key>
@@ -560,14 +564,26 @@
     <sink_key>0</sink_key>
   </connection>
   <connection>
-    <source_block_id>digital_gmsk_mod_0</source_block_id>
-    <sink_block_id>gr_quadrature_demod_cf_0</sink_block_id>
+    <source_block_id>digital_gmsk_demod_0</source_block_id>
+    <sink_block_id>blks2_packet_decoder_0</sink_block_id>
     <source_key>0</source_key>
     <sink_key>0</sink_key>
   </connection>
   <connection>
-    <source_block_id>digital_gmsk_demod_0</source_block_id>
-    <sink_block_id>blks2_packet_decoder_0</sink_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>
+  </connection>
+  <connection>
+    <source_block_id>analog_quadrature_demod_cf_0</source_block_id>
+    <sink_block_id>qtgui_time_sink_x_1_0</sink_block_id>
+    <source_key>0</source_key>
+    <sink_key>0</sink_key>
+  </connection>
+  <connection>
+    <source_block_id>digital_gmsk_mod_0</source_block_id>
+    <sink_block_id>analog_quadrature_demod_cf_0</sink_block_id>
     <source_key>0</source_key>
     <sink_key>0</sink_key>
   </connection>
diff --git a/gr-digital/lib/cpmmod_bc_impl.h b/gr-digital/lib/cpmmod_bc_impl.h
index d27853e301..77e71ede74 100644
--- a/gr-digital/lib/cpmmod_bc_impl.h
+++ b/gr-digital/lib/cpmmod_bc_impl.h
@@ -25,7 +25,7 @@
 
 #include <digital/cpmmod_bc.h>
 #include <gr_char_to_float.h>
-#include <gr_frequency_modulator_fc.h>
+#include <analog/frequency_modulator_fc.h>
 #include <gr_cpm.h>
 #include <filter/interp_fir_filter_fff.h>
 
@@ -45,7 +45,7 @@ namespace gr {
       std::vector<float> d_taps;
       gr_char_to_float_sptr d_char_to_float;
       gr::filter::interp_fir_filter_fff::sptr d_pulse_shaper;
-      gr_frequency_modulator_fc_sptr d_fm;
+      analog::frequency_modulator_fc_sptr d_fm;
   
     public:
       cpmmod_bc_impl(const std::string &name,
diff --git a/gr-digital/python/cpm.py b/gr-digital/python/cpm.py
index a2c9f2f0e0..1929a73d30 100644
--- a/gr-digital/python/cpm.py
+++ b/gr-digital/python/cpm.py
@@ -25,6 +25,7 @@
 # See gnuradio-examples/python/digital for examples
 
 from gnuradio import gr, filter
+from gnuradio import analog
 from math import pi
 import numpy
 
@@ -126,7 +127,7 @@ class cpm_mod(gr.hier_block2):
         if cpm_type == 0: # CPFSK
             self.taps= (1.0/self._symbols_per_pulse/2,) * self.ntaps
         elif cpm_type == 1: # GMSK
-            gaussian_taps = gr.firdes.gaussian(
+            gaussian_taps = filter.firdes.gaussian(
                 1.0/2,                     # gain
                 samples_per_symbol,    # symbol_rate
                 bt,                    # bandwidth * symbol time
@@ -145,7 +146,7 @@ class cpm_mod(gr.hier_block2):
         self.filter = filter.pfb.arb_resampler_fff(samples_per_symbol, self.taps)
 
 	# FM modulation
-	self.fmmod = gr.frequency_modulator_fc(sensitivity)
+	self.fmmod = analog.frequency_modulator_fc(sensitivity)
 		
         if verbose:
             self._print_verbage()
diff --git a/gr-digital/python/gfsk.py b/gr-digital/python/gfsk.py
index 09f12ebc30..c69dd4d7d8 100644
--- a/gr-digital/python/gfsk.py
+++ b/gr-digital/python/gfsk.py
@@ -2,7 +2,7 @@
 # GFSK modulation and demodulation.  
 #
 #
-# Copyright 2005,2006,2007 Free Software Foundation, Inc.
+# Copyright 2005-2007,2012 Free Software Foundation, Inc.
 # 
 # This file is part of GNU Radio
 # 
@@ -25,6 +25,7 @@
 # See gnuradio-examples/python/digital for examples
 
 from gnuradio import gr
+from gnuradio import analog
 import modulation_utils
 import digital_swig as digital
 from math import pi
@@ -102,7 +103,7 @@ class gfsk_mod(gr.hier_block2):
 
 	# Form Gaussian filter
         # Generate Gaussian response (Needs to be convolved with window below).
-	self.gaussian_taps = gr.firdes.gaussian(
+	self.gaussian_taps = filter.firdes.gaussian(
 		1.0,		       # gain
 		samples_per_symbol,    # symbol_rate
 		bt,		       # bandwidth * symbol time
@@ -114,7 +115,7 @@ class gfsk_mod(gr.hier_block2):
 	self.gaussian_filter = filter.interp_fir_filter_fff(samples_per_symbol, self.taps)
 
 	# FM modulation
-	self.fmmod = gr.frequency_modulator_fc(sensitivity)
+	self.fmmod = frequency.frequency_modulator_fc(sensitivity)
 
 	# small amount of output attenuation to prevent clipping USRP sink
 	self.amp = gr.multiply_const_cc(0.999)
@@ -230,7 +231,7 @@ class gfsk_demod(gr.hier_block2):
 
 	# Demodulate FM
 	#sensitivity = (pi / 2) / samples_per_symbol
-	self.fmdemod = gr.quadrature_demod_cf(1.0 / sensitivity)
+	self.fmdemod = analog.quadrature_demod_cf(1.0 / sensitivity)
 
 	# the clock recovery block tracks the symbol clock and resamples as needed.
 	# the output of the block is a stream of soft symbols (float)
diff --git a/gr-digital/python/gmsk.py b/gr-digital/python/gmsk.py
index e7853dd0af..c0f5c439aa 100644
--- a/gr-digital/python/gmsk.py
+++ b/gr-digital/python/gmsk.py
@@ -2,7 +2,7 @@
 # GMSK modulation and demodulation.  
 #
 #
-# Copyright 2005,2006,2007 Free Software Foundation, Inc.
+# Copyright 2005-2007,2012 Free Software Foundation, Inc.
 # 
 # This file is part of GNU Radio
 # 
@@ -25,6 +25,7 @@
 # See gnuradio-examples/python/digital for examples
 
 from gnuradio import gr
+from gnuradio import analog
 import modulation_utils
 import digital_swig as digital
 from math import pi
@@ -101,7 +102,7 @@ class gmsk_mod(gr.hier_block2):
 
 	# Form Gaussian filter
         # Generate Gaussian response (Needs to be convolved with window below).
-	self.gaussian_taps = gr.firdes.gaussian(
+	self.gaussian_taps = filter.firdes.gaussian(
 		1,		       # gain
 		samples_per_symbol,    # symbol_rate
 		bt,		       # bandwidth * symbol time
@@ -113,7 +114,7 @@ class gmsk_mod(gr.hier_block2):
 	self.gaussian_filter = filter.interp_fir_filter_fff(samples_per_symbol, self.taps)
 
 	# FM modulation
-	self.fmmod = gr.frequency_modulator_fc(sensitivity)
+	self.fmmod = analog.frequency_modulator_fc(sensitivity)
 		
         if verbose:
             self._print_verbage()
@@ -220,7 +221,7 @@ class gmsk_demod(gr.hier_block2):
 
 	# Demodulate FM
 	sensitivity = (pi / 2) / samples_per_symbol
-	self.fmdemod = gr.quadrature_demod_cf(1.0 / sensitivity)
+	self.fmdemod = analog.quadrature_demod_cf(1.0 / sensitivity)
 
 	# the clock recovery block tracks the symbol clock and resamples as needed.
 	# the output of the block is a stream of soft symbols (float)
diff --git a/gr-digital/python/ofdm_receiver.py b/gr-digital/python/ofdm_receiver.py
index 1dc3cdf7cd..ace64a8089 100644
--- a/gr-digital/python/ofdm_receiver.py
+++ b/gr-digital/python/ofdm_receiver.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 #
-# Copyright 2006, 2007, 2008 Free Software Foundation, Inc.
+# Copyright 2006-2008 Free Software Foundation, Inc.
 # 
 # This file is part of GNU Radio
 # 
@@ -23,6 +23,7 @@
 import math
 from numpy import fft
 from gnuradio import gr
+from gnuradio import analog
 
 import digital_swig as digital
 from ofdm_sync_pn import ofdm_sync_pn
@@ -119,7 +120,7 @@ class ofdm_receiver(gr.hier_block2):
 
         # Set up blocks
 
-        self.nco = gr.frequency_modulator_fc(nco_sensitivity)         # generate a signal proportional to frequency error of sync block
+        self.nco = analog.frequency_modulator_fc(nco_sensitivity)         # generate a signal proportional to frequency error of sync block
         self.sigmix = gr.multiply_cc()
         self.sampler = digital.ofdm_sampler(fft_length, fft_length+cp_length)
         self.fft_demod = gr.fft_vcc(fft_length, True, win, True)
author	Tom Rondeau <trondeau@vt.edu>	2012-11-06 21:17:03 -0500
committer	Tom Rondeau <trondeau@vt.edu>	2012-11-06 21:17:03 -0500
commit	2553961b6e6a2543a81463b9a1ad2a44bf11bdf6 (patch)
tree	1048fd7b9f1193bd40f00464a25ff96b559eaec4 /gr-digital
parent	111ec357548f3c810739a12ed8faead0a5935e0b (diff)