projects / debian / gnuradio / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
General improvements in HRPT receiver
[debian/gnuradio] / gr-noaa / apps / usrp_rx_hrpt.grc
diff --git a/gr-noaa/apps/usrp_rx_hrpt.grc b/gr-noaa/apps/usrp_rx_hrpt.grc
index 90d86876935b3f78c4cc537d9b0e07522d125420..c999a6bfd343e354bdfdb0422db35cdb7bb6f210 100644 (file)
--- a/gr-noaa/apps/usrp_rx_hrpt.grc
+++ b/gr-noaa/apps/usrp_rx_hrpt.grc
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='ASCII'?>
 <flow_graph>
-  <timestamp>Wed Sep 23 11:32:00 2009</timestamp>
+  <timestamp>Sun Sep 27 10:06:41 2009</timestamp>
   <block>
     <key>options</key>
     <param>
@@ -41,7 +41,7 @@
     </param>
     <param>
       <key>realtime_scheduling</key>
-      <value></value>
+      <value>1</value>
     </param>
     <param>
       <key>_coordinate</key>
@@ -75,87 +75,6 @@
       <value>0</value>
     </param>
   </block>
-  <block>
-    <key>gr_moving_average_xx</key>
-    <param>
-      <key>id</key>
-      <value>matched_filter</value>
-    </param>
-    <param>
-      <key>_enabled</key>
-      <value>True</value>
-    </param>
-    <param>
-      <key>type</key>
-      <value>complex</value>
-    </param>
-    <param>
-      <key>length</key>
-      <value>hs</value>
-    </param>
-    <param>
-      <key>scale</key>
-      <value>1.0/hs</value>
-    </param>
-    <param>
-      <key>max_iter</key>
-      <value>4000</value>
-    </param>
-    <param>
-      <key>_coordinate</key>
-      <value>(441, 723)</value>
-    </param>
-    <param>
-      <key>_rotation</key>
-      <value>0</value>
-    </param>
-  </block>
-  <block>
-    <key>import</key>
-    <param>
-      <key>id</key>
-      <value>import_0</value>
-    </param>
-    <param>
-      <key>_enabled</key>
-      <value>True</value>
-    </param>
-    <param>
-      <key>import</key>
-      <value>import math</value>
-    </param>
-    <param>
-      <key>_coordinate</key>
-      <value>(11, 76)</value>
-    </param>
-    <param>
-      <key>_rotation</key>
-      <value>0</value>
-    </param>
-  </block>
-  <block>
-    <key>variable</key>
-    <param>
-      <key>id</key>
-      <value>config_filename</value>
-    </param>
-    <param>
-      <key>_enabled</key>
-      <value>True</value>
-    </param>
-    <param>
-      <key>value</key>
-      <value>'usrp_rx_hrpt.cfg'</value>
-    </param>
-    <param>
-      <key>_coordinate</key>
-      <value>(12, 129)</value>
-    </param>
-    <param>
-      <key>_rotation</key>
-      <value>0</value>
-    </param>
-  </block>
   <block>
     <key>variable</key>
     <param>
@@ -867,58 +786,76 @@
     </param>
   </block>
   <block>
-    <key>usrp_simple_source_x</key>
+    <key>variable</key>
     <param>
       <key>id</key>
-      <value>usrp_source</value>
+      <value>config_filename</value>
     </param>
     <param>
       <key>_enabled</key>
       <value>True</value>
     </param>
     <param>
-      <key>type</key>
-      <value>complex</value>
+      <key>value</key>
+      <value>'usrp_rx_hrpt.cfg'</value>
     </param>
     <param>
-      <key>format</key>
-      <value></value>
+      <key>_coordinate</key>
+      <value>(12, 160)</value>
     </param>
     <param>
-      <key>which</key>
+      <key>_rotation</key>
       <value>0</value>
     </param>
+  </block>
+  <block>
+    <key>import</key>
     <param>
-      <key>decimation</key>
-      <value>decim</value>
+      <key>id</key>
+      <value>import_0</value>
     </param>
     <param>
-      <key>frequency</key>
-      <value>freq</value>
+      <key>_enabled</key>
+      <value>True</value>
     </param>
     <param>
-      <key>lo_offset</key>
-      <value>float('inf')</value>
+      <key>import</key>
+      <value>import math</value>
     </param>
     <param>
-      <key>gain</key>
-      <value>gain</value>
+      <key>_coordinate</key>
+      <value>(11, 102)</value>
     </param>
     <param>
-      <key>side</key>
-      <value>side</value>
+      <key>_rotation</key>
+      <value>0</value>
     </param>
+  </block>
+  <block>
+    <key>noaa_hrpt_pll_cf</key>
     <param>
-      <key>rx_ant</key>
-      <value>RXA</value>
+      <key>id</key>
+      <value>pll</value>
     </param>
     <param>
-      <key>hb_filters</key>
-      <value></value>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>alpha</key>
+      <value>pll_alpha</value>
+    </param>
+    <param>
+      <key>beta</key>
+      <value>pll_alpha**2/4.0</value>
+    </param>
+    <param>
+      <key>max_offset</key>
+      <value>max_carrier_offset</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(56, 699)</value>
+      <value>(664, 809)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -926,38 +863,34 @@
     </param>
   </block>
   <block>
-    <key>gr_agc_xx</key>
+    <key>noaa_hrpt_sync_fb</key>
     <param>
       <key>id</key>
-      <value>agc</value>
+      <value>sync</value>
     </param>
     <param>
       <key>_enabled</key>
       <value>True</value>
     </param>
     <param>
-      <key>type</key>
-      <value>complex</value>
-    </param>
-    <param>
-      <key>rate</key>
-      <value>1e-6</value>
+      <key>alpha</key>
+      <value>sync_alpha</value>
     </param>
     <param>
-      <key>reference</key>
-      <value>1.0</value>
+      <key>beta</key>
+      <value>sync_alpha**2/4.0</value>
     </param>
     <param>
-      <key>gain</key>
-      <value>1.0</value>
+      <key>sps</key>
+      <value>sps</value>
     </param>
     <param>
-      <key>max_gain</key>
-      <value>1.0</value>
+      <key>max_offset</key>
+      <value>max_sync_offset</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(273, 715)</value>
+      <value>(865, 801)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -965,58 +898,68 @@
     </param>
   </block>
   <block>
-    <key>wxgui_scopesink2</key>
+    <key>gr_file_sink</key>
     <param>
       <key>id</key>
-      <value>rx_scope</value>
+      <value>frame_sink</value>
     </param>
     <param>
       <key>_enabled</key>
       <value>True</value>
     </param>
+    <param>
+      <key>file</key>
+      <value>output_filename</value>
+    </param>
     <param>
       <key>type</key>
-      <value>complex</value>
+      <value>short</value>
     </param>
     <param>
-      <key>title</key>
-      <value>RX Waveform</value>
+      <key>vlen</key>
+      <value>1</value>
     </param>
     <param>
-      <key>samp_rate</key>
-      <value>sample_rate</value>
+      <key>_coordinate</key>
+      <value>(1283, 937)</value>
     </param>
     <param>
-      <key>v_scale</key>
+      <key>_rotation</key>
       <value>0</value>
     </param>
+  </block>
+  <block>
+    <key>noaa_hrpt_deframer</key>
     <param>
-      <key>t_scale</key>
-      <value>20.0/sample_rate</value>
+      <key>id</key>
+      <value>deframer</value>
     </param>
     <param>
-      <key>ac_couple</key>
-      <value>False</value>
+      <key>_enabled</key>
+      <value>True</value>
     </param>
     <param>
-      <key>xy_mode</key>
-      <value>False</value>
+      <key>_coordinate</key>
+      <value>(1091, 829)</value>
     </param>
     <param>
-      <key>num_inputs</key>
-      <value>1</value>
+      <key>_rotation</key>
+      <value>0</value>
     </param>
+  </block>
+  <block>
+    <key>noaa_hrpt_decoder</key>
     <param>
-      <key>grid_pos</key>
-      <value>1, 0, 1, 1</value>
+      <key>id</key>
+      <value>decoder</value>
     </param>
     <param>
-      <key>notebook</key>
-      <value>displays, 0</value>
+      <key>_enabled</key>
+      <value>True</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(439, 829)</value>
+      <value>(1281, 829)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -1024,10 +967,10 @@
     </param>
   </block>
   <block>
-    <key>wxgui_fftsink2</key>
+    <key>wxgui_scopesink2</key>
     <param>
       <key>id</key>
-      <value>rx_fft</value>
+      <value>pll_scope</value>
     </param>
     <param>
       <key>_enabled</key>
@@ -1035,67 +978,86 @@
     </param>
     <param>
       <key>type</key>
-      <value>complex</value>
+      <value>float</value>
     </param>
     <param>
       <key>title</key>
-      <value>RX Spectrum</value>
+      <value>Demod Waveform</value>
     </param>
     <param>
       <key>samp_rate</key>
       <value>sample_rate</value>
     </param>
     <param>
-      <key>baseband_freq</key>
-      <value>freq</value>
+      <key>v_scale</key>
+      <value>0.5</value>
     </param>
     <param>
-      <key>y_per_div</key>
-      <value>5</value>
+      <key>t_scale</key>
+      <value>20.0/sample_rate</value>
     </param>
     <param>
-      <key>y_divs</key>
-      <value>8</value>
+      <key>ac_couple</key>
+      <value>False</value>
     </param>
     <param>
-      <key>ref_level</key>
-      <value>-5</value>
+      <key>xy_mode</key>
+      <value>False</value>
     </param>
     <param>
-      <key>ref_scale</key>
-      <value>2.0</value>
+      <key>num_inputs</key>
+      <value>1</value>
     </param>
     <param>
-      <key>fft_size</key>
-      <value>1024</value>
+      <key>grid_pos</key>
+      <value>2,0,1,4</value>
     </param>
     <param>
-      <key>fft_rate</key>
-      <value>30</value>
+      <key>notebook</key>
+      <value></value>
     </param>
     <param>
-      <key>peak_hold</key>
-      <value>False</value>
+      <key>_coordinate</key>
+      <value>(631, 632)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>180</value>
+    </param>
+  </block>
+  <block>
+    <key>gr_agc_xx</key>
+    <param>
+      <key>id</key>
+      <value>agc</value>
     </param>
     <param>
-      <key>average</key>
+      <key>_enabled</key>
       <value>True</value>
     </param>
     <param>
-      <key>avg_alpha</key>
-      <value>0.1</value>
+      <key>type</key>
+      <value>complex</value>
+    </param>
+    <param>
+      <key>rate</key>
+      <value>1e-6</value>
     </param>
     <param>
-      <key>grid_pos</key>
-      <value>0, 0, 1, 1</value>
+      <key>reference</key>
+      <value>1.0</value>
     </param>
     <param>
-      <key>notebook</key>
-      <value>displays, 0</value>
+      <key>gain</key>
+      <value>1.0</value>
+    </param>
+    <param>
+      <key>max_gain</key>
+      <value>1.0</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(439, 465)</value>
+      <value>(269, 801)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -1103,10 +1065,10 @@
     </param>
   </block>
   <block>
-    <key>wxgui_scopesink2</key>
+    <key>gr_fir_filter_xxx</key>
     <param>
       <key>id</key>
-      <value>pll_scope</value>
+      <value>gr_fir_filter_xxx_0</value>
     </param>
     <param>
       <key>_enabled</key>
@@ -1114,82 +1076,77 @@
     </param>
     <param>
       <key>type</key>
-      <value>float</value>
-    </param>
-    <param>
-      <key>title</key>
-      <value>Post-PLL</value>
+      <value>ccc</value>
     </param>
     <param>
-      <key>samp_rate</key>
-      <value>sample_rate</value>
-    </param>
-    <param>
-      <key>v_scale</key>
-      <value>0.5</value>
+      <key>decim</key>
+      <value>1</value>
     </param>
     <param>
-      <key>t_scale</key>
-      <value>20.0/sample_rate</value>
+      <key>taps</key>
+      <value>mf_taps</value>
     </param>
     <param>
-      <key>ac_couple</key>
-      <value>False</value>
+      <key>_coordinate</key>
+      <value>(418, 817)</value>
     </param>
     <param>
-      <key>xy_mode</key>
-      <value>False</value>
+      <key>_rotation</key>
+      <value>0</value>
     </param>
+  </block>
+  <block>
+    <key>variable</key>
     <param>
-      <key>num_inputs</key>
-      <value>1</value>
+      <key>id</key>
+      <value>mf_taps</value>
     </param>
     <param>
-      <key>grid_pos</key>
-      <value>0, 0, 1, 1</value>
+      <key>_enabled</key>
+      <value>True</value>
     </param>
     <param>
-      <key>notebook</key>
-      <value>displays, 1</value>
+      <key>value</key>
+      <value>[-0.5/hs,]*hs+[0.5/hs,]*hs</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(605, 552)</value>
+      <value>(830, 154)</value>
     </param>
     <param>
       <key>_rotation</key>
-      <value>180</value>
+      <value>0</value>
     </param>
   </block>
   <block>
-    <key>notebook</key>
+    <key>gr_file_source</key>
     <param>
       <key>id</key>
-      <value>displays</value>
+      <value>file_source</value>
     </param>
     <param>
       <key>_enabled</key>
-      <value>True</value>
+      <value>False</value>
     </param>
     <param>
-      <key>style</key>
-      <value>wx.NB_TOP</value>
+      <key>file</key>
+      <value>'usrp.dat'</value>
     </param>
     <param>
-      <key>labels</key>
-      <value>['RX','Demod']</value>
+      <key>type</key>
+      <value>short</value>
     </param>
     <param>
-      <key>grid_pos</key>
-      <value>2, 0, 1, 4</value>
+      <key>repeat</key>
+      <value>False</value>
     </param>
     <param>
-      <key>notebook</key>
-      <value></value>
+      <key>vlen</key>
+      <value>1</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(15, 237)</value>
+      <value>(215, 490)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -1197,30 +1154,30 @@
     </param>
   </block>
   <block>
-    <key>noaa_hrpt_pll_cf</key>
+    <key>gr_deinterleave</key>
     <param>
       <key>id</key>
-      <value>pll</value>
+      <value>gr_deinterleave_0</value>
     </param>
     <param>
       <key>_enabled</key>
-      <value>True</value>
+      <value>False</value>
     </param>
     <param>
-      <key>alpha</key>
-      <value>pll_alpha</value>
+      <key>type</key>
+      <value>float</value>
     </param>
     <param>
-      <key>beta</key>
-      <value>pll_alpha**2/4.0</value>
+      <key>num_streams</key>
+      <value>2</value>
     </param>
     <param>
-      <key>max_offset</key>
-      <value>max_carrier_offset</value>
+      <key>vlen</key>
+      <value>1</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(632, 723)</value>
+      <value>(598, 485)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -1228,34 +1185,41 @@
     </param>
   </block>
   <block>
-    <key>noaa_hrpt_sync_fb</key>
+    <key>gr_float_to_complex</key>
     <param>
       <key>id</key>
-      <value>sync</value>
+      <value>gr_float_to_complex_0</value>
     </param>
     <param>
       <key>_enabled</key>
-      <value>True</value>
+      <value>False</value>
     </param>
     <param>
-      <key>alpha</key>
-      <value>sync_alpha</value>
+      <key>vlen</key>
+      <value>1</value>
     </param>
     <param>
-      <key>beta</key>
-      <value>sync_alpha**2/4.0</value>
+      <key>_coordinate</key>
+      <value>(801, 485)</value>
     </param>
     <param>
-      <key>sps</key>
-      <value>sps</value>
+      <key>_rotation</key>
+      <value>0</value>
     </param>
+  </block>
+  <block>
+    <key>gr_short_to_float</key>
     <param>
-      <key>max_offset</key>
-      <value>max_sync_offset</value>
+      <key>id</key>
+      <value>s2f</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>False</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(840, 715)</value>
+      <value>(393, 502)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -1263,18 +1227,22 @@
     </param>
   </block>
   <block>
-    <key>noaa_hrpt_deframer</key>
+    <key>virtual_sink</key>
     <param>
       <key>id</key>
-      <value>deframer</value>
+      <value>sample_stream</value>
     </param>
     <param>
       <key>_enabled</key>
-      <value>True</value>
+      <value>False</value>
+    </param>
+    <param>
+      <key>stream_id</key>
+      <value>samples</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(1071, 743)</value>
+      <value>(1027, 498)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -1282,18 +1250,58 @@
     </param>
   </block>
   <block>
-    <key>noaa_hrpt_decoder</key>
+    <key>usrp_simple_source_x</key>
     <param>
       <key>id</key>
-      <value>decoder</value>
+      <value>usrp_source</value>
     </param>
     <param>
       <key>_enabled</key>
       <value>True</value>
     </param>
+    <param>
+      <key>type</key>
+      <value>complex</value>
+    </param>
+    <param>
+      <key>format</key>
+      <value></value>
+    </param>
+    <param>
+      <key>which</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>decimation</key>
+      <value>decim</value>
+    </param>
+    <param>
+      <key>frequency</key>
+      <value>freq</value>
+    </param>
+    <param>
+      <key>lo_offset</key>
+      <value>float('inf')</value>
+    </param>
+    <param>
+      <key>gain</key>
+      <value>gain</value>
+    </param>
+    <param>
+      <key>side</key>
+      <value>side</value>
+    </param>
+    <param>
+      <key>rx_ant</key>
+      <value>RXA</value>
+    </param>
+    <param>
+      <key>hb_filters</key>
+      <value></value>
+    </param>
     <param>
       <key>_coordinate</key>
-      <value>(1274, 743)</value>
+      <value>(63, 785)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -1301,45 +1309,55 @@
     </param>
   </block>
   <block>
-    <key>gr_file_sink</key>
+    <key>virtual_source</key>
     <param>
       <key>id</key>
-      <value>frame_sink</value>
+      <value>virtual_source_0</value>
     </param>
     <param>
       <key>_enabled</key>
-      <value>True</value>
-    </param>
-    <param>
-      <key>file</key>
-      <value>output_filename</value>
+      <value>False</value>
     </param>
     <param>
-      <key>type</key>
-      <value>short</value>
-    </param>
-    <param>
-      <key>vlen</key>
-      <value>1</value>
+      <key>stream_id</key>
+      <value>samples</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(1273, 851)</value>
+      <value>(69, 671)</value>
     </param>
     <param>
       <key>_rotation</key>
       <value>0</value>
     </param>
   </block>
+  <connection>
+    <source_block_id>gr_fir_filter_xxx_0</source_block_id>
+    <sink_block_id>pll</sink_block_id>
+    <source_key>0</source_key>
+    <sink_key>0</sink_key>
+  </connection>
+  <connection>
+    <source_block_id>agc</source_block_id>
+    <sink_block_id>gr_fir_filter_xxx_0</sink_block_id>
+    <source_key>0</source_key>
+    <sink_key>0</sink_key>
+  </connection>
+  <connection>
+    <source_block_id>usrp_source</source_block_id>
+    <sink_block_id>agc</sink_block_id>
+    <source_key>0</source_key>
+    <sink_key>0</sink_key>
+  </connection>
   <connection>
     <source_block_id>deframer</source_block_id>
-    <sink_block_id>frame_sink</sink_block_id>
+    <sink_block_id>decoder</sink_block_id>
     <source_key>0</source_key>
     <sink_key>0</sink_key>
   </connection>
   <connection>
-    <source_block_id>sync</source_block_id>
-    <sink_block_id>deframer</sink_block_id>
+    <source_block_id>pll</source_block_id>
+    <sink_block_id>pll_scope</sink_block_id>
     <source_key>0</source_key>
     <sink_key>0</sink_key>
   </connection>
@@ -1350,44 +1368,50 @@
     <sink_key>0</sink_key>
   </connection>
   <connection>
-    <source_block_id>pll</source_block_id>
-    <sink_block_id>pll_scope</sink_block_id>
+    <source_block_id>sync</source_block_id>
+    <sink_block_id>deframer</sink_block_id>
     <source_key>0</source_key>
     <sink_key>0</sink_key>
   </connection>
   <connection>
-    <source_block_id>agc</source_block_id>
-    <sink_block_id>rx_scope</sink_block_id>
+    <source_block_id>deframer</source_block_id>
+    <sink_block_id>frame_sink</sink_block_id>
     <source_key>0</source_key>
     <sink_key>0</sink_key>
   </connection>
   <connection>
-    <source_block_id>agc</source_block_id>
-    <sink_block_id>rx_fft</sink_block_id>
+    <source_block_id>virtual_source_0</source_block_id>
+    <sink_block_id>agc</sink_block_id>
     <source_key>0</source_key>
     <sink_key>0</sink_key>
   </connection>
   <connection>
-    <source_block_id>agc</source_block_id>
-    <sink_block_id>matched_filter</sink_block_id>
+    <source_block_id>file_source</source_block_id>
+    <sink_block_id>s2f</sink_block_id>
     <source_key>0</source_key>
     <sink_key>0</sink_key>
   </connection>
   <connection>
-    <source_block_id>matched_filter</source_block_id>
-    <sink_block_id>pll</sink_block_id>
+    <source_block_id>s2f</source_block_id>
+    <sink_block_id>gr_deinterleave_0</sink_block_id>
     <source_key>0</source_key>
     <sink_key>0</sink_key>
   </connection>
   <connection>
-    <source_block_id>deframer</source_block_id>
-    <sink_block_id>decoder</sink_block_id>
+    <source_block_id>gr_deinterleave_0</source_block_id>
+    <sink_block_id>gr_float_to_complex_0</sink_block_id>
     <source_key>0</source_key>
     <sink_key>0</sink_key>
   </connection>
   <connection>
-    <source_block_id>usrp_source</source_block_id>
-    <sink_block_id>agc</sink_block_id>
+    <source_block_id>gr_deinterleave_0</source_block_id>
+    <sink_block_id>gr_float_to_complex_0</sink_block_id>
+    <source_key>1</source_key>
+    <sink_key>1</sink_key>
+  </connection>
+  <connection>
+    <source_block_id>gr_float_to_complex_0</source_block_id>
+    <sink_block_id>sample_stream</sink_block_id>
     <source_key>0</source_key>
     <sink_key>0</sink_key>
   </connection>
Debian packaging of gnuradio