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

diff --git a/gr-noaa/apps/Makefile.am b/gr-noaa/apps/Makefile.am
index 906638ff14211d367139ed8a7f9d978a2da2f444..5cefe9d21f5a0d9a3c11a7be4ecc845d26fb9f0b 100644 (file)
--- a/gr-noaa/apps/Makefile.am
+++ b/gr-noaa/apps/Makefile.am
@@ -26,10 +26,12 @@ if PYTHON
 dist_bin_SCRIPTS = \
        demod_hrpt_file.py \
        usrp_rx_hrpt.py \
+       usrp_rx_hrpt_nogui.py \
        usrp_rx_lrit.py
 
 EXTRA_DIST = \
        demod_hrpt_file.grc \
        usrp_rx_hrpt.grc \
+       usrp_rx_hrpt_nogui.grc \
        usrp_rx_lrit.grc
 endif

diff --git a/gr-noaa/apps/demod_hrpt_file.grc b/gr-noaa/apps/demod_hrpt_file.grc
index 4a5e87170f88d6d24163b942f1bdaeaa065ec355..16f83f780cb57bb7eba3e515a2ad2c9e0b5dc222 100644 (file)
--- 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>

diff --git a/gr-noaa/apps/demod_hrpt_file.py b/gr-noaa/apps/demod_hrpt_file.py
index a1469e9e0762c4cc58b2ebb6aac3a480c4f9c9f1..309a7920943ea06751e9ce5f8961142ceb4149ee 100755 (executable)
--- a/gr-noaa/apps/demod_hrpt_file.py
+++ b/gr-noaa/apps/demod_hrpt_file.py
@@ -2,7 +2,7 @@
 ##################################################
 # Gnuradio Python Flow Graph
 # Title: USRP HRPT Receiver
-# Generated: Wed Sep 23 11:37:25 2009
+# Generated: Sun Sep 27 09:34:15 2009
 ##################################################
 
 from gnuradio import eng_notation
@@ -15,17 +15,17 @@ import math
 
 class demod_hrpt_file(gr.top_block):
 
-       def __init__(self, decim=16, pll_alpha=0.05, sync_alpha=0.05, filename="usrp.dat", output="frames.dat"):
+       def __init__(self, filename="usrp.dat", output="frames.dat", decim=16, pll_alpha=0.05, sync_alpha=0.05):
                gr.top_block.__init__(self, "USRP HRPT Receiver")
 
                ##################################################
                # Parameters
                ##################################################
+               self.filename = filename
+               self.output = output
                self.decim = decim
                self.pll_alpha = pll_alpha
                self.sync_alpha = sync_alpha
-               self.filename = filename
-               self.output = output
 
                ##################################################
                # Variables
@@ -33,9 +33,10 @@ class demod_hrpt_file(gr.top_block):
                self.sym_rate = sym_rate = 600*1109
                self.sample_rate = sample_rate = 64e6/decim
                self.sps = sps = sample_rate/sym_rate
+               self.hs = hs = int(sps/2.0)
+               self.mf_taps = mf_taps = [-0.5/hs,]*hs+[0.5/hs,]*hs
                self.max_sync_offset = max_sync_offset = 0.01
                self.max_carrier_offset = max_carrier_offset = 2*math.pi*100e3/sample_rate
-               self.hs = hs = int(sps/2.0)
 
                ##################################################
                # Blocks
@@ -46,7 +47,7 @@ class demod_hrpt_file(gr.top_block):
                self.f2c = gr.float_to_complex(1)
                self.file_sink = gr.file_sink(gr.sizeof_short*1, output)
                self.file_source = gr.file_source(gr.sizeof_short*1, filename, False)
-               self.matched_filter = gr.moving_average_cc(hs, 1.0/hs, 4000)
+               self.gr_fir_filter_xxx_0 = gr.fir_filter_ccc(1, (mf_taps))
                self.pll = noaa.hrpt_pll_cf(pll_alpha, pll_alpha**2/4.0, max_carrier_offset)
                self.s2f = gr.short_to_float()
                self.sync = noaa.hrpt_sync_fb(sync_alpha, sync_alpha**2/4.0, sps, max_sync_offset)
@@ -57,13 +58,19 @@ class demod_hrpt_file(gr.top_block):
                self.connect((self.deframer, 0), (self.file_sink, 0))
                self.connect((self.sync, 0), (self.deframer, 0))
                self.connect((self.pll, 0), (self.sync, 0))
-               self.connect((self.matched_filter, 0), (self.pll, 0))
-               self.connect((self.s2f, 0), (self.deinterleave, 0))
                self.connect((self.deinterleave, 1), (self.f2c, 1))
                self.connect((self.deinterleave, 0), (self.f2c, 0))
-               self.connect((self.file_source, 0), (self.s2f, 0))
                self.connect((self.deframer, 0), (self.decoder, 0))
-               self.connect((self.f2c, 0), (self.matched_filter, 0))
+               self.connect((self.gr_fir_filter_xxx_0, 0), (self.pll, 0))
+               self.connect((self.f2c, 0), (self.gr_fir_filter_xxx_0, 0))
+               self.connect((self.s2f, 0), (self.deinterleave, 0))
+               self.connect((self.file_source, 0), (self.s2f, 0))
+
+       def set_filename(self, filename):
+               self.filename = filename
+
+       def set_output(self, output):
+               self.output = output
 
        def set_decim(self, decim):
                self.decim = decim
@@ -79,12 +86,6 @@ class demod_hrpt_file(gr.top_block):
                self.sync.set_alpha(self.sync_alpha)
                self.sync.set_beta(self.sync_alpha**2/4.0)
 
-       def set_filename(self, filename):
-               self.filename = filename
-
-       def set_output(self, output):
-               self.output = output
-
        def set_sym_rate(self, sym_rate):
                self.sym_rate = sym_rate
                self.set_sps(self.sample_rate/self.sym_rate)
@@ -98,6 +99,14 @@ class demod_hrpt_file(gr.top_block):
                self.sps = sps
                self.set_hs(int(self.sps/2.0))
 
+       def set_hs(self, hs):
+               self.hs = hs
+               self.set_mf_taps([-0.5/self.hs,]*self.hs+[0.5/self.hs,]*self.hs)
+
+       def set_mf_taps(self, mf_taps):
+               self.mf_taps = mf_taps
+               self.gr_fir_filter_xxx_0.set_taps((self.mf_taps))
+
        def set_max_sync_offset(self, max_sync_offset):
                self.max_sync_offset = max_sync_offset
                self.sync.set_max_offset(self.max_sync_offset)
@@ -106,24 +115,20 @@ class demod_hrpt_file(gr.top_block):
                self.max_carrier_offset = max_carrier_offset
                self.pll.set_max_offset(self.max_carrier_offset)
 
-       def set_hs(self, hs):
-               self.hs = hs
-               self.matched_filter.set_length_and_scale(self.hs, 1.0/self.hs)
-
 if __name__ == '__main__':
        parser = OptionParser(option_class=eng_option, usage="%prog: [options]")
+       parser.add_option("-F", "--filename", dest="filename", type="string", default="usrp.dat",
+               help="Set Filename [default=%default]")
+       parser.add_option("-o", "--output", dest="output", type="string", default="frames.dat",
+               help="Set Output [default=%default]")
        parser.add_option("-d", "--decim", dest="decim", type="intx", default=16,
                help="Set Decimation [default=%default]")
        parser.add_option("-p", "--pll-alpha", dest="pll_alpha", type="eng_float", default=eng_notation.num_to_str(0.05),
                help="Set pll_alpha [default=%default]")
        parser.add_option("-s", "--sync-alpha", dest="sync_alpha", type="eng_float", default=eng_notation.num_to_str(0.05),
                help="Set sync_alpha [default=%default]")
-       parser.add_option("-F", "--filename", dest="filename", type="string", default="usrp.dat",
-               help="Set Filename [default=%default]")
-       parser.add_option("-o", "--output", dest="output", type="string", default="frames.dat",
-               help="Set Output [default=%default]")
        (options, args) = parser.parse_args()
-       tb = demod_hrpt_file(decim=options.decim, pll_alpha=options.pll_alpha, sync_alpha=options.sync_alpha, filename=options.filename, output=options.output)
+       tb = demod_hrpt_file(filename=options.filename, output=options.output, decim=options.decim, pll_alpha=options.pll_alpha, sync_alpha=options.sync_alpha)
        tb.start()
        raw_input('Press Enter to quit: ')
        tb.stop()

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>

diff --git a/gr-noaa/apps/usrp_rx_hrpt.py b/gr-noaa/apps/usrp_rx_hrpt.py
index 7efbecd3a389bf654ed66639f59e18c1a8865388..9b19d5e4f87069a0582a59efab8f8911648c7ee5 100755 (executable)
--- a/gr-noaa/apps/usrp_rx_hrpt.py
+++ b/gr-noaa/apps/usrp_rx_hrpt.py
@@ -2,7 +2,7 @@
 ##################################################
 # Gnuradio Python Flow Graph
 # Title: USRP HRPT Receiver
-# Generated: Wed Sep 23 11:32:04 2009
+# Generated: Sun Sep 27 10:06:41 2009
 ##################################################
 
 from gnuradio import eng_notation
@@ -10,7 +10,6 @@ from gnuradio import gr
 from gnuradio import noaa
 from gnuradio.eng_option import eng_option
 from gnuradio.gr import firdes
-from gnuradio.wxgui import fftsink2
 from gnuradio.wxgui import forms
 from gnuradio.wxgui import scopesink2
 from grc_gnuradio import usrp as grc_usrp
@@ -62,6 +61,7 @@ class usrp_rx_hrpt(grc_wxgui.top_block_gui):
                try: saved_freq = self._saved_freq_config.getfloat('usrp', 'freq')
                except: saved_freq = 1698e6
                self.saved_freq = saved_freq
+               self.hs = hs = int(sps/2.0)
                self.sync_alpha = sync_alpha = saved_sync_alpha
                self.side_text = side_text = side
                self.pll_alpha = pll_alpha = saved_pll_alpha
@@ -70,21 +70,13 @@ class usrp_rx_hrpt(grc_wxgui.top_block_gui):
                try: output_filename = self._output_filename_config.get('output', 'filename')
                except: output_filename = 'frames.dat'
                self.output_filename = output_filename
+               self.mf_taps = mf_taps = [-0.5/hs,]*hs+[0.5/hs,]*hs
                self.max_sync_offset = max_sync_offset = 0.01
                self.max_carrier_offset = max_carrier_offset = 2*math.pi*100e3/sample_rate
-               self.hs = hs = int(sps/2.0)
                self.gain = gain = saved_gain
                self.freq = freq = saved_freq
                self.decim_text = decim_text = decim
 
-               ##################################################
-               # Notebooks
-               ##################################################
-               self.displays = wx.Notebook(self.GetWin(), style=wx.NB_TOP)
-               self.displays.AddPage(grc_wxgui.Panel(self.displays), "RX")
-               self.displays.AddPage(grc_wxgui.Panel(self.displays), "Demod")
-               self.GridAdd(self.displays, 2, 0, 1, 4)
-
                ##################################################
                # Controls
                ##################################################
@@ -189,11 +181,11 @@ class usrp_rx_hrpt(grc_wxgui.top_block_gui):
                self.decoder = noaa.hrpt_decoder()
                self.deframer = noaa.hrpt_deframer()
                self.frame_sink = gr.file_sink(gr.sizeof_short*1, output_filename)
-               self.matched_filter = gr.moving_average_cc(hs, 1.0/hs, 4000)
+               self.gr_fir_filter_xxx_0 = gr.fir_filter_ccc(1, (mf_taps))
                self.pll = noaa.hrpt_pll_cf(pll_alpha, pll_alpha**2/4.0, max_carrier_offset)
                self.pll_scope = scopesink2.scope_sink_f(
-                       self.displays.GetPage(1).GetWin(),
-                       title="Post-PLL",
+                       self.GetWin(),
+                       title="Demod Waveform",
                        sample_rate=sample_rate,
                        v_scale=0.5,
                        t_scale=20.0/sample_rate,
@@ -201,34 +193,7 @@ class usrp_rx_hrpt(grc_wxgui.top_block_gui):
                        xy_mode=False,
                        num_inputs=1,
                )
-               self.displays.GetPage(1).GridAdd(self.pll_scope.win, 0, 0, 1, 1)
-               self.rx_fft = fftsink2.fft_sink_c(
-                       self.displays.GetPage(0).GetWin(),
-                       baseband_freq=freq,
-                       y_per_div=5,
-                       y_divs=8,
-                       ref_level=-5,
-                       ref_scale=2.0,
-                       sample_rate=sample_rate,
-                       fft_size=1024,
-                       fft_rate=30,
-                       average=True,
-                       avg_alpha=0.1,
-                       title="RX Spectrum",
-                       peak_hold=False,
-               )
-               self.displays.GetPage(0).GridAdd(self.rx_fft.win, 0, 0, 1, 1)
-               self.rx_scope = scopesink2.scope_sink_c(
-                       self.displays.GetPage(0).GetWin(),
-                       title="RX Waveform",
-                       sample_rate=sample_rate,
-                       v_scale=0,
-                       t_scale=20.0/sample_rate,
-                       ac_couple=False,
-                       xy_mode=False,
-                       num_inputs=1,
-               )
-               self.displays.GetPage(0).GridAdd(self.rx_scope.win, 1, 0, 1, 1)
+               self.GridAdd(self.pll_scope.win, 2, 0, 1, 4)
                self.sync = noaa.hrpt_sync_fb(sync_alpha, sync_alpha**2/4.0, sps, max_sync_offset)
                self.usrp_source = grc_usrp.simple_source_c(which=0, side=side, rx_ant="RXA")
                self.usrp_source.set_decim_rate(decim)
@@ -238,16 +203,14 @@ class usrp_rx_hrpt(grc_wxgui.top_block_gui):
                ##################################################
                # Connections
                ##################################################
-               self.connect((self.deframer, 0), (self.frame_sink, 0))
-               self.connect((self.sync, 0), (self.deframer, 0))
-               self.connect((self.pll, 0), (self.sync, 0))
-               self.connect((self.pll, 0), (self.pll_scope, 0))
-               self.connect((self.agc, 0), (self.rx_scope, 0))
-               self.connect((self.agc, 0), (self.rx_fft, 0))
-               self.connect((self.agc, 0), (self.matched_filter, 0))
-               self.connect((self.matched_filter, 0), (self.pll, 0))
-               self.connect((self.deframer, 0), (self.decoder, 0))
+               self.connect((self.gr_fir_filter_xxx_0, 0), (self.pll, 0))
+               self.connect((self.agc, 0), (self.gr_fir_filter_xxx_0, 0))
                self.connect((self.usrp_source, 0), (self.agc, 0))
+               self.connect((self.deframer, 0), (self.decoder, 0))
+               self.connect((self.pll, 0), (self.pll_scope, 0))
+               self.connect((self.pll, 0), (self.sync, 0))
+               self.connect((self.sync, 0), (self.deframer, 0))
+               self.connect((self.deframer, 0), (self.frame_sink, 0))
 
        def set_config_filename(self, config_filename):
                self.config_filename = config_filename
@@ -314,8 +277,6 @@ class usrp_rx_hrpt(grc_wxgui.top_block_gui):
                self.sample_rate = sample_rate
                self.set_max_carrier_offset(2*math.pi*100e3/self.sample_rate)
                self.set_sps(self.sample_rate/self.sym_rate)
-               self.rx_scope.set_sample_rate(self.sample_rate)
-               self.rx_fft.set_sample_rate(self.sample_rate)
                self.pll_scope.set_sample_rate(self.sample_rate)
 
        def set_sps(self, sps):
@@ -348,6 +309,10 @@ class usrp_rx_hrpt(grc_wxgui.top_block_gui):
                self.saved_freq = saved_freq
                self.set_freq(self.saved_freq)
 
+       def set_hs(self, hs):
+               self.hs = hs
+               self.set_mf_taps([-0.5/self.hs,]*self.hs+[0.5/self.hs,]*self.hs)
+
        def set_sync_alpha(self, sync_alpha):
                self.sync_alpha = sync_alpha
                self._sync_alpha_slider.set_value(self.sync_alpha)
@@ -387,6 +352,10 @@ class usrp_rx_hrpt(grc_wxgui.top_block_gui):
                self._output_filename_config.set('output', 'filename', str(self.output_filename))
                self._output_filename_config.write(open(self.config_filename, 'w'))
 
+       def set_mf_taps(self, mf_taps):
+               self.mf_taps = mf_taps
+               self.gr_fir_filter_xxx_0.set_taps((self.mf_taps))
+
        def set_max_sync_offset(self, max_sync_offset):
                self.max_sync_offset = max_sync_offset
                self.sync.set_max_offset(self.max_sync_offset)
@@ -395,10 +364,6 @@ class usrp_rx_hrpt(grc_wxgui.top_block_gui):
                self.max_carrier_offset = max_carrier_offset
                self.pll.set_max_offset(self.max_carrier_offset)
 
-       def set_hs(self, hs):
-               self.hs = hs
-               self.matched_filter.set_length_and_scale(self.hs, 1.0/self.hs)
-
        def set_gain(self, gain):
                self.gain = gain
                self._gain_slider.set_value(self.gain)
@@ -421,7 +386,6 @@ class usrp_rx_hrpt(grc_wxgui.top_block_gui):
                self._saved_freq_config.set('usrp', 'freq', str(self.freq))
                self._saved_freq_config.write(open(self.config_filename, 'w'))
                self.usrp_source.set_frequency(self.freq)
-               self.rx_fft.set_baseband_freq(self.freq)
 
        def set_decim_text(self, decim_text):
                self.decim_text = decim_text
@@ -430,6 +394,8 @@ class usrp_rx_hrpt(grc_wxgui.top_block_gui):
 if __name__ == '__main__':
        parser = OptionParser(option_class=eng_option, usage="%prog: [options]")
        (options, args) = parser.parse_args()
+       if gr.enable_realtime_scheduling() != gr.RT_OK:
+               print "Error: failed to enable realtime scheduling."
        tb = usrp_rx_hrpt()
        tb.Run(True)
 

diff --git a/gr-noaa/apps/usrp_rx_hrpt_nogui.grc b/gr-noaa/apps/usrp_rx_hrpt_nogui.grc
new file mode 100644 (file)
index 0000000..fadc2d1
--- /dev/null
+++ b/gr-noaa/apps/usrp_rx_hrpt_nogui.grc
@@ -0,0 +1,869 @@
+<?xml version='1.0' encoding='ASCII'?>
+<flow_graph>
+  <timestamp>Sun Sep 27 10:13:25 2009</timestamp>
+  <block>
+    <key>options</key>
+    <param>
+      <key>id</key>
+      <value>usrp_rx_hrpt_nogui</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>title</key>
+      <value>USRP HRPT Receiver</value>
+    </param>
+    <param>
+      <key>author</key>
+      <value></value>
+    </param>
+    <param>
+      <key>description</key>
+      <value></value>
+    </param>
+    <param>
+      <key>window_size</key>
+      <value>4096,4096</value>
+    </param>
+    <param>
+      <key>generate_options</key>
+      <value>no_gui</value>
+    </param>
+    <param>
+      <key>category</key>
+      <value>Custom</value>
+    </param>
+    <param>
+      <key>run</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>realtime_scheduling</key>
+      <value>1</value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(10, 10)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>variable</key>
+    <param>
+      <key>id</key>
+      <value>max_carrier_offset</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>value</key>
+      <value>2*math.pi*100e3/sample_rate</value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(575, 19)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>variable</key>
+    <param>
+      <key>id</key>
+      <value>sym_rate</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>value</key>
+      <value>600*1109</value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(301, 19)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>variable</key>
+    <param>
+      <key>id</key>
+      <value>sps</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>value</key>
+      <value>sample_rate/sym_rate</value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(397, 19)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>variable</key>
+    <param>
+      <key>id</key>
+      <value>hs</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>value</key>
+      <value>int(sps/2.0)</value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(499, 19)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>variable</key>
+    <param>
+      <key>id</key>
+      <value>sample_rate</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>value</key>
+      <value>64e6/decim</value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(198, 17)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>variable</key>
+    <param>
+      <key>id</key>
+      <value>max_sync_offset</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>value</key>
+      <value>0.01</value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(705, 19)</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, 167)</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, 112)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>variable_config</key>
+    <param>
+      <key>id</key>
+      <value>output_filename</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>value</key>
+      <value>'frames.dat'</value>
+    </param>
+    <param>
+      <key>type</key>
+      <value>string</value>
+    </param>
+    <param>
+      <key>config_file</key>
+      <value>config_filename</value>
+    </param>
+    <param>
+      <key>section</key>
+      <value>'output'</value>
+    </param>
+    <param>
+      <key>option</key>
+      <value>'filename'</value>
+    </param>
+    <param>
+      <key>writeback</key>
+      <value>output_filename</value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(1146, 122)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>variable_config</key>
+    <param>
+      <key>id</key>
+      <value>sync_alpha</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>value</key>
+      <value>0.05</value>
+    </param>
+    <param>
+      <key>type</key>
+      <value>real</value>
+    </param>
+    <param>
+      <key>config_file</key>
+      <value>config_filename</value>
+    </param>
+    <param>
+      <key>section</key>
+      <value>'demod'</value>
+    </param>
+    <param>
+      <key>option</key>
+      <value>'sync_alpha'</value>
+    </param>
+    <param>
+      <key>writeback</key>
+      <value>sync_alpha</value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(988, 121)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>variable_config</key>
+    <param>
+      <key>id</key>
+      <value>pll_alpha</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>value</key>
+      <value>0.05</value>
+    </param>
+    <param>
+      <key>type</key>
+      <value>real</value>
+    </param>
+    <param>
+      <key>config_file</key>
+      <value>config_filename</value>
+    </param>
+    <param>
+      <key>section</key>
+      <value>'demod'</value>
+    </param>
+    <param>
+      <key>option</key>
+      <value>'pll_alpha'</value>
+    </param>
+    <param>
+      <key>writeback</key>
+      <value>pll_alpha</value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(830, 121)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>variable_config</key>
+    <param>
+      <key>id</key>
+      <value>gain</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>value</key>
+      <value>35</value>
+    </param>
+    <param>
+      <key>type</key>
+      <value>real</value>
+    </param>
+    <param>
+      <key>config_file</key>
+      <value>config_filename</value>
+    </param>
+    <param>
+      <key>section</key>
+      <value>'usrp'</value>
+    </param>
+    <param>
+      <key>option</key>
+      <value>'gain'</value>
+    </param>
+    <param>
+      <key>writeback</key>
+      <value>gain</value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(671, 122)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>variable_config</key>
+    <param>
+      <key>id</key>
+      <value>freq</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>value</key>
+      <value>1698e6</value>
+    </param>
+    <param>
+      <key>type</key>
+      <value>real</value>
+    </param>
+    <param>
+      <key>config_file</key>
+      <value>config_filename</value>
+    </param>
+    <param>
+      <key>section</key>
+      <value>'usrp'</value>
+    </param>
+    <param>
+      <key>option</key>
+      <value>'freq'</value>
+    </param>
+    <param>
+      <key>writeback</key>
+      <value>freq</value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(514, 121)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>variable_config</key>
+    <param>
+      <key>id</key>
+      <value>decim</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>value</key>
+      <value>16</value>
+    </param>
+    <param>
+      <key>type</key>
+      <value>real</value>
+    </param>
+    <param>
+      <key>config_file</key>
+      <value>config_filename</value>
+    </param>
+    <param>
+      <key>section</key>
+      <value>'usrp'</value>
+    </param>
+    <param>
+      <key>option</key>
+      <value>'decim'</value>
+    </param>
+    <param>
+      <key>writeback</key>
+      <value>decim</value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(358, 118)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>variable_config</key>
+    <param>
+      <key>id</key>
+      <value>side</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>value</key>
+      <value>'A'</value>
+    </param>
+    <param>
+      <key>type</key>
+      <value>string</value>
+    </param>
+    <param>
+      <key>config_file</key>
+      <value>config_filename</value>
+    </param>
+    <param>
+      <key>section</key>
+      <value>'usrp'</value>
+    </param>
+    <param>
+      <key>option</key>
+      <value>'side'</value>
+    </param>
+    <param>
+      <key>writeback</key>
+      <value>side</value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(201, 116)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>noaa_hrpt_decoder</key>
+    <param>
+      <key>id</key>
+      <value>decoder</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(1247, 347)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>usrp_simple_source_x</key>
+    <param>
+      <key>id</key>
+      <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>(29, 303)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>variable</key>
+    <param>
+      <key>id</key>
+      <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>(825, 19)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>gr_agc_xx</key>
+    <param>
+      <key>id</key>
+      <value>agc</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>
+    </param>
+    <param>
+      <key>reference</key>
+      <value>1.0</value>
+    </param>
+    <param>
+      <key>gain</key>
+      <value>1.0</value>
+    </param>
+    <param>
+      <key>max_gain</key>
+      <value>1.0</value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(246, 319)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>noaa_hrpt_deframer</key>
+    <param>
+      <key>id</key>
+      <value>deframer</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(1060, 347)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>gr_file_sink</key>
+    <param>
+      <key>id</key>
+      <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>short</value>
+    </param>
+    <param>
+      <key>vlen</key>
+      <value>1</value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(1251, 454)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>noaa_hrpt_sync_fb</key>
+    <param>
+      <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>(833, 319)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>noaa_hrpt_pll_cf</key>
+    <param>
+      <key>id</key>
+      <value>pll</value>
+    </param>
+    <param>
+      <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>(638, 327)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>gr_fir_filter_xxx</key>
+    <param>
+      <key>id</key>
+      <value>gr_fir_filter_xxx_0</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>type</key>
+      <value>ccc</value>
+    </param>
+    <param>
+      <key>decim</key>
+      <value>1</value>
+    </param>
+    <param>
+      <key>taps</key>
+      <value>mf_taps</value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(402, 335)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <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>decoder</sink_block_id>
+    <source_key>0</source_key>
+    <sink_key>0</sink_key>
+  </connection>
+  <connection>
+    <source_block_id>pll</source_block_id>
+    <sink_block_id>sync</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_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>
+    <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>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>
+</flow_graph>

diff --git a/gr-noaa/apps/usrp_rx_hrpt_nogui.py b/gr-noaa/apps/usrp_rx_hrpt_nogui.py
new file mode 100755 (executable)
index 0000000..9917847
--- /dev/null
+++ b/gr-noaa/apps/usrp_rx_hrpt_nogui.py
@@ -0,0 +1,250 @@
+#!/usr/bin/env python
+##################################################
+# Gnuradio Python Flow Graph
+# Title: USRP HRPT Receiver
+# Generated: Sun Sep 27 10:13:25 2009
+##################################################
+
+from gnuradio import eng_notation
+from gnuradio import gr
+from gnuradio import noaa
+from gnuradio.eng_option import eng_option
+from gnuradio.gr import firdes
+from grc_gnuradio import usrp as grc_usrp
+from optparse import OptionParser
+import ConfigParser
+import math
+
+class usrp_rx_hrpt_nogui(gr.top_block):
+
+       def __init__(self):
+               gr.top_block.__init__(self, "USRP HRPT Receiver")
+
+               ##################################################
+               # Variables
+               ##################################################
+               self.config_filename = config_filename = 'usrp_rx_hrpt.cfg'
+               self._decim_config = ConfigParser.ConfigParser()
+               self._decim_config.read(config_filename)
+               try: decim = self._decim_config.getfloat('usrp', 'decim')
+               except: decim = 16
+               self.decim = decim
+               self.sym_rate = sym_rate = 600*1109
+               self.sample_rate = sample_rate = 64e6/decim
+               self.sps = sps = sample_rate/sym_rate
+               self.hs = hs = int(sps/2.0)
+               self._sync_alpha_config = ConfigParser.ConfigParser()
+               self._sync_alpha_config.read(config_filename)
+               try: sync_alpha = self._sync_alpha_config.getfloat('demod', 'sync_alpha')
+               except: sync_alpha = 0.05
+               self.sync_alpha = sync_alpha
+               self._side_config = ConfigParser.ConfigParser()
+               self._side_config.read(config_filename)
+               try: side = self._side_config.get('usrp', 'side')
+               except: side = 'A'
+               self.side = side
+               self._pll_alpha_config = ConfigParser.ConfigParser()
+               self._pll_alpha_config.read(config_filename)
+               try: pll_alpha = self._pll_alpha_config.getfloat('demod', 'pll_alpha')
+               except: pll_alpha = 0.05
+               self.pll_alpha = pll_alpha
+               self._output_filename_config = ConfigParser.ConfigParser()
+               self._output_filename_config.read(config_filename)
+               try: output_filename = self._output_filename_config.get('output', 'filename')
+               except: output_filename = 'frames.dat'
+               self.output_filename = output_filename
+               self.mf_taps = mf_taps = [-0.5/hs,]*hs+[0.5/hs,]*hs
+               self.max_sync_offset = max_sync_offset = 0.01
+               self.max_carrier_offset = max_carrier_offset = 2*math.pi*100e3/sample_rate
+               self._gain_config = ConfigParser.ConfigParser()
+               self._gain_config.read(config_filename)
+               try: gain = self._gain_config.getfloat('usrp', 'gain')
+               except: gain = 35
+               self.gain = gain
+               self._freq_config = ConfigParser.ConfigParser()
+               self._freq_config.read(config_filename)
+               try: freq = self._freq_config.getfloat('usrp', 'freq')
+               except: freq = 1698e6
+               self.freq = freq
+
+               ##################################################
+               # Blocks
+               ##################################################
+               self.agc = gr.agc_cc(1e-6, 1.0, 1.0, 1.0)
+               self.decoder = noaa.hrpt_decoder()
+               self.deframer = noaa.hrpt_deframer()
+               self.frame_sink = gr.file_sink(gr.sizeof_short*1, output_filename)
+               self.gr_fir_filter_xxx_0 = gr.fir_filter_ccc(1, (mf_taps))
+               self.pll = noaa.hrpt_pll_cf(pll_alpha, pll_alpha**2/4.0, max_carrier_offset)
+               self.sync = noaa.hrpt_sync_fb(sync_alpha, sync_alpha**2/4.0, sps, max_sync_offset)
+               self.usrp_source = grc_usrp.simple_source_c(which=0, side=side, rx_ant="RXA")
+               self.usrp_source.set_decim_rate(decim)
+               self.usrp_source.set_frequency(freq, verbose=True)
+               self.usrp_source.set_gain(gain)
+
+               ##################################################
+               # Connections
+               ##################################################
+               self.connect((self.usrp_source, 0), (self.agc, 0))
+               self.connect((self.deframer, 0), (self.decoder, 0))
+               self.connect((self.pll, 0), (self.sync, 0))
+               self.connect((self.sync, 0), (self.deframer, 0))
+               self.connect((self.deframer, 0), (self.frame_sink, 0))
+               self.connect((self.agc, 0), (self.gr_fir_filter_xxx_0, 0))
+               self.connect((self.gr_fir_filter_xxx_0, 0), (self.pll, 0))
+
+       def set_config_filename(self, config_filename):
+               self.config_filename = config_filename
+               self._output_filename_config = ConfigParser.ConfigParser()
+               self._output_filename_config.read(self.config_filename)
+               if not self._output_filename_config.has_section('output'):
+                       self._output_filename_config.add_section('output')
+               self._output_filename_config.set('output', 'filename', str(self.output_filename))
+               self._output_filename_config.write(open(self.config_filename, 'w'))
+               self._sync_alpha_config = ConfigParser.ConfigParser()
+               self._sync_alpha_config.read(self.config_filename)
+               if not self._sync_alpha_config.has_section('demod'):
+                       self._sync_alpha_config.add_section('demod')
+               self._sync_alpha_config.set('demod', 'sync_alpha', str(self.sync_alpha))
+               self._sync_alpha_config.write(open(self.config_filename, 'w'))
+               self._pll_alpha_config = ConfigParser.ConfigParser()
+               self._pll_alpha_config.read(self.config_filename)
+               if not self._pll_alpha_config.has_section('demod'):
+                       self._pll_alpha_config.add_section('demod')
+               self._pll_alpha_config.set('demod', 'pll_alpha', str(self.pll_alpha))
+               self._pll_alpha_config.write(open(self.config_filename, 'w'))
+               self._gain_config = ConfigParser.ConfigParser()
+               self._gain_config.read(self.config_filename)
+               if not self._gain_config.has_section('usrp'):
+                       self._gain_config.add_section('usrp')
+               self._gain_config.set('usrp', 'gain', str(self.gain))
+               self._gain_config.write(open(self.config_filename, 'w'))
+               self._freq_config = ConfigParser.ConfigParser()
+               self._freq_config.read(self.config_filename)
+               if not self._freq_config.has_section('usrp'):
+                       self._freq_config.add_section('usrp')
+               self._freq_config.set('usrp', 'freq', str(self.freq))
+               self._freq_config.write(open(self.config_filename, 'w'))
+               self._decim_config = ConfigParser.ConfigParser()
+               self._decim_config.read(self.config_filename)
+               if not self._decim_config.has_section('usrp'):
+                       self._decim_config.add_section('usrp')
+               self._decim_config.set('usrp', 'decim', str(self.decim))
+               self._decim_config.write(open(self.config_filename, 'w'))
+               self._side_config = ConfigParser.ConfigParser()
+               self._side_config.read(self.config_filename)
+               if not self._side_config.has_section('usrp'):
+                       self._side_config.add_section('usrp')
+               self._side_config.set('usrp', 'side', str(self.side))
+               self._side_config.write(open(self.config_filename, 'w'))
+
+       def set_decim(self, decim):
+               self.decim = decim
+               self.set_sample_rate(64e6/self.decim)
+               self._decim_config = ConfigParser.ConfigParser()
+               self._decim_config.read(self.config_filename)
+               if not self._decim_config.has_section('usrp'):
+                       self._decim_config.add_section('usrp')
+               self._decim_config.set('usrp', 'decim', str(self.decim))
+               self._decim_config.write(open(self.config_filename, 'w'))
+               self.usrp_source.set_decim_rate(self.decim)
+
+       def set_sym_rate(self, sym_rate):
+               self.sym_rate = sym_rate
+               self.set_sps(self.sample_rate/self.sym_rate)
+
+       def set_sample_rate(self, sample_rate):
+               self.sample_rate = sample_rate
+               self.set_max_carrier_offset(2*math.pi*100e3/self.sample_rate)
+               self.set_sps(self.sample_rate/self.sym_rate)
+
+       def set_sps(self, sps):
+               self.sps = sps
+               self.set_hs(int(self.sps/2.0))
+
+       def set_hs(self, hs):
+               self.hs = hs
+               self.set_mf_taps([-0.5/self.hs,]*self.hs+[0.5/self.hs,]*self.hs)
+
+       def set_sync_alpha(self, sync_alpha):
+               self.sync_alpha = sync_alpha
+               self._sync_alpha_config = ConfigParser.ConfigParser()
+               self._sync_alpha_config.read(self.config_filename)
+               if not self._sync_alpha_config.has_section('demod'):
+                       self._sync_alpha_config.add_section('demod')
+               self._sync_alpha_config.set('demod', 'sync_alpha', str(self.sync_alpha))
+               self._sync_alpha_config.write(open(self.config_filename, 'w'))
+               self.sync.set_alpha(self.sync_alpha)
+               self.sync.set_beta(self.sync_alpha**2/4.0)
+
+       def set_side(self, side):
+               self.side = side
+               self._side_config = ConfigParser.ConfigParser()
+               self._side_config.read(self.config_filename)
+               if not self._side_config.has_section('usrp'):
+                       self._side_config.add_section('usrp')
+               self._side_config.set('usrp', 'side', str(self.side))
+               self._side_config.write(open(self.config_filename, 'w'))
+
+       def set_pll_alpha(self, pll_alpha):
+               self.pll_alpha = pll_alpha
+               self._pll_alpha_config = ConfigParser.ConfigParser()
+               self._pll_alpha_config.read(self.config_filename)
+               if not self._pll_alpha_config.has_section('demod'):
+                       self._pll_alpha_config.add_section('demod')
+               self._pll_alpha_config.set('demod', 'pll_alpha', str(self.pll_alpha))
+               self._pll_alpha_config.write(open(self.config_filename, 'w'))
+               self.pll.set_alpha(self.pll_alpha)
+               self.pll.set_beta(self.pll_alpha**2/4.0)
+
+       def set_output_filename(self, output_filename):
+               self.output_filename = output_filename
+               self._output_filename_config = ConfigParser.ConfigParser()
+               self._output_filename_config.read(self.config_filename)
+               if not self._output_filename_config.has_section('output'):
+                       self._output_filename_config.add_section('output')
+               self._output_filename_config.set('output', 'filename', str(self.output_filename))
+               self._output_filename_config.write(open(self.config_filename, 'w'))
+
+       def set_mf_taps(self, mf_taps):
+               self.mf_taps = mf_taps
+               self.gr_fir_filter_xxx_0.set_taps((self.mf_taps))
+
+       def set_max_sync_offset(self, max_sync_offset):
+               self.max_sync_offset = max_sync_offset
+               self.sync.set_max_offset(self.max_sync_offset)
+
+       def set_max_carrier_offset(self, max_carrier_offset):
+               self.max_carrier_offset = max_carrier_offset
+               self.pll.set_max_offset(self.max_carrier_offset)
+
+       def set_gain(self, gain):
+               self.gain = gain
+               self._gain_config = ConfigParser.ConfigParser()
+               self._gain_config.read(self.config_filename)
+               if not self._gain_config.has_section('usrp'):
+                       self._gain_config.add_section('usrp')
+               self._gain_config.set('usrp', 'gain', str(self.gain))
+               self._gain_config.write(open(self.config_filename, 'w'))
+               self.usrp_source.set_gain(self.gain)
+
+       def set_freq(self, freq):
+               self.freq = freq
+               self._freq_config = ConfigParser.ConfigParser()
+               self._freq_config.read(self.config_filename)
+               if not self._freq_config.has_section('usrp'):
+                       self._freq_config.add_section('usrp')
+               self._freq_config.set('usrp', 'freq', str(self.freq))
+               self._freq_config.write(open(self.config_filename, 'w'))
+               self.usrp_source.set_frequency(self.freq)
+
+if __name__ == '__main__':
+       parser = OptionParser(option_class=eng_option, usage="%prog: [options]")
+       (options, args) = parser.parse_args()
+       if gr.enable_realtime_scheduling() != gr.RT_OK:
+               print "Error: failed to enable realtime scheduling."
+       tb = usrp_rx_hrpt_nogui()
+       tb.start()
+       raw_input('Press Enter to quit: ')
+       tb.stop()
+