From f8fcb642dabca11870886c53dfdff66c86774db0 Mon Sep 17 00:00:00 2001
From: Johnathan Corgan <jcorgan@corganenterprises.com>
Date: Sun, 20 Sep 2009 19:32:30 -0700
Subject: Added skeleton HRPT decoder block
---
gr-noaa/apps/usrp_rx_hrpt.grc | 127 +++++++++++++++++++++++++-----------------
gr-noaa/apps/usrp_rx_hrpt.py | 6 +-
2 files changed, 80 insertions(+), 53 deletions(-)
(limited to 'gr-noaa/apps')
diff --git a/gr-noaa/apps/usrp_rx_hrpt.grc b/gr-noaa/apps/usrp_rx_hrpt.grc
index 8edc2b4ea9..f629ae8b7f 100644
--- 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:09:57 2009</timestamp>
+ <timestamp>Sun Sep 20 19:30:16 2009</timestamp>
<block>
<key>options</key>
<param>
@@ -110,56 +110,6 @@
<value>0</value>
</param>
</block>
- <block>
- <key>gr_file_sink</key>
- <param>
- <key>id</key>
- <value>gr_file_sink_1</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>(1253, 805)</value>
- </param>
- <param>
- <key>_rotation</key>
- <value>0</value>
- </param>
- </block>
- <block>
- <key>noaa_hrpt_deframer</key>
- <param>
- <key>id</key>
- <value>noaa_hrpt_deframer_0</value>
- </param>
- <param>
- <key>_enabled</key>
- <value>True</value>
- </param>
- <param>
- <key>_coordinate</key>
- <value>(1063, 809)</value>
- </param>
- <param>
- <key>_rotation</key>
- <value>0</value>
- </param>
- </block>
<block>
<key>wxgui_scopesink2</key>
<param>
@@ -1000,6 +950,75 @@
<value>0</value>
</param>
</block>
+ <block>
+ <key>gr_file_sink</key>
+ <param>
+ <key>id</key>
+ <value>gr_file_sink_1</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>
+ </param>
+ <param>
+ <key>_rotation</key>
+ <value>0</value>
+ </param>
+ </block>
+ <block>
+ <key>noaa_hrpt_deframer</key>
+ <param>
+ <key>id</key>
+ <value>noaa_hrpt_deframer_0</value>
+ </param>
+ <param>
+ <key>_enabled</key>
+ <value>True</value>
+ </param>
+ <param>
+ <key>_coordinate</key>
+ <value>(1063, 809)</value>
+ </param>
+ <param>
+ <key>_rotation</key>
+ <value>0</value>
+ </param>
+ </block>
+ <block>
+ <key>noaa_hrpt_decoder</key>
+ <param>
+ <key>id</key>
+ <value>noaa_hrpt_decoder_0</value>
+ </param>
+ <param>
+ <key>_enabled</key>
+ <value>True</value>
+ </param>
+ <param>
+ <key>_coordinate</key>
+ <value>(1266, 809)</value>
+ </param>
+ <param>
+ <key>_rotation</key>
+ <value>0</value>
+ </param>
+ </block>
<connection>
<source_block_id>virtual_source_0</source_block_id>
<sink_block_id>agr</sink_block_id>
@@ -1090,4 +1109,10 @@
<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_key>0</source_key>
+ <sink_key>0</sink_key>
+ </connection>
</flow_graph>
diff --git a/gr-noaa/apps/usrp_rx_hrpt.py b/gr-noaa/apps/usrp_rx_hrpt.py
index 6c50a348a6..b29af5654e 100755
--- 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:09:57 2009
+# Generated: Sun Sep 20 19:30:17 2009
##################################################
from gnuradio import eng_notation
@@ -105,10 +105,11 @@ class usrp_rx_hrpt(grc_wxgui.top_block_gui):
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_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.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)
@@ -169,6 +170,7 @@ class usrp_rx_hrpt(grc_wxgui.top_block_gui):
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
--
cgit v1.2.3