From ec8c8e0e9d68383279b0fb51a52adf04f11fd88a Mon Sep 17 00:00:00 2001
From: Johnathan Corgan
Date: Sun, 27 Sep 2009 10:15:04 -0700
Subject: General improvements in HRPT receiver

Added usrp_rx_hrpt_nogui script
Simplified usrp_rx_hrpt script for lower CPU usage
Changed matched filtering taps to be whole symbol
---
 gr-noaa/apps/demod_hrpt_file.grc | 331 +++++++++++++++++++++------------------
 1 file changed, 175 insertions(+), 156 deletions(-)

(limited to 'gr-noaa/apps/demod_hrpt_file.grc')

diff --git a/gr-noaa/apps/demod_hrpt_file.grc b/gr-noaa/apps/demod_hrpt_file.grc
index 4a5e87170..16f83f780 100644
--- a/gr-noaa/apps/demod_hrpt_file.grc
+++ b/gr-noaa/apps/demod_hrpt_file.grc
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='ASCII'?>
 <flow_graph>
-  <timestamp>Wed Sep 23 11:37:25 2009</timestamp>
+  <timestamp>Sun Sep 27 09:51:42 2009</timestamp>
   <block>
     <key>options</key>
     <param>
@@ -191,34 +191,22 @@
     </param>
   </block>
   <block>
-    <key>parameter</key>
+    <key>import</key>
     <param>
       <key>id</key>
-      <value>decim</value>
+      <value>import_0</value>
     </param>
     <param>
       <key>_enabled</key>
       <value>True</value>
     </param>
     <param>
-      <key>label</key>
-      <value>Decimation</value>
-    </param>
-    <param>
-      <key>value</key>
-      <value>16</value>
-    </param>
-    <param>
-      <key>type</key>
-      <value>intx</value>
-    </param>
-    <param>
-      <key>short_id</key>
-      <value>d</value>
+      <key>import</key>
+      <value>import math</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(404, 102)</value>
+      <value>(9, 92)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -229,7 +217,7 @@
     <key>parameter</key>
     <param>
       <key>id</key>
-      <value>pll_alpha</value>
+      <value>filename</value>
     </param>
     <param>
       <key>_enabled</key>
@@ -237,23 +225,23 @@
     </param>
     <param>
       <key>label</key>
-      <value></value>
+      <value>Filename</value>
     </param>
     <param>
       <key>value</key>
-      <value>0.05</value>
+      <value>usrp.dat</value>
     </param>
     <param>
       <key>type</key>
-      <value>eng_float</value>
+      <value>string</value>
     </param>
     <param>
       <key>short_id</key>
-      <value>p</value>
+      <value>F</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(516, 102)</value>
+      <value>(200, 101)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -264,7 +252,7 @@
     <key>parameter</key>
     <param>
       <key>id</key>
-      <value>sync_alpha</value>
+      <value>output</value>
     </param>
     <param>
       <key>_enabled</key>
@@ -272,23 +260,23 @@
     </param>
     <param>
       <key>label</key>
-      <value></value>
+      <value>Output</value>
     </param>
     <param>
       <key>value</key>
-      <value>0.05</value>
+      <value>frames.dat</value>
     </param>
     <param>
       <key>type</key>
-      <value>eng_float</value>
+      <value>string</value>
     </param>
     <param>
       <key>short_id</key>
-      <value>s</value>
+      <value>o</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(601, 103)</value>
+      <value>(302, 101)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -296,22 +284,22 @@
     </param>
   </block>
   <block>
-    <key>import</key>
+    <key>gr_float_to_complex</key>
     <param>
       <key>id</key>
-      <value>import_0</value>
+      <value>f2c</value>
     </param>
     <param>
       <key>_enabled</key>
       <value>True</value>
     </param>
     <param>
-      <key>import</key>
-      <value>import math</value>
+      <key>vlen</key>
+      <value>1</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(9, 92)</value>
+      <value>(832, 363)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -319,34 +307,57 @@
     </param>
   </block>
   <block>
-    <key>parameter</key>
+    <key>virtual_sink</key>
     <param>
       <key>id</key>
-      <value>filename</value>
+      <value>samples_sink</value>
     </param>
     <param>
       <key>_enabled</key>
       <value>True</value>
     </param>
     <param>
-      <key>label</key>
-      <value>Filename</value>
+      <key>stream_id</key>
+      <value>samples</value>
     </param>
     <param>
-      <key>value</key>
-      <value>usrp.dat</value>
+      <key>_coordinate</key>
+      <value>(1070, 376)</value>
     </param>
     <param>
-      <key>type</key>
-      <value>string</value>
+      <key>_rotation</key>
+      <value>0</value>
     </param>
+  </block>
+  <block>
+    <key>noaa_hrpt_sync_fb</key>
     <param>
-      <key>short_id</key>
-      <value>F</value>
+      <key>id</key>
+      <value>sync</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>alpha</key>
+      <value>sync_alpha</value>
+    </param>
+    <param>
+      <key>beta</key>
+      <value>sync_alpha**2/4.0</value>
+    </param>
+    <param>
+      <key>sps</key>
+      <value>sps</value>
+    </param>
+    <param>
+      <key>max_offset</key>
+      <value>max_sync_offset</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(200, 101)</value>
+      <value>(813, 455)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -354,10 +365,29 @@
     </param>
   </block>
   <block>
-    <key>gr_file_source</key>
+    <key>noaa_hrpt_deframer</key>
     <param>
       <key>id</key>
-      <value>file_source</value>
+      <value>deframer</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(1037, 483)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>gr_file_sink</key>
+    <param>
+      <key>id</key>
+      <value>file_sink</value>
     </param>
     <param>
       <key>_enabled</key>
@@ -365,23 +395,19 @@
     </param>
     <param>
       <key>file</key>
-      <value>filename</value>
+      <value>output</value>
     </param>
     <param>
       <key>type</key>
       <value>short</value>
     </param>
-    <param>
-      <key>repeat</key>
-      <value>False</value>
-    </param>
     <param>
       <key>vlen</key>
       <value>1</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(102, 368)</value>
+      <value>(1238, 479)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -389,10 +415,10 @@
     </param>
   </block>
   <block>
-    <key>gr_short_to_float</key>
+    <key>noaa_hrpt_decoder</key>
     <param>
       <key>id</key>
-      <value>s2f</value>
+      <value>decoder</value>
     </param>
     <param>
       <key>_enabled</key>
@@ -400,7 +426,7 @@
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(305, 380)</value>
+      <value>(1237, 542)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -431,7 +457,7 @@
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(526, 363)</value>
+      <value>(628, 363)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -439,45 +465,34 @@
     </param>
   </block>
   <block>
-    <key>gr_float_to_complex</key>
+    <key>parameter</key>
     <param>
       <key>id</key>
-      <value>f2c</value>
+      <value>decim</value>
     </param>
     <param>
       <key>_enabled</key>
       <value>True</value>
     </param>
     <param>
-      <key>vlen</key>
-      <value>1</value>
-    </param>
-    <param>
-      <key>_coordinate</key>
-      <value>(730, 363)</value>
-    </param>
-    <param>
-      <key>_rotation</key>
-      <value>0</value>
+      <key>label</key>
+      <value>Decimation</value>
     </param>
-  </block>
-  <block>
-    <key>virtual_sink</key>
     <param>
-      <key>id</key>
-      <value>samples_sink</value>
+      <key>value</key>
+      <value>16</value>
     </param>
     <param>
-      <key>_enabled</key>
-      <value>True</value>
+      <key>type</key>
+      <value>intx</value>
     </param>
     <param>
-      <key>stream_id</key>
-      <value>samples</value>
+      <key>short_id</key>
+      <value>d</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(968, 376)</value>
+      <value>(415, 101)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -485,22 +500,34 @@
     </param>
   </block>
   <block>
-    <key>virtual_source</key>
+    <key>parameter</key>
     <param>
       <key>id</key>
-      <value>samples_source</value>
+      <value>pll_alpha</value>
     </param>
     <param>
       <key>_enabled</key>
       <value>True</value>
     </param>
     <param>
-      <key>stream_id</key>
-      <value>samples</value>
+      <key>label</key>
+      <value></value>
+    </param>
+    <param>
+      <key>value</key>
+      <value>0.05</value>
+    </param>
+    <param>
+      <key>type</key>
+      <value>eng_float</value>
+    </param>
+    <param>
+      <key>short_id</key>
+      <value>p</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(104, 479)</value>
+      <value>(527, 101)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -508,34 +535,34 @@
     </param>
   </block>
   <block>
-    <key>gr_moving_average_xx</key>
+    <key>parameter</key>
     <param>
       <key>id</key>
-      <value>matched_filter</value>
+      <value>sync_alpha</value>
     </param>
     <param>
       <key>_enabled</key>
       <value>True</value>
     </param>
     <param>
-      <key>type</key>
-      <value>complex</value>
+      <key>label</key>
+      <value></value>
     </param>
     <param>
-      <key>length</key>
-      <value>hs</value>
+      <key>value</key>
+      <value>0.05</value>
     </param>
     <param>
-      <key>scale</key>
-      <value>1.0/hs</value>
+      <key>type</key>
+      <value>eng_float</value>
     </param>
     <param>
-      <key>max_iter</key>
-      <value>4000</value>
+      <key>short_id</key>
+      <value>s</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(302, 463)</value>
+      <value>(615, 99)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -566,7 +593,7 @@
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(504, 463)</value>
+      <value>(606, 463)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -574,34 +601,22 @@
     </param>
   </block>
   <block>
-    <key>noaa_hrpt_sync_fb</key>
+    <key>virtual_source</key>
     <param>
       <key>id</key>
-      <value>sync</value>
+      <value>samples_source</value>
     </param>
     <param>
       <key>_enabled</key>
       <value>True</value>
     </param>
     <param>
-      <key>alpha</key>
-      <value>sync_alpha</value>
-    </param>
-    <param>
-      <key>beta</key>
-      <value>sync_alpha**2/4.0</value>
-    </param>
-    <param>
-      <key>sps</key>
-      <value>sps</value>
-    </param>
-    <param>
-      <key>max_offset</key>
-      <value>max_sync_offset</value>
+      <key>stream_id</key>
+      <value>samples</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(711, 455)</value>
+      <value>(164, 479)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -609,10 +624,10 @@
     </param>
   </block>
   <block>
-    <key>noaa_hrpt_deframer</key>
+    <key>gr_short_to_float</key>
     <param>
       <key>id</key>
-      <value>deframer</value>
+      <value>s2f</value>
     </param>
     <param>
       <key>_enabled</key>
@@ -620,7 +635,7 @@
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(935, 483)</value>
+      <value>(365, 380)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -628,10 +643,10 @@
     </param>
   </block>
   <block>
-    <key>gr_file_sink</key>
+    <key>gr_file_source</key>
     <param>
       <key>id</key>
-      <value>file_sink</value>
+      <value>file_source</value>
     </param>
     <param>
       <key>_enabled</key>
@@ -639,19 +654,23 @@
     </param>
     <param>
       <key>file</key>
-      <value>output</value>
+      <value>filename</value>
     </param>
     <param>
       <key>type</key>
       <value>short</value>
     </param>
+    <param>
+      <key>repeat</key>
+      <value>False</value>
+    </param>
     <param>
       <key>vlen</key>
       <value>1</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(1136, 479)</value>
+      <value>(162, 368)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -659,18 +678,22 @@
     </param>
   </block>
   <block>
-    <key>noaa_hrpt_decoder</key>
+    <key>variable</key>
     <param>
       <key>id</key>
-      <value>decoder</value>
+      <value>mf_taps</value>
     </param>
     <param>
       <key>_enabled</key>
       <value>True</value>
     </param>
+    <param>
+      <key>value</key>
+      <value>[-0.5/hs,]*hs+[0.5/hs,]*hs</value>
+    </param>
     <param>
       <key>_coordinate</key>
-      <value>(1135, 542)</value>
+      <value>(829, 21)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -678,34 +701,30 @@
     </param>
   </block>
   <block>
-    <key>parameter</key>
+    <key>gr_fir_filter_xxx</key>
     <param>
       <key>id</key>
-      <value>output</value>
+      <value>gr_fir_filter_xxx_0</value>
     </param>
     <param>
       <key>_enabled</key>
       <value>True</value>
     </param>
     <param>
-      <key>label</key>
-      <value>Output</value>
-    </param>
-    <param>
-      <key>value</key>
-      <value>frames.dat</value>
+      <key>type</key>
+      <value>ccc</value>
     </param>
     <param>
-      <key>type</key>
-      <value>string</value>
+      <key>decim</key>
+      <value>1</value>
     </param>
     <param>
-      <key>short_id</key>
-      <value>o</value>
+      <key>taps</key>
+      <value>mf_taps</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(302, 101)</value>
+      <value>(359, 471)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -730,18 +749,6 @@
     <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_key>0</source_key>
-    <sink_key>0</sink_key>
-  </connection>
-  <connection>
-    <source_block_id>s2f</source_block_id>
-    <sink_block_id>deinterleave</sink_block_id>
-    <source_key>0</source_key>
-    <sink_key>0</sink_key>
-  </connection>
   <connection>
     <source_block_id>deinterleave</source_block_id>
     <sink_block_id>f2c</sink_block_id>
@@ -754,12 +761,6 @@
     <source_key>0</source_key>
     <sink_key>0</sink_key>
   </connection>
-  <connection>
-    <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>deframer</source_block_id>
     <sink_block_id>decoder</sink_block_id>
@@ -772,9 +773,27 @@
     <source_key>0</source_key>
     <sink_key>0</sink_key>
   </connection>
+  <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>samples_source</source_block_id>
-    <sink_block_id>matched_filter</sink_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>s2f</source_block_id>
+    <sink_block_id>deinterleave</sink_block_id>
+    <source_key>0</source_key>
+    <sink_key>0</sink_key>
+  </connection>
+  <connection>
+    <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>
-- 
cgit