Split HRPT script into live receive and post-processing

Cleanup debug info
Created 'demod_hrpt_file.py'
Updated 'usrp_rx_hrpt.py' with GUI, USRP, and config file

diff --git a/gr-noaa/apps/.gitignore b/gr-noaa/apps/.gitignore
new file mode 100644 (file)
index 0000000..773a6df
--- /dev/null
+++ b/gr-noaa/apps/.gitignore
@@ -0,0 +1 @@
+*.dat

diff --git a/gr-noaa/apps/Makefile.am b/gr-noaa/apps/Makefile.am
index 23b8240c13344fb57afe48587b3afceae4270234..906638ff14211d367139ed8a7f9d978a2da2f444 100644 (file)
--- a/gr-noaa/apps/Makefile.am
+++ b/gr-noaa/apps/Makefile.am
@@ -24,10 +24,12 @@ include $(top_srcdir)/Makefile.common
 if PYTHON
 
 dist_bin_SCRIPTS = \
+       demod_hrpt_file.py \
        usrp_rx_hrpt.py \
        usrp_rx_lrit.py
 
 EXTRA_DIST = \
+       demod_hrpt_file.grc \
        usrp_rx_hrpt.grc \
        usrp_rx_lrit.grc
 endif

diff --git a/gr-noaa/apps/demod_hrpt_file.grc b/gr-noaa/apps/demod_hrpt_file.grc
new file mode 100644 (file)
index 0000000..4a5e871
--- /dev/null
+++ b/gr-noaa/apps/demod_hrpt_file.grc
@@ -0,0 +1,781 @@
+<?xml version='1.0' encoding='ASCII'?>
+<flow_graph>
+  <timestamp>Wed Sep 23 11:37:25 2009</timestamp>
+  <block>
+    <key>options</key>
+    <param>
+      <key>id</key>
+      <value>demod_hrpt_file</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></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_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>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>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>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>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>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>parameter</key>
+    <param>
+      <key>id</key>
+      <value>decim</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>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(404, 102)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>parameter</key>
+    <param>
+      <key>id</key>
+      <value>pll_alpha</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <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>(516, 102)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>parameter</key>
+    <param>
+      <key>id</key>
+      <value>sync_alpha</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <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>s</value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(601, 103)</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>(9, 92)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>parameter</key>
+    <param>
+      <key>id</key>
+      <value>filename</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>label</key>
+      <value>Filename</value>
+    </param>
+    <param>
+      <key>value</key>
+      <value>usrp.dat</value>
+    </param>
+    <param>
+      <key>type</key>
+      <value>string</value>
+    </param>
+    <param>
+      <key>short_id</key>
+      <value>F</value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(200, 101)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>gr_file_source</key>
+    <param>
+      <key>id</key>
+      <value>file_source</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>file</key>
+      <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>(102, 368)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>gr_short_to_float</key>
+    <param>
+      <key>id</key>
+      <value>s2f</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(305, 380)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>gr_deinterleave</key>
+    <param>
+      <key>id</key>
+      <value>deinterleave</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>type</key>
+      <value>float</value>
+    </param>
+    <param>
+      <key>num_streams</key>
+      <value>2</value>
+    </param>
+    <param>
+      <key>vlen</key>
+      <value>1</value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(526, 363)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>gr_float_to_complex</key>
+    <param>
+      <key>id</key>
+      <value>f2c</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>
+    </param>
+  </block>
+  <block>
+    <key>virtual_sink</key>
+    <param>
+      <key>id</key>
+      <value>samples_sink</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>stream_id</key>
+      <value>samples</value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(968, 376)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>virtual_source</key>
+    <param>
+      <key>id</key>
+      <value>samples_source</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>stream_id</key>
+      <value>samples</value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(104, 479)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <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>(302, 463)</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>(504, 463)</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>(711, 455)</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>(935, 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>
+      <value>True</value>
+    </param>
+    <param>
+      <key>file</key>
+      <value>output</value>
+    </param>
+    <param>
+      <key>type</key>
+      <value>short</value>
+    </param>
+    <param>
+      <key>vlen</key>
+      <value>1</value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(1136, 479)</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>(1135, 542)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>parameter</key>
+    <param>
+      <key>id</key>
+      <value>output</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>
+    </param>
+    <param>
+      <key>type</key>
+      <value>string</value>
+    </param>
+    <param>
+      <key>short_id</key>
+      <value>o</value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(302, 101)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <connection>
+    <source_block_id>deframer</source_block_id>
+    <sink_block_id>file_sink</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>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>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>
+    <source_key>1</source_key>
+    <sink_key>1</sink_key>
+  </connection>
+  <connection>
+    <source_block_id>deinterleave</source_block_id>
+    <sink_block_id>f2c</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>
+  <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>f2c</source_block_id>
+    <sink_block_id>samples_sink</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>
+    <source_key>0</source_key>
+    <sink_key>0</sink_key>
+  </connection>
+</flow_graph>

diff --git a/gr-noaa/apps/demod_hrpt_file.py b/gr-noaa/apps/demod_hrpt_file.py
new file mode 100755 (executable)
index 0000000..a1469e9
--- /dev/null
+++ b/gr-noaa/apps/demod_hrpt_file.py
@@ -0,0 +1,130 @@
+#!/usr/bin/env python
+##################################################
+# Gnuradio Python Flow Graph
+# Title: USRP HRPT Receiver
+# Generated: Wed Sep 23 11:37: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 optparse import OptionParser
+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"):
+               gr.top_block.__init__(self, "USRP HRPT Receiver")
+
+               ##################################################
+               # Parameters
+               ##################################################
+               self.decim = decim
+               self.pll_alpha = pll_alpha
+               self.sync_alpha = sync_alpha
+               self.filename = filename
+               self.output = output
+
+               ##################################################
+               # Variables
+               ##################################################
+               self.sym_rate = sym_rate = 600*1109
+               self.sample_rate = sample_rate = 64e6/decim
+               self.sps = sps = sample_rate/sym_rate
+               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
+               ##################################################
+               self.decoder = noaa.hrpt_decoder()
+               self.deframer = noaa.hrpt_deframer()
+               self.deinterleave = gr.deinterleave(gr.sizeof_float*1)
+               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.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)
+
+               ##################################################
+               # Connections
+               ##################################################
+               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))
+
+       def set_decim(self, decim):
+               self.decim = decim
+               self.set_sample_rate(64e6/self.decim)
+
+       def set_pll_alpha(self, pll_alpha):
+               self.pll_alpha = pll_alpha
+               self.pll.set_alpha(self.pll_alpha)
+               self.pll.set_beta(self.pll_alpha**2/4.0)
+
+       def set_sync_alpha(self, sync_alpha):
+               self.sync_alpha = sync_alpha
+               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)
+
+       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_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_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("-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.start()
+       raw_input('Press Enter to quit: ')
+       tb.stop()
+

diff --git a/gr-noaa/apps/usrp_rx_hrpt.cfg b/gr-noaa/apps/usrp_rx_hrpt.cfg
new file mode 100644 (file)
index 0000000..69f3c0b
--- /dev/null
+++ b/gr-noaa/apps/usrp_rx_hrpt.cfg
@@ -0,0 +1,13 @@
+[output]
+filename = frames.dat
+
+[demod]
+pll_alpha = 0.05
+sync_alpha = 0.05
+
+[usrp]
+freq = 1698000000.0
+decim = 16
+side = A
+gain = 35.0
+

diff --git a/gr-noaa/apps/usrp_rx_hrpt.grc b/gr-noaa/apps/usrp_rx_hrpt.grc
index f629ae8b7f5477a93917471d8f7e46f84c889f13..90d86876935b3f78c4cc537d9b0e07522d125420 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>Sun Sep 20 19:30:16 2009</timestamp>
+  <timestamp>Wed Sep 23 11:32:00 2009</timestamp>
   <block>
     <key>options</key>
     <param>
@@ -53,22 +53,22 @@
     </param>
   </block>
   <block>
-    <key>import</key>
+    <key>variable</key>
     <param>
       <key>id</key>
-      <value>import_0</value>
+      <value>max_carrier_offset</value>
     </param>
     <param>
       <key>_enabled</key>
       <value>True</value>
     </param>
     <param>
-      <key>import</key>
-      <value>import math</value>
+      <key>value</key>
+      <value>2*math.pi*100e3/sample_rate</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(9, 202)</value>
+      <value>(575, 19)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -76,34 +76,34 @@
     </param>
   </block>
   <block>
-    <key>notebook</key>
+    <key>gr_moving_average_xx</key>
     <param>
       <key>id</key>
-      <value>displays</value>
+      <value>matched_filter</value>
     </param>
     <param>
       <key>_enabled</key>
       <value>True</value>
     </param>
     <param>
-      <key>style</key>
-      <value>wx.NB_TOP</value>
+      <key>type</key>
+      <value>complex</value>
     </param>
     <param>
-      <key>labels</key>
-      <value>['RX','PLL/SYNC']</value>
+      <key>length</key>
+      <value>hs</value>
     </param>
     <param>
-      <key>grid_pos</key>
-      <value>1, 0, 1, 2</value>
+      <key>scale</key>
+      <value>1.0/hs</value>
     </param>
     <param>
-      <key>notebook</key>
-      <value></value>
+      <key>max_iter</key>
+      <value>4000</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(9, 99)</value>
+      <value>(441, 723)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -111,93 +111,114 @@
     </param>
   </block>
   <block>
-    <key>wxgui_scopesink2</key>
+    <key>import</key>
     <param>
       <key>id</key>
-      <value>wxgui_scopesink2_0_0</value>
+      <value>import_0</value>
     </param>
     <param>
       <key>_enabled</key>
       <value>True</value>
     </param>
     <param>
-      <key>type</key>
-      <value>float</value>
+      <key>import</key>
+      <value>import math</value>
     </param>
     <param>
-      <key>title</key>
-      <value>Post-PLL</value>
+      <key>_coordinate</key>
+      <value>(11, 76)</value>
     </param>
     <param>
-      <key>samp_rate</key>
-      <value>sample_rate</value>
+      <key>_rotation</key>
+      <value>0</value>
     </param>
+  </block>
+  <block>
+    <key>variable</key>
     <param>
-      <key>v_scale</key>
-      <value>0.5</value>
+      <key>id</key>
+      <value>config_filename</value>
     </param>
     <param>
-      <key>t_scale</key>
-      <value>20.0/sample_rate</value>
+      <key>_enabled</key>
+      <value>True</value>
     </param>
     <param>
-      <key>ac_couple</key>
-      <value>False</value>
+      <key>value</key>
+      <value>'usrp_rx_hrpt.cfg'</value>
     </param>
     <param>
-      <key>xy_mode</key>
-      <value>False</value>
+      <key>_coordinate</key>
+      <value>(12, 129)</value>
     </param>
     <param>
-      <key>num_inputs</key>
-      <value>1</value>
+      <key>_rotation</key>
+      <value>0</value>
     </param>
+  </block>
+  <block>
+    <key>variable</key>
     <param>
-      <key>grid_pos</key>
-      <value>0, 0, 1, 1</value>
+      <key>id</key>
+      <value>sym_rate</value>
     </param>
     <param>
-      <key>notebook</key>
-      <value>displays, 1</value>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>value</key>
+      <value>600*1109</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(597, 618)</value>
+      <value>(301, 19)</value>
     </param>
     <param>
       <key>_rotation</key>
-      <value>180</value>
+      <value>0</value>
     </param>
   </block>
   <block>
-    <key>gr_moving_average_xx</key>
+    <key>variable</key>
     <param>
       <key>id</key>
-      <value>matched_filter</value>
+      <value>sps</value>
     </param>
     <param>
       <key>_enabled</key>
       <value>True</value>
     </param>
     <param>
-      <key>type</key>
-      <value>complex</value>
+      <key>value</key>
+      <value>sample_rate/sym_rate</value>
     </param>
     <param>
-      <key>length</key>
+      <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>scale</key>
-      <value>1.0/hs</value>
+      <key>_enabled</key>
+      <value>True</value>
     </param>
     <param>
-      <key>max_iter</key>
-      <value>4000</value>
+      <key>value</key>
+      <value>int(sps/2.0)</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(429, 789)</value>
+      <value>(499, 19)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -205,58 +226,77 @@
     </param>
   </block>
   <block>
-    <key>wxgui_scopesink2</key>
+    <key>variable</key>
     <param>
       <key>id</key>
-      <value>wxgui_scopesink2_0</value>
+      <value>sample_rate</value>
     </param>
     <param>
       <key>_enabled</key>
       <value>True</value>
     </param>
     <param>
-      <key>type</key>
-      <value>complex</value>
+      <key>value</key>
+      <value>64e6/decim</value>
     </param>
     <param>
-      <key>title</key>
-      <value>RX Waveform</value>
+      <key>_coordinate</key>
+      <value>(198, 17)</value>
     </param>
     <param>
-      <key>samp_rate</key>
-      <value>sample_rate</value>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>variable_slider</key>
+    <param>
+      <key>id</key>
+      <value>gain</value>
     </param>
     <param>
-      <key>v_scale</key>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>label</key>
+      <value>RX Gain</value>
+    </param>
+    <param>
+      <key>value</key>
+      <value>saved_gain</value>
+    </param>
+    <param>
+      <key>min</key>
       <value>0</value>
     </param>
     <param>
-      <key>t_scale</key>
-      <value>20.0/sample_rate</value>
+      <key>max</key>
+      <value>100</value>
     </param>
     <param>
-      <key>ac_couple</key>
-      <value>False</value>
+      <key>num_steps</key>
+      <value>100</value>
     </param>
     <param>
-      <key>xy_mode</key>
-      <value>False</value>
+      <key>style</key>
+      <value>wx.SL_HORIZONTAL</value>
     </param>
     <param>
-      <key>num_inputs</key>
-      <value>1</value>
+      <key>converver</key>
+      <value>float_converter</value>
     </param>
     <param>
       <key>grid_pos</key>
-      <value>1, 0, 1, 1</value>
+      <value>0, 1, 1, 1</value>
     </param>
     <param>
       <key>notebook</key>
-      <value>displays, 0</value>
+      <value></value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(430, 895)</value>
+      <value>(340, 106)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -264,78 +304,97 @@
     </param>
   </block>
   <block>
-    <key>wxgui_fftsink2</key>
+    <key>variable_text_box</key>
     <param>
       <key>id</key>
-      <value>rx_fftsink</value>
+      <value>freq</value>
     </param>
     <param>
       <key>_enabled</key>
       <value>True</value>
     </param>
     <param>
-      <key>type</key>
-      <value>complex</value>
+      <key>label</key>
+      <value>Frequency</value>
     </param>
     <param>
-      <key>title</key>
-      <value>RX Spectrum</value>
+      <key>value</key>
+      <value>saved_freq</value>
     </param>
     <param>
-      <key>samp_rate</key>
-      <value>sample_rate</value>
+      <key>converver</key>
+      <value>float_converter</value>
     </param>
     <param>
-      <key>baseband_freq</key>
-      <value>1698e6</value>
+      <key>formatter</key>
+      <value>None</value>
     </param>
     <param>
-      <key>y_per_div</key>
-      <value>5</value>
+      <key>grid_pos</key>
+      <value>0, 0, 1, 1</value>
     </param>
     <param>
-      <key>y_divs</key>
-      <value>8</value>
+      <key>notebook</key>
+      <value></value>
     </param>
     <param>
-      <key>ref_level</key>
-      <value>-5</value>
+      <key>_coordinate</key>
+      <value>(199, 106)</value>
     </param>
     <param>
-      <key>ref_scale</key>
-      <value>2.0</value>
+      <key>_rotation</key>
+      <value>0</value>
     </param>
+  </block>
+  <block>
+    <key>variable_slider</key>
     <param>
-      <key>fft_size</key>
-      <value>1024</value>
+      <key>id</key>
+      <value>pll_alpha</value>
     </param>
     <param>
-      <key>fft_rate</key>
-      <value>30</value>
+      <key>_enabled</key>
+      <value>True</value>
     </param>
     <param>
-      <key>peak_hold</key>
-      <value>False</value>
+      <key>label</key>
+      <value>PLL Alpha</value>
     </param>
     <param>
-      <key>average</key>
-      <value>True</value>
+      <key>value</key>
+      <value>saved_pll_alpha</value>
     </param>
     <param>
-      <key>avg_alpha</key>
-      <value>0.1</value>
+      <key>min</key>
+      <value>0.0</value>
+    </param>
+    <param>
+      <key>max</key>
+      <value>0.5</value>
+    </param>
+    <param>
+      <key>num_steps</key>
+      <value>100</value>
+    </param>
+    <param>
+      <key>style</key>
+      <value>wx.SL_HORIZONTAL</value>
+    </param>
+    <param>
+      <key>converver</key>
+      <value>float_converter</value>
     </param>
     <param>
       <key>grid_pos</key>
-      <value>0, 0, 1, 1</value>
+      <value>0, 2, 1, 1</value>
     </param>
     <param>
       <key>notebook</key>
-      <value>displays, 0</value>
+      <value></value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(430, 531)</value>
+      <value>(479, 106)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -343,38 +402,54 @@
     </param>
   </block>
   <block>
-    <key>gr_agc_xx</key>
+    <key>variable_slider</key>
     <param>
       <key>id</key>
-      <value>agr</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>SYNC Alpha</value>
     </param>
     <param>
-      <key>rate</key>
-      <value>1e-6</value>
+      <key>value</key>
+      <value>saved_sync_alpha</value>
     </param>
     <param>
-      <key>reference</key>
-      <value>1.0</value>
+      <key>min</key>
+      <value>0.0</value>
     </param>
     <param>
-      <key>gain</key>
-      <value>1.0</value>
+      <key>max</key>
+      <value>0.5</value>
     </param>
     <param>
-      <key>max_gain</key>
-      <value>1.0</value>
+      <key>num_steps</key>
+      <value>100</value>
+    </param>
+    <param>
+      <key>style</key>
+      <value>wx.SL_HORIZONTAL</value>
+    </param>
+    <param>
+      <key>converver</key>
+      <value>float_converter</value>
+    </param>
+    <param>
+      <key>grid_pos</key>
+      <value>0, 3, 1, 1</value>
+    </param>
+    <param>
+      <key>notebook</key>
+      <value></value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(258, 781)</value>
+      <value>(618, 106)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -382,22 +457,42 @@
     </param>
   </block>
   <block>
-    <key>virtual_source</key>
+    <key>variable_static_text</key>
     <param>
       <key>id</key>
-      <value>virtual_source_0</value>
+      <value>side_text</value>
     </param>
     <param>
       <key>_enabled</key>
       <value>True</value>
     </param>
     <param>
-      <key>stream_id</key>
-      <value>samples</value>
+      <key>label</key>
+      <value>USRP Side</value>
+    </param>
+    <param>
+      <key>value</key>
+      <value>side</value>
+    </param>
+    <param>
+      <key>converver</key>
+      <value>str_converter</value>
+    </param>
+    <param>
+      <key>formatter</key>
+      <value>None</value>
+    </param>
+    <param>
+      <key>grid_pos</key>
+      <value>1, 0, 1, 1</value>
+    </param>
+    <param>
+      <key>notebook</key>
+      <value></value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(62, 805)</value>
+      <value>(828, 20)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -405,34 +500,42 @@
     </param>
   </block>
   <block>
-    <key>parameter</key>
+    <key>variable_config</key>
     <param>
       <key>id</key>
-      <value>filename</value>
+      <value>side</value>
     </param>
     <param>
       <key>_enabled</key>
       <value>True</value>
     </param>
-    <param>
-      <key>label</key>
-      <value>Filename</value>
-    </param>
     <param>
       <key>value</key>
-      <value>""</value>
+      <value>'A'</value>
     </param>
     <param>
       <key>type</key>
       <value>string</value>
     </param>
     <param>
-      <key>short_id</key>
-      <value>f</value>
+      <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>(200, 101)</value>
+      <value>(194, 253)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -440,7 +543,7 @@
     </param>
   </block>
   <block>
-    <key>parameter</key>
+    <key>variable_config</key>
     <param>
       <key>id</key>
       <value>decim</value>
@@ -449,25 +552,33 @@
       <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>
+      <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>short_id</key>
-      <value>d</value>
+      <key>writeback</key>
+      <value>decim</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(304, 101)</value>
+      <value>(351, 255)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -475,10 +586,10 @@
     </param>
   </block>
   <block>
-    <key>variable</key>
+    <key>variable_config</key>
     <param>
       <key>id</key>
-      <value>max_sync_offset</value>
+      <value>saved_freq</value>
     </param>
     <param>
       <key>_enabled</key>
@@ -486,34 +597,31 @@
     </param>
     <param>
       <key>value</key>
-      <value>0.01</value>
+      <value>1698e6</value>
     </param>
     <param>
-      <key>_coordinate</key>
-      <value>(705, 19)</value>
+      <key>type</key>
+      <value>real</value>
     </param>
     <param>
-      <key>_rotation</key>
-      <value>0</value>
+      <key>config_file</key>
+      <value>config_filename</value>
     </param>
-  </block>
-  <block>
-    <key>variable</key>
     <param>
-      <key>id</key>
-      <value>max_carrier_offset</value>
+      <key>section</key>
+      <value>'usrp'</value>
     </param>
     <param>
-      <key>_enabled</key>
-      <value>True</value>
+      <key>option</key>
+      <value>'freq'</value>
     </param>
     <param>
-      <key>value</key>
-      <value>2*math.pi*100e3/sample_rate</value>
+      <key>writeback</key>
+      <value>freq</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(575, 19)</value>
+      <value>(507, 258)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -521,10 +629,10 @@
     </param>
   </block>
   <block>
-    <key>variable</key>
+    <key>variable_config</key>
     <param>
       <key>id</key>
-      <value>hs</value>
+      <value>saved_gain</value>
     </param>
     <param>
       <key>_enabled</key>
@@ -532,11 +640,31 @@
     </param>
     <param>
       <key>value</key>
-      <value>int(sps/2.0)</value>
+      <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>(499, 19)</value>
+      <value>(664, 259)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -544,10 +672,10 @@
     </param>
   </block>
   <block>
-    <key>variable</key>
+    <key>variable_config</key>
     <param>
       <key>id</key>
-      <value>sps</value>
+      <value>saved_pll_alpha</value>
     </param>
     <param>
       <key>_enabled</key>
@@ -555,11 +683,31 @@
     </param>
     <param>
       <key>value</key>
-      <value>sample_rate/sym_rate</value>
+      <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>(397, 19)</value>
+      <value>(823, 258)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -567,10 +715,10 @@
     </param>
   </block>
   <block>
-    <key>variable</key>
+    <key>variable_config</key>
     <param>
       <key>id</key>
-      <value>sym_rate</value>
+      <value>saved_sync_alpha</value>
     </param>
     <param>
       <key>_enabled</key>
@@ -578,11 +726,31 @@
     </param>
     <param>
       <key>value</key>
-      <value>600*1109</value>
+      <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>(301, 19)</value>
+      <value>(981, 258)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -590,10 +758,10 @@
     </param>
   </block>
   <block>
-    <key>variable</key>
+    <key>variable_config</key>
     <param>
       <key>id</key>
-      <value>sample_rate</value>
+      <value>output_filename</value>
     </param>
     <param>
       <key>_enabled</key>
@@ -601,11 +769,31 @@
     </param>
     <param>
       <key>value</key>
-      <value>64e6/decim</value>
+      <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>(198, 17)</value>
+      <value>(1139, 259)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -613,10 +801,10 @@
     </param>
   </block>
   <block>
-    <key>variable_slider</key>
+    <key>variable_static_text</key>
     <param>
       <key>id</key>
-      <value>pll_alpha</value>
+      <value>decim_text</value>
     </param>
     <param>
       <key>_enabled</key>
@@ -624,43 +812,54 @@
     </param>
     <param>
       <key>label</key>
-      <value>PLL Alpha</value>
+      <value>Decimation</value>
     </param>
     <param>
       <key>value</key>
-      <value>0.005</value>
+      <value>decim</value>
     </param>
     <param>
-      <key>min</key>
-      <value>0.0</value>
+      <key>converver</key>
+      <value>float_converter</value>
     </param>
     <param>
-      <key>max</key>
-      <value>0.5</value>
+      <key>formatter</key>
+      <value>None</value>
     </param>
     <param>
-      <key>num_steps</key>
-      <value>500</value>
+      <key>grid_pos</key>
+      <value>1, 1, 1, 1</value>
     </param>
     <param>
-      <key>style</key>
-      <value>wx.SL_HORIZONTAL</value>
+      <key>notebook</key>
+      <value></value>
     </param>
     <param>
-      <key>converver</key>
-      <value>float_converter</value>
+      <key>_coordinate</key>
+      <value>(973, 20)</value>
     </param>
     <param>
-      <key>grid_pos</key>
-      <value>0, 0, 1, 1</value>
+      <key>_rotation</key>
+      <value>0</value>
     </param>
+  </block>
+  <block>
+    <key>variable</key>
     <param>
-      <key>notebook</key>
-      <value></value>
+      <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>(447, 99)</value>
+      <value>(705, 19)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -668,30 +867,58 @@
     </param>
   </block>
   <block>
-    <key>noaa_hrpt_pll_cf</key>
+    <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>id</key>
-      <value>noaa_hrpt_pll_cf_0</value>
+      <key>lo_offset</key>
+      <value>float('inf')</value>
     </param>
     <param>
-      <key>_enabled</key>
-      <value>True</value>
+      <key>gain</key>
+      <value>gain</value>
     </param>
     <param>
-      <key>alpha</key>
-      <value>pll_alpha</value>
+      <key>side</key>
+      <value>side</value>
     </param>
     <param>
-      <key>beta</key>
-      <value>pll_alpha**2/4.0</value>
+      <key>rx_ant</key>
+      <value>RXA</value>
     </param>
     <param>
-      <key>max_offset</key>
-      <value>max_carrier_offset</value>
+      <key>hb_filters</key>
+      <value></value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(624, 789)</value>
+      <value>(56, 699)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -699,34 +926,38 @@
     </param>
   </block>
   <block>
-    <key>noaa_hrpt_sync_fb</key>
+    <key>gr_agc_xx</key>
     <param>
       <key>id</key>
-      <value>noaa_hrpt_sync_fb_0</value>
+      <value>agc</value>
     </param>
     <param>
       <key>_enabled</key>
       <value>True</value>
     </param>
     <param>
-      <key>alpha</key>
-      <value>sync_alpha</value>
+      <key>type</key>
+      <value>complex</value>
     </param>
     <param>
-      <key>beta</key>
-      <value>sync_alpha**2/4.0</value>
+      <key>rate</key>
+      <value>1e-6</value>
     </param>
     <param>
-      <key>sps</key>
-      <value>sps</value>
+      <key>reference</key>
+      <value>1.0</value>
     </param>
     <param>
-      <key>max_offset</key>
-      <value>max_sync_offset</value>
+      <key>gain</key>
+      <value>1.0</value>
+    </param>
+    <param>
+      <key>max_gain</key>
+      <value>1.0</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(832, 781)</value>
+      <value>(273, 715)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -734,54 +965,58 @@
     </param>
   </block>
   <block>
-    <key>variable_slider</key>
+    <key>wxgui_scopesink2</key>
     <param>
       <key>id</key>
-      <value>sync_alpha</value>
+      <value>rx_scope</value>
     </param>
     <param>
       <key>_enabled</key>
       <value>True</value>
     </param>
     <param>
-      <key>label</key>
-      <value>SYNC Alpha</value>
+      <key>type</key>
+      <value>complex</value>
     </param>
     <param>
-      <key>value</key>
-      <value>0.1</value>
+      <key>title</key>
+      <value>RX Waveform</value>
     </param>
     <param>
-      <key>min</key>
-      <value>0.0</value>
+      <key>samp_rate</key>
+      <value>sample_rate</value>
     </param>
     <param>
-      <key>max</key>
-      <value>0.5</value>
+      <key>v_scale</key>
+      <value>0</value>
     </param>
     <param>
-      <key>num_steps</key>
-      <value>500</value>
+      <key>t_scale</key>
+      <value>20.0/sample_rate</value>
     </param>
     <param>
-      <key>style</key>
-      <value>wx.SL_HORIZONTAL</value>
+      <key>ac_couple</key>
+      <value>False</value>
     </param>
     <param>
-      <key>converver</key>
-      <value>float_converter</value>
+      <key>xy_mode</key>
+      <value>False</value>
+    </param>
+    <param>
+      <key>num_inputs</key>
+      <value>1</value>
     </param>
     <param>
       <key>grid_pos</key>
-      <value>0, 1, 1, 1</value>
+      <value>1, 0, 1, 1</value>
     </param>
     <param>
       <key>notebook</key>
-      <value></value>
+      <value>displays, 0</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(593, 98)</value>
+      <value>(439, 829)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -789,57 +1024,78 @@
     </param>
   </block>
   <block>
-    <key>gr_file_source</key>
+    <key>wxgui_fftsink2</key>
     <param>
       <key>id</key>
-      <value>gr_file_source_0</value>
+      <value>rx_fft</value>
     </param>
     <param>
       <key>_enabled</key>
       <value>True</value>
     </param>
     <param>
-      <key>file</key>
-      <value>filename</value>
+      <key>type</key>
+      <value>complex</value>
     </param>
     <param>
-      <key>type</key>
-      <value>short</value>
+      <key>title</key>
+      <value>RX Spectrum</value>
     </param>
     <param>
-      <key>repeat</key>
-      <value>False</value>
+      <key>samp_rate</key>
+      <value>sample_rate</value>
     </param>
     <param>
-      <key>vlen</key>
-      <value>1</value>
+      <key>baseband_freq</key>
+      <value>freq</value>
     </param>
     <param>
-      <key>_coordinate</key>
-      <value>(102, 368)</value>
+      <key>y_per_div</key>
+      <value>5</value>
     </param>
     <param>
-      <key>_rotation</key>
-      <value>0</value>
+      <key>y_divs</key>
+      <value>8</value>
     </param>
-  </block>
-  <block>
-    <key>virtual_sink</key>
     <param>
-      <key>id</key>
-      <value>virtual_sink_0</value>
+      <key>ref_level</key>
+      <value>-5</value>
     </param>
     <param>
-      <key>_enabled</key>
+      <key>ref_scale</key>
+      <value>2.0</value>
+    </param>
+    <param>
+      <key>fft_size</key>
+      <value>1024</value>
+    </param>
+    <param>
+      <key>fft_rate</key>
+      <value>30</value>
+    </param>
+    <param>
+      <key>peak_hold</key>
+      <value>False</value>
+    </param>
+    <param>
+      <key>average</key>
       <value>True</value>
     </param>
     <param>
-      <key>stream_id</key>
-      <value>samples</value>
+      <key>avg_alpha</key>
+      <value>0.1</value>
+    </param>
+    <param>
+      <key>grid_pos</key>
+      <value>0, 0, 1, 1</value>
+    </param>
+    <param>
+      <key>notebook</key>
+      <value>displays, 0</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(1076, 376)</value>
+      <value>(439, 465)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -847,10 +1103,10 @@
     </param>
   </block>
   <block>
-    <key>gr_throttle</key>
+    <key>wxgui_scopesink2</key>
     <param>
       <key>id</key>
-      <value>throttle</value>
+      <value>pll_scope</value>
     </param>
     <param>
       <key>_enabled</key>
@@ -858,50 +1114,82 @@
     </param>
     <param>
       <key>type</key>
-      <value>complex</value>
+      <value>float</value>
+    </param>
+    <param>
+      <key>title</key>
+      <value>Post-PLL</value>
     </param>
     <param>
-      <key>samples_per_second</key>
+      <key>samp_rate</key>
       <value>sample_rate</value>
     </param>
     <param>
-      <key>vlen</key>
+      <key>v_scale</key>
+      <value>0.5</value>
+    </param>
+    <param>
+      <key>t_scale</key>
+      <value>20.0/sample_rate</value>
+    </param>
+    <param>
+      <key>ac_couple</key>
+      <value>False</value>
+    </param>
+    <param>
+      <key>xy_mode</key>
+      <value>False</value>
+    </param>
+    <param>
+      <key>num_inputs</key>
       <value>1</value>
     </param>
+    <param>
+      <key>grid_pos</key>
+      <value>0, 0, 1, 1</value>
+    </param>
+    <param>
+      <key>notebook</key>
+      <value>displays, 1</value>
+    </param>
     <param>
       <key>_coordinate</key>
-      <value>(877, 376)</value>
+      <value>(605, 552)</value>
     </param>
     <param>
       <key>_rotation</key>
-      <value>0</value>
+      <value>180</value>
     </param>
   </block>
   <block>
-    <key>gr_deinterleave</key>
+    <key>notebook</key>
     <param>
       <key>id</key>
-      <value>gr_deinterleave_0</value>
+      <value>displays</value>
     </param>
     <param>
       <key>_enabled</key>
       <value>True</value>
     </param>
     <param>
-      <key>type</key>
-      <value>float</value>
+      <key>style</key>
+      <value>wx.NB_TOP</value>
     </param>
     <param>
-      <key>num_streams</key>
-      <value>2</value>
+      <key>labels</key>
+      <value>['RX','Demod']</value>
     </param>
     <param>
-      <key>vlen</key>
-      <value>1</value>
+      <key>grid_pos</key>
+      <value>2, 0, 1, 4</value>
+    </param>
+    <param>
+      <key>notebook</key>
+      <value></value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(466, 363)</value>
+      <value>(15, 237)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -909,18 +1197,30 @@
     </param>
   </block>
   <block>
-    <key>gr_short_to_float</key>
+    <key>noaa_hrpt_pll_cf</key>
     <param>
       <key>id</key>
-      <value>gr_short_to_float_0</value>
+      <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>(278, 380)</value>
+      <value>(632, 723)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -928,22 +1228,34 @@
     </param>
   </block>
   <block>
-    <key>gr_float_to_complex</key>
+    <key>noaa_hrpt_sync_fb</key>
     <param>
       <key>id</key>
-      <value>gr_float_to_complex_0</value>
+      <value>sync</value>
     </param>
     <param>
       <key>_enabled</key>
       <value>True</value>
     </param>
     <param>
-      <key>vlen</key>
-      <value>1</value>
+      <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>(653, 363)</value>
+      <value>(840, 715)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -951,30 +1263,18 @@
     </param>
   </block>
   <block>
-    <key>gr_file_sink</key>
+    <key>noaa_hrpt_deframer</key>
     <param>
       <key>id</key>
-      <value>gr_file_sink_1</value>
+      <value>deframer</value>
     </param>
     <param>
       <key>_enabled</key>
       <value>True</value>
     </param>
-    <param>
-      <key>file</key>
-      <value>frames.dat</value>
-    </param>
-    <param>
-      <key>type</key>
-      <value>short</value>
-    </param>
-    <param>
-      <key>vlen</key>
-      <value>1</value>
-    </param>
     <param>
       <key>_coordinate</key>
-      <value>(1265, 917)</value>
+      <value>(1071, 743)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -982,10 +1282,10 @@
     </param>
   </block>
   <block>
-    <key>noaa_hrpt_deframer</key>
+    <key>noaa_hrpt_decoder</key>
     <param>
       <key>id</key>
-      <value>noaa_hrpt_deframer_0</value>
+      <value>decoder</value>
     </param>
     <param>
       <key>_enabled</key>
@@ -993,7 +1293,7 @@
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(1063, 809)</value>
+      <value>(1274, 743)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -1001,18 +1301,30 @@
     </param>
   </block>
   <block>
-    <key>noaa_hrpt_decoder</key>
+    <key>gr_file_sink</key>
     <param>
       <key>id</key>
-      <value>noaa_hrpt_decoder_0</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>short</value>
+    </param>
+    <param>
+      <key>vlen</key>
+      <value>1</value>
+    </param>
     <param>
       <key>_coordinate</key>
-      <value>(1266, 809)</value>
+      <value>(1273, 851)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -1020,98 +1332,62 @@
     </param>
   </block>
   <connection>
-    <source_block_id>virtual_source_0</source_block_id>
-    <sink_block_id>agr</sink_block_id>
-    <source_key>0</source_key>
-    <sink_key>0</sink_key>
-  </connection>
-  <connection>
-    <source_block_id>noaa_hrpt_deframer_0</source_block_id>
-    <sink_block_id>gr_file_sink_1</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>noaa_hrpt_sync_fb_0</source_block_id>
-    <sink_block_id>noaa_hrpt_deframer_0</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>noaa_hrpt_pll_cf_0</source_block_id>
-    <sink_block_id>noaa_hrpt_sync_fb_0</sink_block_id>
+    <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>noaa_hrpt_pll_cf_0</source_block_id>
-    <sink_block_id>wxgui_scopesink2_0_0</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>
   <connection>
-    <source_block_id>agr</source_block_id>
-    <sink_block_id>wxgui_scopesink2_0</sink_block_id>
+    <source_block_id>agc</source_block_id>
+    <sink_block_id>rx_scope</sink_block_id>
     <source_key>0</source_key>
     <sink_key>0</sink_key>
   </connection>
   <connection>
-    <source_block_id>agr</source_block_id>
-    <sink_block_id>rx_fftsink</sink_block_id>
+    <source_block_id>agc</source_block_id>
+    <sink_block_id>rx_fft</sink_block_id>
     <source_key>0</source_key>
     <sink_key>0</sink_key>
   </connection>
   <connection>
-    <source_block_id>agr</source_block_id>
+    <source_block_id>agc</source_block_id>
     <sink_block_id>matched_filter</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>noaa_hrpt_pll_cf_0</sink_block_id>
-    <source_key>0</source_key>
-    <sink_key>0</sink_key>
-  </connection>
-  <connection>
-    <source_block_id>gr_float_to_complex_0</source_block_id>
-    <sink_block_id>throttle</sink_block_id>
-    <source_key>0</source_key>
-    <sink_key>0</sink_key>
-  </connection>
-  <connection>
-    <source_block_id>gr_short_to_float_0</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>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_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>gr_file_source_0</source_block_id>
-    <sink_block_id>gr_short_to_float_0</sink_block_id>
+    <sink_block_id>pll</sink_block_id>
     <source_key>0</source_key>
     <sink_key>0</sink_key>
   </connection>
   <connection>
-    <source_block_id>throttle</source_block_id>
-    <sink_block_id>virtual_sink_0</sink_block_id>
+    <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>noaa_hrpt_deframer_0</source_block_id>
-    <sink_block_id>noaa_hrpt_decoder_0</sink_block_id>
+    <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>

diff --git a/gr-noaa/apps/usrp_rx_hrpt.py b/gr-noaa/apps/usrp_rx_hrpt.py
index b29af5654efc00751798fca598c59e3b24a85f5a..7efbecd3a389bf654ed66639f59e18c1a8865388 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: Sun Sep 20 19:30:17 2009
+# Generated: Wed Sep 23 11:32:04 2009
 ##################################################
 
 from gnuradio import eng_notation
@@ -13,41 +13,77 @@ 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
 from grc_gnuradio import wxgui as grc_wxgui
 from optparse import OptionParser
+import ConfigParser
 import math
 import wx
 
 class usrp_rx_hrpt(grc_wxgui.top_block_gui):
 
-       def __init__(self, filename="", decim=16):
+       def __init__(self):
                grc_wxgui.top_block_gui.__init__(self, title="USRP HRPT Receiver")
 
-               ##################################################
-               # Parameters
-               ##################################################
-               self.filename = filename
-               self.decim = decim
-
                ##################################################
                # 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.sync_alpha = sync_alpha = 0.1
-               self.pll_alpha = pll_alpha = 0.005
+               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._saved_sync_alpha_config = ConfigParser.ConfigParser()
+               self._saved_sync_alpha_config.read(config_filename)
+               try: saved_sync_alpha = self._saved_sync_alpha_config.getfloat('demod', 'sync_alpha')
+               except: saved_sync_alpha = 0.05
+               self.saved_sync_alpha = saved_sync_alpha
+               self._saved_pll_alpha_config = ConfigParser.ConfigParser()
+               self._saved_pll_alpha_config.read(config_filename)
+               try: saved_pll_alpha = self._saved_pll_alpha_config.getfloat('demod', 'pll_alpha')
+               except: saved_pll_alpha = 0.05
+               self.saved_pll_alpha = saved_pll_alpha
+               self._saved_gain_config = ConfigParser.ConfigParser()
+               self._saved_gain_config.read(config_filename)
+               try: saved_gain = self._saved_gain_config.getfloat('usrp', 'gain')
+               except: saved_gain = 35
+               self.saved_gain = saved_gain
+               self._saved_freq_config = ConfigParser.ConfigParser()
+               self._saved_freq_config.read(config_filename)
+               try: saved_freq = self._saved_freq_config.getfloat('usrp', 'freq')
+               except: saved_freq = 1698e6
+               self.saved_freq = saved_freq
+               self.sync_alpha = sync_alpha = saved_sync_alpha
+               self.side_text = side_text = side
+               self.pll_alpha = pll_alpha = saved_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.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), "PLL/SYNC")
-               self.GridAdd(self.displays, 1, 0, 1, 2)
+               self.displays.AddPage(grc_wxgui.Panel(self.displays), "Demod")
+               self.GridAdd(self.displays, 2, 0, 1, 4)
 
                ##################################################
                # Controls
@@ -69,12 +105,20 @@ class usrp_rx_hrpt(grc_wxgui.top_block_gui):
                        callback=self.set_sync_alpha,
                        minimum=0.0,
                        maximum=0.5,
-                       num_steps=500,
+                       num_steps=100,
                        style=wx.SL_HORIZONTAL,
                        cast=float,
                        proportion=1,
                )
-               self.GridAdd(_sync_alpha_sizer, 0, 1, 1, 1)
+               self.GridAdd(_sync_alpha_sizer, 0, 3, 1, 1)
+               self._side_text_static_text = forms.static_text(
+                       parent=self.GetWin(),
+                       value=self.side_text,
+                       callback=self.set_side_text,
+                       label="USRP Side",
+                       converter=forms.str_converter(),
+               )
+               self.GridAdd(self._side_text_static_text, 1, 0, 1, 1)
                _pll_alpha_sizer = wx.BoxSizer(wx.VERTICAL)
                self._pll_alpha_text_box = forms.text_box(
                        parent=self.GetWin(),
@@ -92,30 +136,75 @@ class usrp_rx_hrpt(grc_wxgui.top_block_gui):
                        callback=self.set_pll_alpha,
                        minimum=0.0,
                        maximum=0.5,
-                       num_steps=500,
+                       num_steps=100,
+                       style=wx.SL_HORIZONTAL,
+                       cast=float,
+                       proportion=1,
+               )
+               self.GridAdd(_pll_alpha_sizer, 0, 2, 1, 1)
+               _gain_sizer = wx.BoxSizer(wx.VERTICAL)
+               self._gain_text_box = forms.text_box(
+                       parent=self.GetWin(),
+                       sizer=_gain_sizer,
+                       value=self.gain,
+                       callback=self.set_gain,
+                       label="RX Gain",
+                       converter=forms.float_converter(),
+                       proportion=0,
+               )
+               self._gain_slider = forms.slider(
+                       parent=self.GetWin(),
+                       sizer=_gain_sizer,
+                       value=self.gain,
+                       callback=self.set_gain,
+                       minimum=0,
+                       maximum=100,
+                       num_steps=100,
                        style=wx.SL_HORIZONTAL,
                        cast=float,
                        proportion=1,
                )
-               self.GridAdd(_pll_alpha_sizer, 0, 0, 1, 1)
+               self.GridAdd(_gain_sizer, 0, 1, 1, 1)
+               self._freq_text_box = forms.text_box(
+                       parent=self.GetWin(),
+                       value=self.freq,
+                       callback=self.set_freq,
+                       label="Frequency",
+                       converter=forms.float_converter(),
+               )
+               self.GridAdd(self._freq_text_box, 0, 0, 1, 1)
+               self._decim_text_static_text = forms.static_text(
+                       parent=self.GetWin(),
+                       value=self.decim_text,
+                       callback=self.set_decim_text,
+                       label="Decimation",
+                       converter=forms.float_converter(),
+               )
+               self.GridAdd(self._decim_text_static_text, 1, 1, 1, 1)
 
                ##################################################
                # Blocks
                ##################################################
-               self.agr = gr.agc_cc(1e-6, 1.0, 1.0, 1.0)
-               self.gr_deinterleave_0 = gr.deinterleave(gr.sizeof_float*1)
-               self.gr_file_sink_1 = gr.file_sink(gr.sizeof_short*1, "frames.dat")
-               self.gr_file_source_0 = gr.file_source(gr.sizeof_short*1, filename, False)
-               self.gr_float_to_complex_0 = gr.float_to_complex(1)
-               self.gr_short_to_float_0 = gr.short_to_float()
+               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.matched_filter = gr.moving_average_cc(hs, 1.0/hs, 4000)
-               self.noaa_hrpt_decoder_0 = noaa.hrpt_decoder()
-               self.noaa_hrpt_deframer_0 = noaa.hrpt_deframer()
-               self.noaa_hrpt_pll_cf_0 = noaa.hrpt_pll_cf(pll_alpha, pll_alpha**2/4.0, max_carrier_offset)
-               self.noaa_hrpt_sync_fb_0 = noaa.hrpt_sync_fb(sync_alpha, sync_alpha**2/4.0, sps, max_sync_offset)
-               self.rx_fftsink = fftsink2.fft_sink_c(
+               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",
+                       sample_rate=sample_rate,
+                       v_scale=0.5,
+                       t_scale=20.0/sample_rate,
+                       ac_couple=False,
+                       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=1698e6,
+                       baseband_freq=freq,
                        y_per_div=5,
                        y_divs=8,
                        ref_level=-5,
@@ -128,9 +217,8 @@ class usrp_rx_hrpt(grc_wxgui.top_block_gui):
                        title="RX Spectrum",
                        peak_hold=False,
                )
-               self.displays.GetPage(0).GridAdd(self.rx_fftsink.win, 0, 0, 1, 1)
-               self.throttle = gr.throttle(gr.sizeof_gr_complex*1, sample_rate)
-               self.wxgui_scopesink2_0 = scopesink2.scope_sink_c(
+               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,
@@ -140,44 +228,83 @@ class usrp_rx_hrpt(grc_wxgui.top_block_gui):
                        xy_mode=False,
                        num_inputs=1,
                )
-               self.displays.GetPage(0).GridAdd(self.wxgui_scopesink2_0.win, 1, 0, 1, 1)
-               self.wxgui_scopesink2_0_0 = scopesink2.scope_sink_f(
-                       self.displays.GetPage(1).GetWin(),
-                       title="Post-PLL",
-                       sample_rate=sample_rate,
-                       v_scale=0.5,
-                       t_scale=20.0/sample_rate,
-                       ac_couple=False,
-                       xy_mode=False,
-                       num_inputs=1,
-               )
-               self.displays.GetPage(1).GridAdd(self.wxgui_scopesink2_0_0.win, 0, 0, 1, 1)
+               self.displays.GetPage(0).GridAdd(self.rx_scope.win, 1, 0, 1, 1)
+               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.throttle, 0), (self.agr, 0))
-               self.connect((self.noaa_hrpt_deframer_0, 0), (self.gr_file_sink_1, 0))
-               self.connect((self.noaa_hrpt_sync_fb_0, 0), (self.noaa_hrpt_deframer_0, 0))
-               self.connect((self.noaa_hrpt_pll_cf_0, 0), (self.noaa_hrpt_sync_fb_0, 0))
-               self.connect((self.noaa_hrpt_pll_cf_0, 0), (self.wxgui_scopesink2_0_0, 0))
-               self.connect((self.agr, 0), (self.wxgui_scopesink2_0, 0))
-               self.connect((self.agr, 0), (self.rx_fftsink, 0))
-               self.connect((self.agr, 0), (self.matched_filter, 0))
-               self.connect((self.matched_filter, 0), (self.noaa_hrpt_pll_cf_0, 0))
-               self.connect((self.gr_float_to_complex_0, 0), (self.throttle, 0))
-               self.connect((self.gr_short_to_float_0, 0), (self.gr_deinterleave_0, 0))
-               self.connect((self.gr_deinterleave_0, 1), (self.gr_float_to_complex_0, 1))
-               self.connect((self.gr_deinterleave_0, 0), (self.gr_float_to_complex_0, 0))
-               self.connect((self.gr_file_source_0, 0), (self.gr_short_to_float_0, 0))
-               self.connect((self.noaa_hrpt_deframer_0, 0), (self.noaa_hrpt_decoder_0, 0))
-
-       def set_filename(self, filename):
-               self.filename = filename
+               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.usrp_source, 0), (self.agc, 0))
+
+       def set_config_filename(self, config_filename):
+               self.config_filename = config_filename
+               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'))
+               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._saved_freq_config = ConfigParser.ConfigParser()
+               self._saved_freq_config.read(self.config_filename)
+               if not self._saved_freq_config.has_section('usrp'):
+                       self._saved_freq_config.add_section('usrp')
+               self._saved_freq_config.set('usrp', 'freq', str(self.freq))
+               self._saved_freq_config.write(open(self.config_filename, 'w'))
+               self._saved_gain_config = ConfigParser.ConfigParser()
+               self._saved_gain_config.read(self.config_filename)
+               if not self._saved_gain_config.has_section('usrp'):
+                       self._saved_gain_config.add_section('usrp')
+               self._saved_gain_config.set('usrp', 'gain', str(self.gain))
+               self._saved_gain_config.write(open(self.config_filename, 'w'))
+               self._saved_pll_alpha_config = ConfigParser.ConfigParser()
+               self._saved_pll_alpha_config.read(self.config_filename)
+               if not self._saved_pll_alpha_config.has_section('demod'):
+                       self._saved_pll_alpha_config.add_section('demod')
+               self._saved_pll_alpha_config.set('demod', 'pll_alpha', str(self.pll_alpha))
+               self._saved_pll_alpha_config.write(open(self.config_filename, 'w'))
+               self._saved_sync_alpha_config = ConfigParser.ConfigParser()
+               self._saved_sync_alpha_config.read(self.config_filename)
+               if not self._saved_sync_alpha_config.has_section('demod'):
+                       self._saved_sync_alpha_config.add_section('demod')
+               self._saved_sync_alpha_config.set('demod', 'sync_alpha', str(self.sync_alpha))
+               self._saved_sync_alpha_config.write(open(self.config_filename, 'w'))
+               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_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.set_decim_text(self.decim)
+               self.usrp_source.set_decim_rate(self.decim)
 
        def set_sym_rate(self, sym_rate):
                self.sym_rate = sym_rate
@@ -185,49 +312,124 @@ class usrp_rx_hrpt(grc_wxgui.top_block_gui):
 
        def set_sample_rate(self, sample_rate):
                self.sample_rate = sample_rate
-               self.wxgui_scopesink2_0_0.set_sample_rate(self.sample_rate)
-               self.wxgui_scopesink2_0.set_sample_rate(self.sample_rate)
-               self.rx_fftsink.set_sample_rate(self.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):
                self.sps = sps
                self.set_hs(int(self.sps/2.0))
 
+       def set_side(self, side):
+               self.side = side
+               self.set_side_text(self.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_saved_sync_alpha(self, saved_sync_alpha):
+               self.saved_sync_alpha = saved_sync_alpha
+               self.set_sync_alpha(self.saved_sync_alpha)
+
+       def set_saved_pll_alpha(self, saved_pll_alpha):
+               self.saved_pll_alpha = saved_pll_alpha
+               self.set_pll_alpha(self.saved_pll_alpha)
+
+       def set_saved_gain(self, saved_gain):
+               self.saved_gain = saved_gain
+               self.set_gain(self.saved_gain)
+
+       def set_saved_freq(self, saved_freq):
+               self.saved_freq = saved_freq
+               self.set_freq(self.saved_freq)
+
        def set_sync_alpha(self, sync_alpha):
                self.sync_alpha = sync_alpha
-               self.noaa_hrpt_sync_fb_0.set_alpha(self.sync_alpha)
-               self.noaa_hrpt_sync_fb_0.set_beta(self.sync_alpha**2/4.0)
                self._sync_alpha_slider.set_value(self.sync_alpha)
                self._sync_alpha_text_box.set_value(self.sync_alpha)
+               self._saved_sync_alpha_config = ConfigParser.ConfigParser()
+               self._saved_sync_alpha_config.read(self.config_filename)
+               if not self._saved_sync_alpha_config.has_section('demod'):
+                       self._saved_sync_alpha_config.add_section('demod')
+               self._saved_sync_alpha_config.set('demod', 'sync_alpha', str(self.sync_alpha))
+               self._saved_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_text(self, side_text):
+               self.side_text = side_text
+               self._side_text_static_text.set_value(self.side_text)
 
        def set_pll_alpha(self, pll_alpha):
                self.pll_alpha = pll_alpha
                self._pll_alpha_slider.set_value(self.pll_alpha)
                self._pll_alpha_text_box.set_value(self.pll_alpha)
-               self.noaa_hrpt_pll_cf_0.set_alpha(self.pll_alpha)
-               self.noaa_hrpt_pll_cf_0.set_beta(self.pll_alpha**2/4.0)
+               self._saved_pll_alpha_config = ConfigParser.ConfigParser()
+               self._saved_pll_alpha_config.read(self.config_filename)
+               if not self._saved_pll_alpha_config.has_section('demod'):
+                       self._saved_pll_alpha_config.add_section('demod')
+               self._saved_pll_alpha_config.set('demod', 'pll_alpha', str(self.pll_alpha))
+               self._saved_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_max_sync_offset(self, max_sync_offset):
                self.max_sync_offset = max_sync_offset
-               self.noaa_hrpt_sync_fb_0.set_max_offset(self.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.noaa_hrpt_pll_cf_0.set_max_offset(self.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)
+               self._gain_text_box.set_value(self.gain)
+               self._saved_gain_config = ConfigParser.ConfigParser()
+               self._saved_gain_config.read(self.config_filename)
+               if not self._saved_gain_config.has_section('usrp'):
+                       self._saved_gain_config.add_section('usrp')
+               self._saved_gain_config.set('usrp', 'gain', str(self.gain))
+               self._saved_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_text_box.set_value(self.freq)
+               self._saved_freq_config = ConfigParser.ConfigParser()
+               self._saved_freq_config.read(self.config_filename)
+               if not self._saved_freq_config.has_section('usrp'):
+                       self._saved_freq_config.add_section('usrp')
+               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
+               self._decim_text_static_text.set_value(self.decim_text)
+
 if __name__ == '__main__':
        parser = OptionParser(option_class=eng_option, usage="%prog: [options]")
-       parser.add_option("-f", "--filename", dest="filename", type="string", default="",
-               help="Set Filename [default=%default]")
-       parser.add_option("-d", "--decim", dest="decim", type="intx", default=16,
-               help="Set Decimation [default=%default]")
        (options, args) = parser.parse_args()
-       tb = usrp_rx_hrpt(filename=options.filename, decim=options.decim)
+       tb = usrp_rx_hrpt()
        tb.Run(True)
 

diff --git a/gr-noaa/lib/noaa_hrpt_decoder.cc b/gr-noaa/lib/noaa_hrpt_decoder.cc
index 4fae0173da945e364e1c60a07e3284361dcbcd90..8cfaa913c46c588e69bce82c8d58ec632c8a1a4f 100644 (file)
--- a/gr-noaa/lib/noaa_hrpt_decoder.cc
+++ b/gr-noaa/lib/noaa_hrpt_decoder.cc
@@ -59,17 +59,17 @@ noaa_hrpt_decoder::work(int noutput_items,
   while (i < noutput_items) {
     unsigned short word = in[i++];
     d_word_count++;
-    fprintf(stderr, "%5u:  ", d_word_count);
+    //fprintf(stderr, "%5u:  ", d_word_count);
     for (int pos = 0; pos < 10; pos++) {
       char ch = (word & (1 << 9)) ? '1' : '0';
       word = word << 1;
-      fprintf(stderr, "%c ", ch);
+      //fprintf(stderr, "%c ", ch);
     }
-    fprintf(stderr, "\n");
+    //fprintf(stderr, "\n");
 
     if (d_word_count == 11090) {
       d_word_count = 0;
-      fprintf(stderr, "\n");
+      //fprintf(stderr, "\n");
     }
   }
 

diff --git a/gr-noaa/lib/noaa_hrpt_deframer.cc b/gr-noaa/lib/noaa_hrpt_deframer.cc
index 77a8e3263ddc19b5e0383770246742a68d5b7662..b0de09c91b191583d80d0e5e57fd9fe566e43bb4 100644 (file)
--- a/gr-noaa/lib/noaa_hrpt_deframer.cc
+++ b/gr-noaa/lib/noaa_hrpt_deframer.cc
@@ -91,7 +91,7 @@ noaa_hrpt_deframer::general_work(int noutput_items,
       d_shifter = (d_shifter << 1) | bit; // MSB transmitted first
       
       if ((d_shifter & 0x0FFFFFFFFFFFFFFF) == HRPT_MINOR_FRAME_SYNC) {
-       //fprintf(stderr, "SYNC #%i", frames_seen++);
+       fprintf(stderr, "SYNC #%i", frames_seen++);
        out[j++] = SYNC1;
        out[j++] = SYNC2;
        out[j++] = SYNC3;
@@ -109,7 +109,7 @@ noaa_hrpt_deframer::general_work(int noutput_items,
        d_word = 0;
        d_bit_count = HRPT_BITS_PER_WORD;
        if (--d_word_count == 0) {
-         //fprintf(stderr, "...done\n");
+         fprintf(stderr, "...done\n");
          enter_idle();
        }
       }