gr-noaa: Combined noaa_hrpt_bit_sync into noaa_hrpt_deframer

[debian/gnuradio] / gr-noaa / apps / usrp_rx_hrpt.py

diff --git a/gr-noaa/apps/usrp_rx_hrpt.py b/gr-noaa/apps/usrp_rx_hrpt.py
index c1d0fd6e915afbbc37dbd8b1f4c09dc8fb9549bf..a5f9a8e946148febdbca5407b72e0b754cd39e14 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 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