1 files changed, 251 insertions, 239 deletions
diff --git a/gr-fcd/examples/grc/fcd_apt_rx.grc b/gr-fcd/examples/grc/fcd_apt_rx.grc
index c4d3e64d1a..3c88db7edd 100644
--- a/gr-fcd/examples/grc/fcd_apt_rx.grc
+++ b/gr-fcd/examples/grc/fcd_apt_rx.grc
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='ASCII'?>
 <flow_graph>
-  <timestamp>Sun May  8 18:01:53 2011</timestamp>
+  <timestamp>Mon Mar 18 10:04:36 2013</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>
@@ -57,57 +61,42 @@
     </param>
   </block>
   <block>
-    <key>variable</key>
+    <key>variable_static_text</key>
     <param>
       <key>id</key>
-      <value>samp_rate</value>
+      <value>rec_info</value>
     </param>
     <param>
       <key>_enabled</key>
       <value>True</value>
     </param>
     <param>
-      <key>value</key>
-      <value>96000</value>
-    </param>
-    <param>
-      <key>_coordinate</key>
-      <value>(200, 9)</value>
+      <key>label</key>
+      <value>Recording to</value>
     </param>
     <param>
-      <key>_rotation</key>
-      <value>0</value>
+      <key>value</key>
+      <value>wav_file</value>
     </param>
-  </block>
-  <block>
-    <key>audio_sink</key>
     <param>
-      <key>id</key>
-      <value>audio_sink</value>
+      <key>converver</key>
+      <value>str_converter</value>
     </param>
     <param>
-      <key>_enabled</key>
-      <value>True</value>
+      <key>formatter</key>
+      <value>None</value>
     </param>
     <param>
-      <key>samp_rate</key>
-      <value>48000</value>
+      <key>grid_pos</key>
+      <value>1,1,1,1</value>
     </param>
     <param>
-      <key>device_name</key>
+      <key>notebook</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>(794, 355)</value>
+      <value>(641, 14)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -115,46 +104,54 @@
     </param>
   </block>
   <block>
-    <key>blks2_fm_demod_cf</key>
+    <key>fcd_source_c</key>
     <param>
       <key>id</key>
-      <value>blks2_fm_demod_cf</value>
+      <value>fcd_source_c_0</value>
     </param>
     <param>
       <key>_enabled</key>
       <value>True</value>
     </param>
     <param>
-      <key>chan_rate</key>
-      <value>samp_rate</value>
+      <key>device_name</key>
+      <value>hw:1</value>
     </param>
     <param>
-      <key>audio_decim</key>
-      <value>2</value>
+      <key>freq</key>
+      <value>sat_freq</value>
     </param>
     <param>
-      <key>deviation</key>
-      <value>max_dev</value>
+      <key>lna</key>
+      <value>fcd_lna_gain</value>
     </param>
     <param>
-      <key>audio_pass</key>
-      <value>5000</value>
+      <key>mixer</key>
+      <value>+12</value>
     </param>
     <param>
-      <key>audio_stop</key>
-      <value>7000</value>
+      <key>ppm</key>
+      <value>-120</value>
     </param>
     <param>
-      <key>gain</key>
-      <value>1.0</value>
+      <key>dci</key>
+      <value>0.0</value>
     </param>
     <param>
-      <key>tau</key>
-      <value>75e-6</value>
+      <key>dcq</key>
+      <value>0.0</value>
+    </param>
+    <param>
+      <key>iq_phase</key>
+      <value>0.0</value>
+    </param>
+    <param>
+      <key>iq_gain</key>
+      <value>1.0</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(568, 307)</value>
+      <value>(68, 215)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -162,38 +159,50 @@
     </param>
   </block>
   <block>
-    <key>blks2_rational_resampler_xxx</key>
+    <key>variable_chooser</key>
     <param>
       <key>id</key>
-      <value>blks2_rational_resampler_xxx_0</value>
+      <value>fcd_lna_gain</value>
     </param>
     <param>
       <key>_enabled</key>
       <value>True</value>
     </param>
     <param>
-      <key>type</key>
-      <value>fff</value>
+      <key>label</key>
+      <value>LNA gain [dB]</value>
     </param>
     <param>
-      <key>decim</key>
-      <value>48000</value>
+      <key>value</key>
+      <value>20.0</value>
     </param>
     <param>
-      <key>interp</key>
-      <value>11025</value>
+      <key>choices</key>
+      <value>[30.0, 25.0, 20.0, 17.5, 15.0, 12.5, 10.0, 7.5, 5.0, 2.5, 0.0, -2.5, -5.0]</value>
     </param>
     <param>
-      <key>taps</key>
+      <key>labels</key>
       <value>[]</value>
     </param>
     <param>
-      <key>fractional_bw</key>
-      <value>0</value>
+      <key>type</key>
+      <value>drop_down</value>
+    </param>
+    <param>
+      <key>style</key>
+      <value>wx.RA_HORIZONTAL</value>
+    </param>
+    <param>
+      <key>grid_pos</key>
+      <value>2,0,1,1</value>
+    </param>
+    <param>
+      <key>notebook</key>
+      <value></value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(516, 522)</value>
+      <value>(247, 405)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -201,45 +210,50 @@
     </param>
   </block>
   <block>
-    <key>variable</key>
+    <key>variable_chooser</key>
     <param>
       <key>id</key>
-      <value>wav_file</value>
+      <value>sat_freq</value>
     </param>
     <param>
       <key>_enabled</key>
       <value>True</value>
     </param>
     <param>
+      <key>label</key>
+      <value>Satellite</value>
+    </param>
+    <param>
       <key>value</key>
-      <value>prefix + datetime.now().strftime("%Y.%m.%d.%H.%M.%S") + ".wav"</value>
+      <value>137500000</value>
     </param>
     <param>
-      <key>_coordinate</key>
-      <value>(762, 652)</value>
+      <key>choices</key>
+      <value>[137500000,137620000,137912500,137100000]</value>
     </param>
     <param>
-      <key>_rotation</key>
-      <value>0</value>
+      <key>labels</key>
+      <value>["NOAA-15","NOAA-17","NOAA-18","NOAA-19"]</value>
     </param>
-  </block>
-  <block>
-    <key>variable</key>
     <param>
-      <key>id</key>
-      <value>prefix</value>
+      <key>type</key>
+      <value>drop_down</value>
     </param>
     <param>
-      <key>_enabled</key>
-      <value>True</value>
+      <key>style</key>
+      <value>wx.RA_HORIZONTAL</value>
     </param>
     <param>
-      <key>value</key>
-      <value>"FCD_APT_REC-"</value>
+      <key>grid_pos</key>
+      <value>1,0,1,1</value>
+    </param>
+    <param>
+      <key>notebook</key>
+      <value></value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(625, 653)</value>
+      <value>(58, 403)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -247,108 +261,113 @@
     </param>
   </block>
   <block>
-    <key>import</key>
+    <key>wxgui_fftsink2</key>
     <param>
       <key>id</key>
-      <value>import_0</value>
+      <value>fftsink</value>
     </param>
     <param>
       <key>_enabled</key>
       <value>True</value>
     </param>
     <param>
-      <key>import</key>
-      <value>from datetime import datetime</value>
+      <key>type</key>
+      <value>complex</value>
     </param>
     <param>
-      <key>_coordinate</key>
-      <value>(508, 653)</value>
+      <key>title</key>
+      <value>FCD Spectrum</value>
     </param>
     <param>
-      <key>_rotation</key>
-      <value>0</value>
+      <key>samp_rate</key>
+      <value>samp_rate</value>
     </param>
-  </block>
-  <block>
-    <key>gr_wavfile_sink</key>
     <param>
-      <key>id</key>
-      <value>wavfile_sink</value>
+      <key>baseband_freq</key>
+      <value>sat_freq</value>
     </param>
     <param>
-      <key>_enabled</key>
-      <value>True</value>
+      <key>y_per_div</key>
+      <value>10</value>
     </param>
     <param>
-      <key>file</key>
-      <value>wav_file</value>
+      <key>y_divs</key>
+      <value>10</value>
     </param>
     <param>
-      <key>nchan</key>
-      <value>1</value>
+      <key>ref_level</key>
+      <value>0.0</value>
     </param>
     <param>
-      <key>samp_rate</key>
-      <value>11025</value>
+      <key>ref_scale</key>
+      <value>1.0</value>
     </param>
     <param>
-      <key>bits_per_sample</key>
-      <value>16</value>
+      <key>fft_size</key>
+      <value>512</value>
     </param>
     <param>
-      <key>_coordinate</key>
-      <value>(805, 530)</value>
+      <key>fft_rate</key>
+      <value>15</value>
     </param>
     <param>
-      <key>_rotation</key>
+      <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>
-  </block>
-  <block>
-    <key>variable_chooser</key>
     <param>
-      <key>id</key>
-      <value>sat_freq</value>
+      <key>win</key>
+      <value>None</value>
     </param>
     <param>
-      <key>_enabled</key>
-      <value>True</value>
+      <key>win_size</key>
+      <value></value>
     </param>
     <param>
-      <key>label</key>
-      <value>Satellite</value>
+      <key>grid_pos</key>
+      <value>0,0,1,2</value>
     </param>
     <param>
-      <key>value</key>
-      <value>137500000</value>
+      <key>notebook</key>
+      <value></value>
     </param>
     <param>
-      <key>choices</key>
-      <value>[137500000,137620000,137912500,137100000]</value>
+      <key>freqvar</key>
+      <value>None</value>
     </param>
     <param>
-      <key>labels</key>
-      <value>["NOAA-15","NOAA-17","NOAA-18","NOAA-19"]</value>
+      <key>_coordinate</key>
+      <value>(375, 11)</value>
     </param>
     <param>
-      <key>type</key>
-      <value>drop_down</value>
+      <key>_rotation</key>
+      <value>0</value>
     </param>
+  </block>
+  <block>
+    <key>variable</key>
     <param>
-      <key>style</key>
-      <value>wx.RA_HORIZONTAL</value>
+      <key>id</key>
+      <value>samp_rate</value>
     </param>
     <param>
-      <key>grid_pos</key>
-      <value>1,0,1,1</value>
+      <key>_enabled</key>
+      <value>True</value>
     </param>
     <param>
-      <key>notebook</key>
-      <value></value>
+      <key>value</key>
+      <value>96000</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(18, 479)</value>
+      <value>(190, 11)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -371,7 +390,7 @@
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(299, 10)</value>
+      <value>(282, 11)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -379,50 +398,57 @@
     </param>
   </block>
   <block>
-    <key>variable_chooser</key>
+    <key>blocks_wavfile_sink</key>
     <param>
       <key>id</key>
-      <value>fcd_lna_gain</value>
+      <value>wavfile_sink</value>
     </param>
     <param>
       <key>_enabled</key>
       <value>True</value>
     </param>
     <param>
-      <key>label</key>
-      <value>LNA gain [dB]</value>
+      <key>file</key>
+      <value>wav_file</value>
     </param>
     <param>
-      <key>value</key>
-      <value>20.0</value>
+      <key>nchan</key>
+      <value>1</value>
     </param>
     <param>
-      <key>choices</key>
-      <value>[30.0, 25.0, 20.0, 17.5, 15.0, 12.5, 10.0, 7.5, 5.0, 2.5, 0.0, -2.5, -5.0]</value>
+      <key>samp_rate</key>
+      <value>11025</value>
     </param>
     <param>
-      <key>labels</key>
-      <value>[]</value>
+      <key>bits_per_sample</key>
+      <value>16</value>
     </param>
     <param>
-      <key>type</key>
-      <value>drop_down</value>
+      <key>_coordinate</key>
+      <value>(845, 431)</value>
     </param>
     <param>
-      <key>style</key>
-      <value>wx.RA_HORIZONTAL</value>
+      <key>_rotation</key>
+      <value>0</value>
     </param>
+  </block>
+  <block>
+    <key>import</key>
     <param>
-      <key>grid_pos</key>
-      <value>2,0,1,1</value>
+      <key>id</key>
+      <value>import_0</value>
     </param>
     <param>
-      <key>notebook</key>
-      <value></value>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>import</key>
+      <value>from datetime import datetime</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(207, 481)</value>
+      <value>(552, 523)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -430,42 +456,45 @@
     </param>
   </block>
   <block>
-    <key>variable_static_text</key>
+    <key>variable</key>
     <param>
       <key>id</key>
-      <value>rec_info</value>
+      <value>prefix</value>
     </param>
     <param>
       <key>_enabled</key>
       <value>True</value>
     </param>
     <param>
-      <key>label</key>
-      <value>Recording to</value>
+      <key>value</key>
+      <value>"FCD_APT_REC-"</value>
     </param>
     <param>
-      <key>value</key>
-      <value>wav_file</value>
+      <key>_coordinate</key>
+      <value>(669, 523)</value>
     </param>
     <param>
-      <key>converver</key>
-      <value>str_converter</value>
+      <key>_rotation</key>
+      <value>0</value>
     </param>
+  </block>
+  <block>
+    <key>variable</key>
     <param>
-      <key>formatter</key>
-      <value>None</value>
+      <key>id</key>
+      <value>wav_file</value>
     </param>
     <param>
-      <key>grid_pos</key>
-      <value>1,1,1,1</value>
+      <key>_enabled</key>
+      <value>True</value>
     </param>
     <param>
-      <key>notebook</key>
-      <value></value>
+      <key>value</key>
+      <value>prefix + datetime.now().strftime("%Y.%m.%d.%H.%M.%S") + ".wav"</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(641, 14)</value>
+      <value>(806, 522)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -520,7 +549,7 @@
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(334, 307)</value>
+      <value>(374, 231)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -528,50 +557,34 @@
     </param>
   </block>
   <block>
-    <key>fcd_source_c</key>
+    <key>audio_sink</key>
     <param>
       <key>id</key>
-      <value>fcd_source_c_0</value>
+      <value>audio_sink</value>
     </param>
     <param>
       <key>_enabled</key>
       <value>True</value>
     </param>
     <param>
-      <key>device_name</key>
-      <value>hw:1</value>
-    </param>
-    <param>
-      <key>freq</key>
-      <value>sat_freq</value>
-    </param>
-    <param>
-      <key>lna</key>
-      <value>fcd_lna_gain</value>
-    </param>
-    <param>
-      <key>ppm</key>
-      <value>-120</value>
-    </param>
-    <param>
-      <key>dci</key>
-      <value>0.0</value>
+      <key>samp_rate</key>
+      <value>48000</value>
     </param>
     <param>
-      <key>dcq</key>
-      <value>0.0</value>
+      <key>device_name</key>
+      <value></value>
     </param>
     <param>
-      <key>iq_phase</key>
-      <value>0.0</value>
+      <key>ok_to_block</key>
+      <value>True</value>
     </param>
     <param>
-      <key>iq_gain</key>
-      <value>1.0</value>
+      <key>num_inputs</key>
+      <value>1</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(25, 299)</value>
+      <value>(834, 279)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -579,10 +592,10 @@
     </param>
   </block>
   <block>
-    <key>wxgui_fftsink2</key>
+    <key>rational_resampler_xxx</key>
     <param>
       <key>id</key>
-      <value>fftsink</value>
+      <value>rational_resampler_xxx_0</value>
     </param>
     <param>
       <key>_enabled</key>
@@ -590,75 +603,74 @@
     </param>
     <param>
       <key>type</key>
-      <value>complex</value>
-    </param>
-    <param>
-      <key>title</key>
-      <value>FCD Spectrum</value>
+      <value>fff</value>
     </param>
     <param>
-      <key>samp_rate</key>
-      <value>samp_rate</value>
+      <key>interp</key>
+      <value>11025</value>
     </param>
     <param>
-      <key>baseband_freq</key>
-      <value>sat_freq</value>
+      <key>decim</key>
+      <value>48000</value>
     </param>
     <param>
-      <key>y_per_div</key>
-      <value>10</value>
+      <key>taps</key>
+      <value>[]</value>
     </param>
     <param>
-      <key>y_divs</key>
-      <value>10</value>
+      <key>fbw</key>
+      <value>0</value>
     </param>
     <param>
-      <key>ref_level</key>
-      <value>0.0</value>
+      <key>_coordinate</key>
+      <value>(591, 423)</value>
     </param>
     <param>
-      <key>ref_scale</key>
-      <value>1.0</value>
+      <key>_rotation</key>
+      <value>0</value>
     </param>
+  </block>
+  <block>
+    <key>analog_fm_demod_cf</key>
     <param>
-      <key>fft_size</key>
-      <value>512</value>
+      <key>id</key>
+      <value>analog_fm_demod_cf_0</value>
     </param>
     <param>
-      <key>fft_rate</key>
-      <value>15</value>
+      <key>_enabled</key>
+      <value>True</value>
     </param>
     <param>
-      <key>peak_hold</key>
-      <value>False</value>
+      <key>chan_rate</key>
+      <value>samp_rate</value>
     </param>
     <param>
-      <key>average</key>
-      <value>False</value>
+      <key>audio_decim</key>
+      <value>2</value>
     </param>
     <param>
-      <key>avg_alpha</key>
-      <value>0</value>
+      <key>deviation</key>
+      <value>max_dev</value>
     </param>
     <param>
-      <key>win</key>
-      <value>None</value>
+      <key>audio_pass</key>
+      <value>5000</value>
     </param>
     <param>
-      <key>win_size</key>
-      <value></value>
+      <key>audio_stop</key>
+      <value>7000</value>
     </param>
     <param>
-      <key>grid_pos</key>
-      <value>0,0,1,2</value>
+      <key>gain</key>
+      <value>1.0</value>
     </param>
     <param>
-      <key>notebook</key>
-      <value></value>
+      <key>tau</key>
+      <value>75e-6</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(335, 103)</value>
+      <value>(605, 231)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -666,38 +678,38 @@
     </param>
   </block>
   <connection>
-    <source_block_id>low_pass_filter</source_block_id>
-    <sink_block_id>blks2_fm_demod_cf</sink_block_id>
+    <source_block_id>rational_resampler_xxx_0</source_block_id>
+    <sink_block_id>wavfile_sink</sink_block_id>
     <source_key>0</source_key>
     <sink_key>0</sink_key>
   </connection>
   <connection>
-    <source_block_id>blks2_fm_demod_cf</source_block_id>
-    <sink_block_id>audio_sink</sink_block_id>
+    <source_block_id>fcd_source_c_0</source_block_id>
+    <sink_block_id>fftsink</sink_block_id>
     <source_key>0</source_key>
     <sink_key>0</sink_key>
   </connection>
   <connection>
-    <source_block_id>blks2_rational_resampler_xxx_0</source_block_id>
-    <sink_block_id>wavfile_sink</sink_block_id>
+    <source_block_id>fcd_source_c_0</source_block_id>
+    <sink_block_id>low_pass_filter</sink_block_id>
     <source_key>0</source_key>
     <sink_key>0</sink_key>
   </connection>
   <connection>
-    <source_block_id>blks2_fm_demod_cf</source_block_id>
-    <sink_block_id>blks2_rational_resampler_xxx_0</sink_block_id>
+    <source_block_id>low_pass_filter</source_block_id>
+    <sink_block_id>analog_fm_demod_cf_0</sink_block_id>
     <source_key>0</source_key>
     <sink_key>0</sink_key>
   </connection>
   <connection>
-    <source_block_id>fcd_source_c_0</source_block_id>
-    <sink_block_id>low_pass_filter</sink_block_id>
+    <source_block_id>analog_fm_demod_cf_0</source_block_id>
+    <sink_block_id>audio_sink</sink_block_id>
     <source_key>0</source_key>
     <sink_key>0</sink_key>
   </connection>
   <connection>
-    <source_block_id>fcd_source_c_0</source_block_id>
-    <sink_block_id>fftsink</sink_block_id>
+    <source_block_id>analog_fm_demod_cf_0</source_block_id>
+    <sink_block_id>rational_resampler_xxx_0</sink_block_id>
     <source_key>0</source_key>
     <sink_key>0</sink_key>
   </connection>