From 1530b6153fe21bf8c77f76c5d854108dd47069f6 Mon Sep 17 00:00:00 2001
From: Johnathan Corgan <jcorgan@corganenterprises.com>
Date: Mon, 2 Nov 2009 09:57:32 -0800
Subject: gr-noaa: Combined noaa_hrpt_bit_sync into noaa_hrpt_deframer
Added Octave script to convert from frame data to AVHRR channel images
Removed noaa_hrpt_bit_sync block
---
gr-noaa/apps/demod_hrpt_file.grc | 35 ++---------
gr-noaa/apps/demod_hrpt_file.py | 6 +-
gr-noaa/apps/file_rx_hrpt.grc | 115 ++++++++++++++----------------------
gr-noaa/apps/file_rx_hrpt.py | 6 +-
gr-noaa/apps/usrp_rx_hrpt.grc | 115 ++++++++++++++----------------------
gr-noaa/apps/usrp_rx_hrpt.py | 6 +-
gr-noaa/apps/usrp_rx_hrpt_nogui.grc | 71 ++++++++--------------
gr-noaa/apps/usrp_rx_hrpt_nogui.py | 6 +-
8 files changed, 126 insertions(+), 234 deletions(-)
(limited to 'gr-noaa/apps')
diff --git a/gr-noaa/apps/demod_hrpt_file.grc b/gr-noaa/apps/demod_hrpt_file.grc
index a5df8786fb..3c5e3efa4e 100644
--- a/gr-noaa/apps/demod_hrpt_file.grc
+++ b/gr-noaa/apps/demod_hrpt_file.grc
@@ -1,6 +1,6 @@
<?xml version='1.0' encoding='ASCII'?>
<flow_graph>
- <timestamp>Sun Nov 1 18:39:07 2009</timestamp>
+ <timestamp>Mon Nov 2 07:06:57 2009</timestamp>
<block>
<key>options</key>
<param>
@@ -629,25 +629,6 @@
<value>0</value>
</param>
</block>
- <block>
- <key>gr_binary_slicer_fb</key>
- <param>
- <key>id</key>
- <value>gr_binary_slicer_fb_0</value>
- </param>
- <param>
- <key>_enabled</key>
- <value>True</value>
- </param>
- <param>
- <key>_coordinate</key>
- <value>(112, 537)</value>
- </param>
- <param>
- <key>_rotation</key>
- <value>0</value>
- </param>
- </block>
<block>
<key>gr_file_sink</key>
<param>
@@ -699,10 +680,10 @@
</param>
</block>
<block>
- <key>noaa_hrpt_bit_sync</key>
+ <key>gr_binary_slicer_fb</key>
<param>
<key>id</key>
- <value>noaa_hrpt_bit_sync_0</value>
+ <value>gr_binary_slicer_fb_0</value>
</param>
<param>
<key>_enabled</key>
@@ -710,7 +691,7 @@
</param>
<param>
<key>_coordinate</key>
- <value>(330, 537)</value>
+ <value>(112, 537)</value>
</param>
<param>
<key>_rotation</key>
@@ -760,12 +741,6 @@
<source_key>0</source_key>
<sink_key>0</sink_key>
</connection>
- <connection>
- <source_block_id>gr_binary_slicer_fb_0</source_block_id>
- <sink_block_id>noaa_hrpt_bit_sync_0</sink_block_id>
- <source_key>0</source_key>
- <sink_key>0</sink_key>
- </connection>
<connection>
<source_block_id>cs2cf</source_block_id>
<sink_block_id>agc</sink_block_id>
@@ -791,7 +766,7 @@
<sink_key>0</sink_key>
</connection>
<connection>
- <source_block_id>noaa_hrpt_bit_sync_0</source_block_id>
+ <source_block_id>gr_binary_slicer_fb_0</source_block_id>
<sink_block_id>noaa_hrpt_deframer_0</sink_block_id>
<source_key>0</source_key>
<sink_key>0</sink_key>
diff --git a/gr-noaa/apps/demod_hrpt_file.py b/gr-noaa/apps/demod_hrpt_file.py
index 8467231857..d866501716 100755
--- a/gr-noaa/apps/demod_hrpt_file.py
+++ b/gr-noaa/apps/demod_hrpt_file.py
@@ -2,7 +2,7 @@
##################################################
# Gnuradio Python Flow Graph
# Title: Demod Hrpt File
-# Generated: Sun Nov 1 18:39:07 2009
+# Generated: Mon Nov 2 07:06:57 2009
##################################################
from gnuradio import eng_notation
@@ -48,7 +48,6 @@ class demod_hrpt_file(gr.top_block):
self.gr_clock_recovery_mm_xx_0 = gr.clock_recovery_mm_ff(sps/2.0, clock_alpha**2/4.0, 0.5, clock_alpha, max_clock_offset)
self.gr_file_sink_0 = gr.file_sink(gr.sizeof_short*1, output_filename)
self.gr_moving_average_xx_0 = gr.moving_average_ff(hs, 1.0/hs, 4000)
- self.noaa_hrpt_bit_sync_0 = noaa.hrpt_bit_sync()
self.noaa_hrpt_decoder_0 = noaa.hrpt_decoder()
self.noaa_hrpt_deframer_0 = noaa.hrpt_deframer()
self.pll = noaa.hrpt_pll_cf(pll_alpha, pll_alpha**2/4.0, max_carrier_offset)
@@ -60,12 +59,11 @@ class demod_hrpt_file(gr.top_block):
self.connect((self.gr_clock_recovery_mm_xx_0, 0), (self.gr_binary_slicer_fb_0, 0))
self.connect((self.gr_moving_average_xx_0, 0), (self.gr_clock_recovery_mm_xx_0, 0))
self.connect((self.pll, 0), (self.gr_moving_average_xx_0, 0))
- self.connect((self.gr_binary_slicer_fb_0, 0), (self.noaa_hrpt_bit_sync_0, 0))
self.connect((self.cs2cf, 0), (self.agc, 0))
self.connect((self.agc, 0), (self.pll, 0))
self.connect((self.noaa_hrpt_deframer_0, 0), (self.gr_file_sink_0, 0))
self.connect((self.noaa_hrpt_deframer_0, 0), (self.noaa_hrpt_decoder_0, 0))
- self.connect((self.noaa_hrpt_bit_sync_0, 0), (self.noaa_hrpt_deframer_0, 0))
+ self.connect((self.gr_binary_slicer_fb_0, 0), (self.noaa_hrpt_deframer_0, 0))
def set_decim(self, decim):
self.decim = decim
diff --git a/gr-noaa/apps/file_rx_hrpt.grc b/gr-noaa/apps/file_rx_hrpt.grc
index fea53f8004..f341437569 100644
--- a/gr-noaa/apps/file_rx_hrpt.grc
+++ b/gr-noaa/apps/file_rx_hrpt.grc
@@ -1,6 +1,6 @@
<?xml version='1.0' encoding='ASCII'?>
<flow_graph>
- <timestamp>Sun Nov 1 19:26:11 2009</timestamp>
+ <timestamp>Mon Nov 2 08:30:47 2009</timestamp>
<block>
<key>options</key>
<param>
@@ -237,25 +237,6 @@
<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>(762, 975)</value>
- </param>
- <param>
- <key>_rotation</key>
- <value>0</value>
- </param>
- </block>
<block>
<key>gr_file_sink</key>
<param>
@@ -287,44 +268,6 @@
<value>0</value>
</param>
</block>
- <block>
- <key>noaa_hrpt_bit_sync</key>
- <param>
- <key>id</key>
- <value>noaa_hrpt_bit_sync_0</value>
- </param>
- <param>
- <key>_enabled</key>
- <value>True</value>
- </param>
- <param>
- <key>_coordinate</key>
- <value>(571, 975)</value>
- </param>
- <param>
- <key>_rotation</key>
- <value>0</value>
- </param>
- </block>
- <block>
- <key>gr_binary_slicer_fb</key>
- <param>
- <key>id</key>
- <value>gr_binary_slicer_fb_0</value>
- </param>
- <param>
- <key>_enabled</key>
- <value>True</value>
- </param>
- <param>
- <key>_coordinate</key>
- <value>(393, 975)</value>
- </param>
- <param>
- <key>_rotation</key>
- <value>0</value>
- </param>
- </block>
<block>
<key>virtual_source</key>
<param>
@@ -1167,18 +1110,44 @@
<value>0</value>
</param>
</block>
- <connection>
- <source_block_id>noaa_hrpt_bit_sync_0</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>gr_binary_slicer_fb_0</source_block_id>
- <sink_block_id>noaa_hrpt_bit_sync_0</sink_block_id>
- <source_key>0</source_key>
- <sink_key>0</sink_key>
- </connection>
+ <block>
+ <key>gr_binary_slicer_fb</key>
+ <param>
+ <key>id</key>
+ <value>gr_binary_slicer_fb_0</value>
+ </param>
+ <param>
+ <key>_enabled</key>
+ <value>True</value>
+ </param>
+ <param>
+ <key>_coordinate</key>
+ <value>(393, 975)</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>(762, 975)</value>
+ </param>
+ <param>
+ <key>_rotation</key>
+ <value>0</value>
+ </param>
+ </block>
<connection>
<source_block_id>virtual_source_0</source_block_id>
<sink_block_id>gr_binary_slicer_fb_0</sink_block_id>
@@ -1251,4 +1220,10 @@
<source_key>0</source_key>
<sink_key>0</sink_key>
</connection>
+ <connection>
+ <source_block_id>gr_binary_slicer_fb_0</source_block_id>
+ <sink_block_id>deframer</sink_block_id>
+ <source_key>0</source_key>
+ <sink_key>0</sink_key>
+ </connection>
</flow_graph>
diff --git a/gr-noaa/apps/file_rx_hrpt.py b/gr-noaa/apps/file_rx_hrpt.py
index c1491ca0e3..1513141ec4 100755
--- a/gr-noaa/apps/file_rx_hrpt.py
+++ b/gr-noaa/apps/file_rx_hrpt.py
@@ -2,7 +2,7 @@
##################################################
# Gnuradio Python Flow Graph
# Title: USRP HRPT Receiver
-# Generated: Sun Nov 1 19:26:11 2009
+# Generated: Mon Nov 2 08:30:47 2009
##################################################
from gnuradio import eng_notation
@@ -146,7 +146,6 @@ class file_rx_hrpt(grc_wxgui.top_block_gui):
self.gr_file_source_0 = gr.file_source(gr.sizeof_short*1, input_filename, False)
self.gr_interleaved_short_to_complex_0 = gr.interleaved_short_to_complex()
self.gr_moving_average_xx_0 = gr.moving_average_ff(hs, 1.0/hs, 4000)
- self.noaa_hrpt_bit_sync_0 = noaa.hrpt_bit_sync()
self.pll = noaa.hrpt_pll_cf(pll_alpha, pll_alpha**2/4.0, max_carrier_offset)
self.rx_fft = fftsink2.fft_sink_c(
self.displays.GetPage(0).GetWin(),
@@ -170,8 +169,6 @@ class file_rx_hrpt(grc_wxgui.top_block_gui):
##################################################
# Connections
##################################################
- self.connect((self.noaa_hrpt_bit_sync_0, 0), (self.deframer, 0))
- self.connect((self.gr_binary_slicer_fb_0, 0), (self.noaa_hrpt_bit_sync_0, 0))
self.connect((self.gr_clock_recovery_mm_xx_0, 0), (self.gr_binary_slicer_fb_0, 0))
self.connect((self.deframer, 0), (self.frame_sink, 0))
self.connect((self.deframer, 0), (self.decoder, 0))
@@ -183,6 +180,7 @@ class file_rx_hrpt(grc_wxgui.top_block_gui):
self.connect((self.gr_interleaved_short_to_complex_0, 0), (self.agc, 0))
self.connect((self.throttle, 0), (self.gr_interleaved_short_to_complex_0, 0))
self.connect((self.gr_file_source_0, 0), (self.throttle, 0))
+ self.connect((self.gr_binary_slicer_fb_0, 0), (self.deframer, 0))
def set_input_filename(self, input_filename):
self.input_filename = input_filename
diff --git a/gr-noaa/apps/usrp_rx_hrpt.grc b/gr-noaa/apps/usrp_rx_hrpt.grc
index da2f417802..ac7a87a160 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 Nov 1 19:28:12 2009</timestamp>
+ <timestamp>Mon Nov 2 08:31:09 2009</timestamp>
<block>
<key>options</key>
<param>
@@ -870,25 +870,6 @@
<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>(762, 975)</value>
- </param>
- <param>
- <key>_rotation</key>
- <value>0</value>
- </param>
- </block>
<block>
<key>gr_file_sink</key>
<param>
@@ -920,44 +901,6 @@
<value>0</value>
</param>
</block>
- <block>
- <key>noaa_hrpt_bit_sync</key>
- <param>
- <key>id</key>
- <value>noaa_hrpt_bit_sync_0</value>
- </param>
- <param>
- <key>_enabled</key>
- <value>True</value>
- </param>
- <param>
- <key>_coordinate</key>
- <value>(571, 975)</value>
- </param>
- <param>
- <key>_rotation</key>
- <value>0</value>
- </param>
- </block>
- <block>
- <key>gr_binary_slicer_fb</key>
- <param>
- <key>id</key>
- <value>gr_binary_slicer_fb_0</value>
- </param>
- <param>
- <key>_enabled</key>
- <value>True</value>
- </param>
- <param>
- <key>_coordinate</key>
- <value>(393, 975)</value>
- </param>
- <param>
- <key>_rotation</key>
- <value>0</value>
- </param>
- </block>
<block>
<key>virtual_source</key>
<param>
@@ -1384,18 +1327,44 @@
<value>0</value>
</param>
</block>
- <connection>
- <source_block_id>noaa_hrpt_bit_sync_0</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>gr_binary_slicer_fb_0</source_block_id>
- <sink_block_id>noaa_hrpt_bit_sync_0</sink_block_id>
- <source_key>0</source_key>
- <sink_key>0</sink_key>
- </connection>
+ <block>
+ <key>gr_binary_slicer_fb</key>
+ <param>
+ <key>id</key>
+ <value>gr_binary_slicer_fb_0</value>
+ </param>
+ <param>
+ <key>_enabled</key>
+ <value>True</value>
+ </param>
+ <param>
+ <key>_coordinate</key>
+ <value>(393, 975)</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>(762, 975)</value>
+ </param>
+ <param>
+ <key>_rotation</key>
+ <value>0</value>
+ </param>
+ </block>
<connection>
<source_block_id>virtual_source_0</source_block_id>
<sink_block_id>gr_binary_slicer_fb_0</sink_block_id>
@@ -1456,4 +1425,10 @@
<source_key>0</source_key>
<sink_key>0</sink_key>
</connection>
+ <connection>
+ <source_block_id>gr_binary_slicer_fb_0</source_block_id>
+ <sink_block_id>deframer</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 c1d0fd6e91..a5f9a8e946 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 Nov 1 19:28:13 2009
+# Generated: Mon Nov 2 08:31:10 2009
##################################################
from gnuradio import eng_notation
@@ -205,7 +205,6 @@ class usrp_rx_hrpt(grc_wxgui.top_block_gui):
self.gr_binary_slicer_fb_0 = gr.binary_slicer_fb()
self.gr_clock_recovery_mm_xx_0 = gr.clock_recovery_mm_ff(sps/2.0, clock_alpha**2/4.0, 0.5, clock_alpha, max_clock_offset)
self.gr_moving_average_xx_0 = gr.moving_average_ff(hs, 1.0/hs, 4000)
- self.noaa_hrpt_bit_sync_0 = noaa.hrpt_bit_sync()
self.pll = noaa.hrpt_pll_cf(pll_alpha, pll_alpha**2/4.0, max_carrier_offset)
self.rx_fft = fftsink2.fft_sink_c(
self.displays.GetPage(0).GetWin(),
@@ -232,8 +231,6 @@ class usrp_rx_hrpt(grc_wxgui.top_block_gui):
##################################################
# Connections
##################################################
- self.connect((self.noaa_hrpt_bit_sync_0, 0), (self.deframer, 0))
- self.connect((self.gr_binary_slicer_fb_0, 0), (self.noaa_hrpt_bit_sync_0, 0))
self.connect((self.gr_clock_recovery_mm_xx_0, 0), (self.gr_binary_slicer_fb_0, 0))
self.connect((self.deframer, 0), (self.frame_sink, 0))
self.connect((self.deframer, 0), (self.decoder, 0))
@@ -243,6 +240,7 @@ class usrp_rx_hrpt(grc_wxgui.top_block_gui):
self.connect((self.agc, 0), (self.pll, 0))
self.connect((self.usrp_source, 0), (self.agc, 0))
self.connect((self.agc, 0), (self.rx_fft, 0))
+ self.connect((self.gr_binary_slicer_fb_0, 0), (self.deframer, 0))
def set_config_filename(self, config_filename):
self.config_filename = config_filename
diff --git a/gr-noaa/apps/usrp_rx_hrpt_nogui.grc b/gr-noaa/apps/usrp_rx_hrpt_nogui.grc
index 918a954bd6..02d509f08d 100644
--- a/gr-noaa/apps/usrp_rx_hrpt_nogui.grc
+++ b/gr-noaa/apps/usrp_rx_hrpt_nogui.grc
@@ -1,6 +1,6 @@
<?xml version='1.0' encoding='ASCII'?>
<flow_graph>
- <timestamp>Sun Nov 1 19:32:32 2009</timestamp>
+ <timestamp>Mon Nov 2 08:31:35 2009</timestamp>
<block>
<key>options</key>
<param>
@@ -771,25 +771,6 @@
<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>(815, 673)</value>
- </param>
- <param>
- <key>_rotation</key>
- <value>0</value>
- </param>
- </block>
<block>
<key>gr_file_sink</key>
<param>
@@ -822,18 +803,22 @@
</param>
</block>
<block>
- <key>noaa_hrpt_bit_sync</key>
+ <key>virtual_source</key>
<param>
<key>id</key>
- <value>noaa_hrpt_bit_sync_0</value>
+ <value>virtual_source_0</value>
</param>
<param>
<key>_enabled</key>
<value>True</value>
</param>
+ <param>
+ <key>stream_id</key>
+ <value>baseband</value>
+ </param>
<param>
<key>_coordinate</key>
- <value>(624, 673)</value>
+ <value>(226, 669)</value>
</param>
<param>
<key>_rotation</key>
@@ -841,10 +826,10 @@
</param>
</block>
<block>
- <key>gr_binary_slicer_fb</key>
+ <key>noaa_hrpt_decoder</key>
<param>
<key>id</key>
- <value>gr_binary_slicer_fb_0</value>
+ <value>decoder</value>
</param>
<param>
<key>_enabled</key>
@@ -852,7 +837,7 @@
</param>
<param>
<key>_coordinate</key>
- <value>(446, 673)</value>
+ <value>(1027, 623)</value>
</param>
<param>
<key>_rotation</key>
@@ -860,22 +845,18 @@
</param>
</block>
<block>
- <key>virtual_source</key>
+ <key>gr_binary_slicer_fb</key>
<param>
<key>id</key>
- <value>virtual_source_0</value>
+ <value>gr_binary_slicer_fb_0</value>
</param>
<param>
<key>_enabled</key>
<value>True</value>
</param>
- <param>
- <key>stream_id</key>
- <value>baseband</value>
- </param>
<param>
<key>_coordinate</key>
- <value>(226, 669)</value>
+ <value>(446, 673)</value>
</param>
<param>
<key>_rotation</key>
@@ -883,10 +864,10 @@
</param>
</block>
<block>
- <key>noaa_hrpt_decoder</key>
+ <key>noaa_hrpt_deframer</key>
<param>
<key>id</key>
- <value>decoder</value>
+ <value>deframer</value>
</param>
<param>
<key>_enabled</key>
@@ -894,7 +875,7 @@
</param>
<param>
<key>_coordinate</key>
- <value>(1027, 623)</value>
+ <value>(815, 673)</value>
</param>
<param>
<key>_rotation</key>
@@ -931,18 +912,6 @@
<source_key>0</source_key>
<sink_key>0</sink_key>
</connection>
- <connection>
- <source_block_id>noaa_hrpt_bit_sync_0</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>gr_binary_slicer_fb_0</source_block_id>
- <sink_block_id>noaa_hrpt_bit_sync_0</sink_block_id>
- <source_key>0</source_key>
- <sink_key>0</sink_key>
- </connection>
<connection>
<source_block_id>virtual_source_0</source_block_id>
<sink_block_id>gr_binary_slicer_fb_0</sink_block_id>
@@ -961,4 +930,10 @@
<source_key>0</source_key>
<sink_key>0</sink_key>
</connection>
+ <connection>
+ <source_block_id>gr_binary_slicer_fb_0</source_block_id>
+ <sink_block_id>deframer</sink_block_id>
+ <source_key>0</source_key>
+ <sink_key>0</sink_key>
+ </connection>
</flow_graph>
diff --git a/gr-noaa/apps/usrp_rx_hrpt_nogui.py b/gr-noaa/apps/usrp_rx_hrpt_nogui.py
index 33259a2313..4dc32dbda9 100755
--- a/gr-noaa/apps/usrp_rx_hrpt_nogui.py
+++ b/gr-noaa/apps/usrp_rx_hrpt_nogui.py
@@ -2,7 +2,7 @@
##################################################
# Gnuradio Python Flow Graph
# Title: Usrp Rx Hrpt Nogui
-# Generated: Sun Nov 1 19:32:32 2009
+# Generated: Mon Nov 2 08:31:35 2009
##################################################
from gnuradio import eng_notation
@@ -76,7 +76,6 @@ class usrp_rx_hrpt_nogui(gr.top_block):
self.gr_binary_slicer_fb_0 = gr.binary_slicer_fb()
self.gr_clock_recovery_mm_xx_0 = gr.clock_recovery_mm_ff(sps/2.0, clock_alpha**2/4.0, 0.5, clock_alpha, max_clock_offset)
self.gr_moving_average_xx_0 = gr.moving_average_ff(hs, 1.0/hs, 4000)
- self.noaa_hrpt_bit_sync_0 = noaa.hrpt_bit_sync()
self.pll = noaa.hrpt_pll_cf(pll_alpha, pll_alpha**2/4.0, max_carrier_offset)
self.usrp_source = grc_usrp.simple_source_c(which=0, side=side, rx_ant="RXA")
self.usrp_source.set_decim_rate(decim)
@@ -90,11 +89,10 @@ class usrp_rx_hrpt_nogui(gr.top_block):
self.connect((self.agc, 0), (self.pll, 0))
self.connect((self.pll, 0), (self.gr_moving_average_xx_0, 0))
self.connect((self.gr_moving_average_xx_0, 0), (self.gr_clock_recovery_mm_xx_0, 0))
- self.connect((self.noaa_hrpt_bit_sync_0, 0), (self.deframer, 0))
- self.connect((self.gr_binary_slicer_fb_0, 0), (self.noaa_hrpt_bit_sync_0, 0))
self.connect((self.gr_clock_recovery_mm_xx_0, 0), (self.gr_binary_slicer_fb_0, 0))
self.connect((self.deframer, 0), (self.frame_sink, 0))
self.connect((self.deframer, 0), (self.decoder, 0))
+ self.connect((self.gr_binary_slicer_fb_0, 0), (self.deframer, 0))
def set_config_filename(self, config_filename):
self.config_filename = config_filename
--
cgit v1.2.3