Changed synchronizer to output sliced bits.

author: Johnathan Corgan <jcorgan@corganenterprises.com> 2009-09-08 16:52:37 -0700
committer: Johnathan Corgan <jcorgan@corganenterprises.com> 2009-09-20 09:39:27 -0700
commit: b7d1c551fb374a0e5219fbb4d118f3f19f448393 (patch)
tree: d8635c7eea59530f07b5c8ca2c43980c38cd0d8a /gr-noaa
parent: 65bcd58b65219408268e5db1b8fbafb2d3ccc215 (diff)
10 files changed, 263 insertions, 287 deletions
diff --git a/gr-noaa/grc/Makefile.am b/gr-noaa/grc/Makefile.am
index fa2c40c88b..e56bd354d0 100644
--- a/gr-noaa/grc/Makefile.am
+++ b/gr-noaa/grc/Makefile.am
@@ -29,7 +29,7 @@ dist_bin_SCRIPTS = \
 
 dist_grcblocks_DATA = \
 	noaa_hrpt_pll_cf.xml \
-	noaa_hrpt_sync_ff.xml
+	noaa_hrpt_sync_fb.xml
 
 EXTRA_DIST = \
 	usrp_rx_hrpt.grc \
diff --git a/gr-noaa/grc/noaa_hrpt_sync_ff.xml b/gr-noaa/grc/noaa_hrpt_sync_fb.xml
index 91b83ad5de..e066e34894 100644
--- a/gr-noaa/grc/noaa_hrpt_sync_ff.xml
+++ b/gr-noaa/grc/noaa_hrpt_sync_fb.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0"?>
 <block>
   <name>HRPT SYNC</name>
-  <key>noaa_hrpt_sync_ff</key>
+  <key>noaa_hrpt_sync_fb</key>
   <category>NOAA</category>
   <import>from gnuradio import noaa</import>
-  <make>noaa.hrpt_sync_ff($alpha, $beta, $sps, $max_offset)</make>
+  <make>noaa.hrpt_sync_fb($alpha, $beta, $sps, $max_offset)</make>
   <callback>set_alpha($alpha)</callback>
   <callback>set_beta($beta)</callback>
   <callback>set_max_offset($max_offset)</callback>
@@ -34,6 +34,6 @@
   </sink>
   <source>
     <name>out</name>
-    <type>float</type>
+    <type>byte</type>
   </source>
 </block>
diff --git a/gr-noaa/grc/usrp_rx_hrpt.grc b/gr-noaa/grc/usrp_rx_hrpt.grc
index 41aa1958e5..25b1335322 100644
--- a/gr-noaa/grc/usrp_rx_hrpt.grc
+++ b/gr-noaa/grc/usrp_rx_hrpt.grc
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='ASCII'?>
 <flow_graph>
-  <timestamp>Mon Sep  7 13:05:09 2009</timestamp>
+  <timestamp>Tue Sep  8 14:57:48 2009</timestamp>
   <block>
     <key>options</key>
     <param>
@@ -222,144 +222,6 @@
     </param>
   </block>
   <block>
-    <key>wxgui_fftsink2</key>
-    <param>
-      <key>id</key>
-      <value>rx_fftsink</value>
-    </param>
-    <param>
-      <key>_enabled</key>
-      <value>True</value>
-    </param>
-    <param>
-      <key>type</key>
-      <value>complex</value>
-    </param>
-    <param>
-      <key>title</key>
-      <value>RX Spectrum</value>
-    </param>
-    <param>
-      <key>samp_rate</key>
-      <value>sample_rate</value>
-    </param>
-    <param>
-      <key>baseband_freq</key>
-      <value>1698e6</value>
-    </param>
-    <param>
-      <key>y_per_div</key>
-      <value>5</value>
-    </param>
-    <param>
-      <key>y_divs</key>
-      <value>8</value>
-    </param>
-    <param>
-      <key>ref_level</key>
-      <value>20</value>
-    </param>
-    <param>
-      <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>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>(433, 297)</value>
-    </param>
-    <param>
-      <key>_rotation</key>
-      <value>0</value>
-    </param>
-  </block>
-  <block>
-    <key>wxgui_scopesink2</key>
-    <param>
-      <key>id</key>
-      <value>wxgui_scopesink2_0</value>
-    </param>
-    <param>
-      <key>_enabled</key>
-      <value>True</value>
-    </param>
-    <param>
-      <key>type</key>
-      <value>complex</value>
-    </param>
-    <param>
-      <key>title</key>
-      <value>RX Waveform</value>
-    </param>
-    <param>
-      <key>samp_rate</key>
-      <value>sample_rate</value>
-    </param>
-    <param>
-      <key>v_scale</key>
-      <value>0</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>1, 0, 1, 1</value>
-    </param>
-    <param>
-      <key>notebook</key>
-      <value>displays, 0</value>
-    </param>
-    <param>
-      <key>_coordinate</key>
-      <value>(434, 603)</value>
-    </param>
-    <param>
-      <key>_rotation</key>
-      <value>0</value>
-    </param>
-  </block>
-  <block>
     <key>variable_slider</key>
     <param>
       <key>id</key>
@@ -590,62 +452,61 @@
     </param>
   </block>
   <block>
-    <key>wxgui_scopesink2</key>
+    <key>virtual_source</key>
     <param>
       <key>id</key>
-      <value>wxgui_scopesink2_0_0</value>
+      <value>virtual_source_0</value>
     </param>
     <param>
       <key>_enabled</key>
       <value>True</value>
     </param>
     <param>
-      <key>type</key>
-      <value>float</value>
-    </param>
-    <param>
-      <key>title</key>
-      <value>Post-PLL</value>
+      <key>stream_id</key>
+      <value>bits</value>
     </param>
     <param>
-      <key>samp_rate</key>
-      <value>sample_rate</value>
+      <key>_coordinate</key>
+      <value>(283, 919)</value>
     </param>
     <param>
-      <key>v_scale</key>
-      <value>0.5</value>
+      <key>_rotation</key>
+      <value>0</value>
     </param>
+  </block>
+  <block>
+    <key>notebook</key>
     <param>
-      <key>t_scale</key>
-      <value>20.0/sample_rate</value>
+      <key>id</key>
+      <value>displays</value>
     </param>
     <param>
-      <key>ac_couple</key>
-      <value>False</value>
+      <key>_enabled</key>
+      <value>True</value>
     </param>
     <param>
-      <key>xy_mode</key>
-      <value>False</value>
+      <key>style</key>
+      <value>wx.NB_TOP</value>
     </param>
     <param>
-      <key>num_inputs</key>
-      <value>1</value>
+      <key>labels</key>
+      <value>['RX','PLL/SYNC']</value>
     </param>
     <param>
       <key>grid_pos</key>
-      <value>0, 0, 1, 1</value>
+      <value>1, 0, 1, 2</value>
     </param>
     <param>
       <key>notebook</key>
-      <value>displays, 1</value>
+      <value></value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(618, 335)</value>
+      <value>(9, 99)</value>
     </param>
     <param>
       <key>_rotation</key>
-      <value>180</value>
+      <value>0</value>
     </param>
   </block>
   <block>
@@ -680,10 +541,10 @@
     </param>
   </block>
   <block>
-    <key>noaa_hrpt_sync_ff</key>
+    <key>noaa_hrpt_sync_fb</key>
     <param>
       <key>id</key>
-      <value>noaa_hrpt_sync_ff_0</value>
+      <value>noaa_hrpt_sync_fb_0</value>
     </param>
     <param>
       <key>_enabled</key>
@@ -691,11 +552,11 @@
     </param>
     <param>
       <key>alpha</key>
-      <value>.005</value>
+      <value>0.001</value>
     </param>
     <param>
       <key>beta</key>
-      <value>.005*.005/4.0</value>
+      <value>0.001**2/4.0</value>
     </param>
     <param>
       <key>sps</key>
@@ -707,7 +568,7 @@
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(876, 494)</value>
+      <value>(856, 494)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -715,18 +576,22 @@
     </param>
   </block>
   <block>
-    <key>gr_binary_slicer_fb</key>
+    <key>virtual_sink</key>
     <param>
       <key>id</key>
-      <value>gr_binary_slicer_fb_0</value>
+      <value>virtual_sink_1</value>
     </param>
     <param>
       <key>_enabled</key>
       <value>True</value>
     </param>
     <param>
+      <key>stream_id</key>
+      <value>bits</value>
+    </param>
+    <param>
       <key>_coordinate</key>
-      <value>(1108, 522)</value>
+      <value>(1126, 518)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -734,22 +599,18 @@
     </param>
   </block>
   <block>
-    <key>virtual_sink</key>
+    <key>gr_char_to_float</key>
     <param>
       <key>id</key>
-      <value>virtual_sink_1</value>
+      <value>gr_char_to_float_0</value>
     </param>
     <param>
       <key>_enabled</key>
       <value>True</value>
     </param>
     <param>
-      <key>stream_id</key>
-      <value>bits</value>
-    </param>
-    <param>
       <key>_coordinate</key>
-      <value>(1289, 518)</value>
+      <value>(477, 923)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -757,22 +618,22 @@
     </param>
   </block>
   <block>
-    <key>gr_file_sink</key>
+    <key>gr_add_const_vxx</key>
     <param>
       <key>id</key>
-      <value>gr_file_sink_0</value>
+      <value>gr_add_const_vxx_0</value>
     </param>
     <param>
       <key>_enabled</key>
       <value>True</value>
     </param>
     <param>
-      <key>file</key>
-      <value>bits.dat</value>
+      <key>type</key>
+      <value>float</value>
     </param>
     <param>
-      <key>type</key>
-      <value>byte</value>
+      <key>const</key>
+      <value>48.0</value>
     </param>
     <param>
       <key>vlen</key>
@@ -780,7 +641,7 @@
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(981, 919)</value>
+      <value>(692, 919)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -788,10 +649,10 @@
     </param>
   </block>
   <block>
-    <key>gr_char_to_float</key>
+    <key>gr_float_to_char</key>
     <param>
       <key>id</key>
-      <value>gr_char_to_float_0</value>
+      <value>gr_float_to_char_0</value>
     </param>
     <param>
       <key>_enabled</key>
@@ -799,7 +660,7 @@
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(477, 923)</value>
+      <value>(848, 923)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -807,18 +668,30 @@
     </param>
   </block>
   <block>
-    <key>gr_float_to_char</key>
+    <key>gr_file_sink</key>
     <param>
       <key>id</key>
-      <value>gr_float_to_char_0</value>
+      <value>gr_file_sink_0</value>
     </param>
     <param>
       <key>_enabled</key>
       <value>True</value>
     </param>
     <param>
+      <key>file</key>
+      <value>bits.dat</value>
+    </param>
+    <param>
+      <key>type</key>
+      <value>byte</value>
+    </param>
+    <param>
+      <key>vlen</key>
+      <value>1</value>
+    </param>
+    <param>
       <key>_coordinate</key>
-      <value>(809, 923)</value>
+      <value>(1020, 919)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -826,10 +699,10 @@
     </param>
   </block>
   <block>
-    <key>gr_add_const_vxx</key>
+    <key>wxgui_scopesink2</key>
     <param>
       <key>id</key>
-      <value>gr_add_const_vxx_0</value>
+      <value>wxgui_scopesink2_0_0_0_0</value>
     </param>
     <param>
       <key>_enabled</key>
@@ -840,39 +713,123 @@
       <value>float</value>
     </param>
     <param>
-      <key>const</key>
-      <value>48.0</value>
+      <key>title</key>
+      <value>Post-SYNC</value>
     </param>
     <param>
-      <key>vlen</key>
+      <key>samp_rate</key>
+      <value>sym_rate</value>
+    </param>
+    <param>
+      <key>v_scale</key>
+      <value>0.5</value>
+    </param>
+    <param>
+      <key>t_scale</key>
+      <value>20.0/sym_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>1, 0, 1, 1</value>
+    </param>
+    <param>
+      <key>notebook</key>
+      <value>displays, 1</value>
+    </param>
+    <param>
       <key>_coordinate</key>
-      <value>(653, 919)</value>
+      <value>(452, 990)</value>
     </param>
     <param>
       <key>_rotation</key>
-      <value>0</value>
+      <value>180</value>
     </param>
   </block>
   <block>
-    <key>virtual_source</key>
+    <key>wxgui_fftsink2</key>
     <param>
       <key>id</key>
-      <value>virtual_source_0</value>
+      <value>rx_fftsink</value>
     </param>
     <param>
       <key>_enabled</key>
       <value>True</value>
     </param>
     <param>
-      <key>stream_id</key>
-      <value>bits</value>
+      <key>type</key>
+      <value>complex</value>
+    </param>
+    <param>
+      <key>title</key>
+      <value>RX Spectrum</value>
+    </param>
+    <param>
+      <key>samp_rate</key>
+      <value>sample_rate</value>
+    </param>
+    <param>
+      <key>baseband_freq</key>
+      <value>1698e6</value>
+    </param>
+    <param>
+      <key>y_per_div</key>
+      <value>5</value>
+    </param>
+    <param>
+      <key>y_divs</key>
+      <value>8</value>
+    </param>
+    <param>
+      <key>ref_level</key>
+      <value>20</value>
+    </param>
+    <param>
+      <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>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>(283, 919)</value>
+      <value>(434, 269)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -883,7 +840,7 @@
     <key>wxgui_scopesink2</key>
     <param>
       <key>id</key>
-      <value>wxgui_scopesink2_0_0_0_0</value>
+      <value>wxgui_scopesink2_0</value>
     </param>
     <param>
       <key>_enabled</key>
@@ -891,23 +848,23 @@
     </param>
     <param>
       <key>type</key>
-      <value>float</value>
+      <value>complex</value>
     </param>
     <param>
       <key>title</key>
-      <value>Post-SYNC</value>
+      <value>RX Waveform</value>
     </param>
     <param>
       <key>samp_rate</key>
-      <value>sym_rate</value>
+      <value>sample_rate</value>
     </param>
     <param>
       <key>v_scale</key>
-      <value>0.5</value>
+      <value>0</value>
     </param>
     <param>
       <key>t_scale</key>
-      <value>20.0/sym_rate</value>
+      <value>20.0/sample_rate</value>
     </param>
     <param>
       <key>ac_couple</key>
@@ -927,50 +884,74 @@
     </param>
     <param>
       <key>notebook</key>
-      <value>displays, 1</value>
+      <value>displays, 0</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(872, 607)</value>
+      <value>(433, 570)</value>
     </param>
     <param>
       <key>_rotation</key>
-      <value>180</value>
+      <value>0</value>
     </param>
   </block>
   <block>
-    <key>notebook</key>
+    <key>wxgui_scopesink2</key>
     <param>
       <key>id</key>
-      <value>displays</value>
+      <value>wxgui_scopesink2_0_0</value>
     </param>
     <param>
       <key>_enabled</key>
       <value>True</value>
     </param>
     <param>
-      <key>style</key>
-      <value>wx.NB_TOP</value>
+      <key>type</key>
+      <value>float</value>
     </param>
     <param>
-      <key>labels</key>
-      <value>['RX','PLL/SYNC']</value>
+      <key>title</key>
+      <value>Post-PLL</value>
+    </param>
+    <param>
+      <key>samp_rate</key>
+      <value>sample_rate</value>
+    </param>
+    <param>
+      <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>1, 0, 1, 2</value>
+      <value>0, 0, 1, 1</value>
     </param>
     <param>
       <key>notebook</key>
-      <value></value>
+      <value>displays, 1</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(9, 99)</value>
+      <value>(618, 335)</value>
     </param>
     <param>
       <key>_rotation</key>
-      <value>0</value>
+      <value>180</value>
     </param>
   </block>
   <connection>
@@ -998,12 +979,6 @@
     <sink_key>0</sink_key>
   </connection>
   <connection>
-    <source_block_id>gr_binary_slicer_fb_0</source_block_id>
-    <sink_block_id>virtual_sink_1</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>noaa_hrpt_pll_cf_0</sink_block_id>
     <source_key>0</source_key>
@@ -1016,32 +991,32 @@
     <sink_key>0</sink_key>
   </connection>
   <connection>
-    <source_block_id>noaa_hrpt_pll_cf_0</source_block_id>
-    <sink_block_id>noaa_hrpt_sync_ff_0</sink_block_id>
+    <source_block_id>virtual_source_0</source_block_id>
+    <sink_block_id>gr_char_to_float_0</sink_block_id>
     <source_key>0</source_key>
     <sink_key>0</sink_key>
   </connection>
   <connection>
-    <source_block_id>noaa_hrpt_sync_ff_0</source_block_id>
-    <sink_block_id>gr_binary_slicer_fb_0</sink_block_id>
+    <source_block_id>noaa_hrpt_pll_cf_0</source_block_id>
+    <sink_block_id>noaa_hrpt_sync_fb_0</sink_block_id>
     <source_key>0</source_key>
     <sink_key>0</sink_key>
   </connection>
   <connection>
-    <source_block_id>noaa_hrpt_sync_ff_0</source_block_id>
-    <sink_block_id>wxgui_scopesink2_0_0_0_0</sink_block_id>
+    <source_block_id>noaa_hrpt_sync_fb_0</source_block_id>
+    <sink_block_id>virtual_sink_1</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_char_to_float_0</sink_block_id>
+    <source_block_id>gr_char_to_float_0</source_block_id>
+    <sink_block_id>wxgui_scopesink2_0_0_0_0</sink_block_id>
     <source_key>0</source_key>
     <sink_key>0</sink_key>
   </connection>
   <connection>
-    <source_block_id>gr_float_to_char_0</source_block_id>
-    <sink_block_id>gr_file_sink_0</sink_block_id>
+    <source_block_id>gr_char_to_float_0</source_block_id>
+    <sink_block_id>gr_add_const_vxx_0</sink_block_id>
     <source_key>0</source_key>
     <sink_key>0</sink_key>
   </connection>
@@ -1052,8 +1027,8 @@
     <sink_key>0</sink_key>
   </connection>
   <connection>
-    <source_block_id>gr_char_to_float_0</source_block_id>
-    <sink_block_id>gr_add_const_vxx_0</sink_block_id>
+    <source_block_id>gr_float_to_char_0</source_block_id>
+    <sink_block_id>gr_file_sink_0</sink_block_id>
     <source_key>0</source_key>
     <sink_key>0</sink_key>
   </connection>
diff --git a/gr-noaa/grc/usrp_rx_hrpt.py b/gr-noaa/grc/usrp_rx_hrpt.py
index 74e3526706..10e2f31c04 100755
--- a/gr-noaa/grc/usrp_rx_hrpt.py
+++ b/gr-noaa/grc/usrp_rx_hrpt.py
@@ -2,7 +2,7 @@
 ##################################################
 # Gnuradio Python Flow Graph
 # Title: USRP HRPT Receiver
-# Generated: Mon Sep  7 13:05:09 2009
+# Generated: Tue Sep  8 14:58:57 2009
 ##################################################
 
 from gnuradio import eng_notation
@@ -99,12 +99,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_add_const_vxx_0 = gr.add_const_vff((48.0, ))
-		self.gr_binary_slicer_fb_0 = gr.binary_slicer_fb()
 		self.gr_char_to_float_0 = gr.char_to_float()
 		self.gr_file_sink_0 = gr.file_sink(gr.sizeof_char*1, "bits.dat")
 		self.gr_float_to_char_0 = gr.float_to_char()
 		self.noaa_hrpt_pll_cf_0 = noaa.hrpt_pll_cf(pll_alpha, pll_alpha**2/4.0, max_carrier_offset)
-		self.noaa_hrpt_sync_ff_0 = noaa.hrpt_sync_ff(.005, .005*.005/4.0, sps, max_sync_offset)
+		self.noaa_hrpt_sync_fb_0 = noaa.hrpt_sync_fb(0.001, 0.001**2/4.0, sps, max_sync_offset)
 		self.rx_fftsink = fftsink2.fft_sink_c(
 			self.displays.GetPage(0).GetWin(),
 			baseband_freq=1698e6,
@@ -166,13 +165,12 @@ class usrp_rx_hrpt(grc_wxgui.top_block_gui):
 		self.connect((self.agr, 0), (self.wxgui_scopesink2_0, 0))
 		self.connect((self.agr, 0), (self.noaa_hrpt_pll_cf_0, 0))
 		self.connect((self.noaa_hrpt_pll_cf_0, 0), (self.wxgui_scopesink2_0_0, 0))
-		self.connect((self.noaa_hrpt_pll_cf_0, 0), (self.noaa_hrpt_sync_ff_0, 0))
-		self.connect((self.noaa_hrpt_sync_ff_0, 0), (self.gr_binary_slicer_fb_0, 0))
-		self.connect((self.noaa_hrpt_sync_ff_0, 0), (self.wxgui_scopesink2_0_0_0_0, 0))
-		self.connect((self.gr_binary_slicer_fb_0, 0), (self.gr_char_to_float_0, 0))
-		self.connect((self.gr_float_to_char_0, 0), (self.gr_file_sink_0, 0))
-		self.connect((self.gr_add_const_vxx_0, 0), (self.gr_float_to_char_0, 0))
+		self.connect((self.noaa_hrpt_sync_fb_0, 0), (self.gr_char_to_float_0, 0))
+		self.connect((self.noaa_hrpt_pll_cf_0, 0), (self.noaa_hrpt_sync_fb_0, 0))
+		self.connect((self.gr_char_to_float_0, 0), (self.wxgui_scopesink2_0_0_0_0, 0))
 		self.connect((self.gr_char_to_float_0, 0), (self.gr_add_const_vxx_0, 0))
+		self.connect((self.gr_add_const_vxx_0, 0), (self.gr_float_to_char_0, 0))
+		self.connect((self.gr_float_to_char_0, 0), (self.gr_file_sink_0, 0))
 
 	def set_decim(self, decim):
 		self.decim = decim
@@ -186,9 +184,9 @@ class usrp_rx_hrpt(grc_wxgui.top_block_gui):
 	def set_sample_rate(self, sample_rate):
 		self.sample_rate = sample_rate
 		self.set_sps(self.sample_rate/self.sym_rate)
+		self.set_max_carrier_offset(2*math.pi*100e3/self.sample_rate)
 		self.rx_fftsink.set_sample_rate(self.sample_rate)
 		self.wxgui_scopesink2_0.set_sample_rate(self.sample_rate)
-		self.set_max_carrier_offset(2*math.pi*100e3/self.sample_rate)
 		self.wxgui_scopesink2_0_0.set_sample_rate(self.sample_rate)
 
 	def set_sps(self, sps):
@@ -209,7 +207,7 @@ class usrp_rx_hrpt(grc_wxgui.top_block_gui):
 
 	def set_max_sync_offset(self, max_sync_offset):
 		self.max_sync_offset = max_sync_offset
-		self.noaa_hrpt_sync_ff_0.set_max_offset(self.max_sync_offset)
+		self.noaa_hrpt_sync_fb_0.set_max_offset(self.max_sync_offset)
 
 	def set_max_carrier_offset(self, max_carrier_offset):
 		self.max_carrier_offset = max_carrier_offset
diff --git a/gr-noaa/lib/Makefile.am b/gr-noaa/lib/Makefile.am
index 913638783d..1b758871a4 100644
--- a/gr-noaa/lib/Makefile.am
+++ b/gr-noaa/lib/Makefile.am
@@ -30,7 +30,7 @@ lib_LTLIBRARIES = \
 
 libgnuradio_noaa_la_SOURCES = \
 	noaa_hrpt_pll_cf.cc \
-	noaa_hrpt_sync_ff.cc
+	noaa_hrpt_sync_fb.cc
 
 libgnuradio_noaa_la_LIBADD = \
 	$(GNURADIO_CORE_LA)
@@ -39,4 +39,4 @@ libgnuradio_noaa_la_LDFLAGS = $(NO_UNDEFINED) -version-info 0:0:0
 
 grinclude_HEADERS = \
 	noaa_hrpt_pll_cf.h \
-	noaa_hrpt_sync_ff.h
+	noaa_hrpt_sync_fb.h
diff --git a/gr-noaa/lib/noaa_hrpt_sync_ff.cc b/gr-noaa/lib/noaa_hrpt_sync_fb.cc
index f17ad54dce..f99947f827 100644
--- a/gr-noaa/lib/noaa_hrpt_sync_ff.cc
+++ b/gr-noaa/lib/noaa_hrpt_sync_fb.cc
@@ -24,7 +24,7 @@
 #include "config.h"
 #endif
 
-#include <noaa_hrpt_sync_ff.h>
+#include <noaa_hrpt_sync_fb.h>
 #include <gr_io_signature.h>
 
 inline int signum(float f)
@@ -32,16 +32,16 @@ inline int signum(float f)
   return f >= 0.0 ? 1 : -1;
 }
 
-noaa_hrpt_sync_ff_sptr
-noaa_make_hrpt_sync_ff(float alpha, float beta, float sps, float max_offset)
+noaa_hrpt_sync_fb_sptr
+noaa_make_hrpt_sync_fb(float alpha, float beta, float sps, float max_offset)
 {
-  return gnuradio::get_initial_sptr(new noaa_hrpt_sync_ff(alpha, beta, sps, max_offset));
+  return gnuradio::get_initial_sptr(new noaa_hrpt_sync_fb(alpha, beta, sps, max_offset));
 }
 
-noaa_hrpt_sync_ff::noaa_hrpt_sync_ff(float alpha, float beta, float sps, float max_offset)
-  : gr_block("noaa_hrpt_sync_ff",
+noaa_hrpt_sync_fb::noaa_hrpt_sync_fb(float alpha, float beta, float sps, float max_offset)
+  : gr_block("noaa_hrpt_sync_fb",
 	     gr_make_io_signature(1, 1, sizeof(float)),
-	     gr_make_io_signature(1, 1, sizeof(float))),
+	     gr_make_io_signature(1, 1, sizeof(char))),
     d_alpha(alpha), d_beta(beta), 
     d_sps(sps), d_max_offset(max_offset),
     d_phase(0.0), d_freq(1.0/sps),
@@ -50,14 +50,14 @@ noaa_hrpt_sync_ff::noaa_hrpt_sync_ff(float alpha, float beta, float sps, float m
 }
 
 int
-noaa_hrpt_sync_ff::general_work(int noutput_items,
+noaa_hrpt_sync_fb::general_work(int noutput_items,
 				gr_vector_int &ninput_items,
 				gr_vector_const_void_star &input_items,
 				gr_vector_void_star &output_items)
 {
   int ninputs = ninput_items[0];
-  const float *in = (const float *) input_items[0];
-  float *out = (float *) output_items[0];
+  const float *in = (const float *)input_items[0];
+  char *out = (char *)output_items[0];
 
   int i = 0, j = 0;
   while (i < ninputs && j < noutput_items) {
@@ -77,7 +77,10 @@ noaa_hrpt_sync_ff::general_work(int noutput_items,
     }
 
     if (d_phase > 1.0) {
-      out[j++] = -sample;	// Invert sense, -68 degrees=1
+      if (sample < 0.0)
+	out[j++] = 1;
+      else
+	out[j++] = 0;
       d_phase -= 1.0;
     }
   }
diff --git a/gr-noaa/lib/noaa_hrpt_sync_ff.h b/gr-noaa/lib/noaa_hrpt_sync_fb.h
index 51502698b6..a9416b9ead 100644
--- a/gr-noaa/lib/noaa_hrpt_sync_ff.h
+++ b/gr-noaa/lib/noaa_hrpt_sync_fb.h
@@ -20,21 +20,21 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#ifndef INCLUDED_NOAA_HRPT_SYNC_FF_H
-#define INCLUDED_NOAA_HRPT_SYNC_FF_H
+#ifndef INCLUDED_NOAA_HRPT_SYNC_FB_H
+#define INCLUDED_NOAA_HRPT_SYNC_FB_H
 
-#include <gr_sync_block.h>
+#include <gr_block.h>
 
-class noaa_hrpt_sync_ff;
-typedef boost::shared_ptr<noaa_hrpt_sync_ff> noaa_hrpt_sync_ff_sptr;
+class noaa_hrpt_sync_fb;
+typedef boost::shared_ptr<noaa_hrpt_sync_fb> noaa_hrpt_sync_fb_sptr;
 
-noaa_hrpt_sync_ff_sptr
-noaa_make_hrpt_sync_ff(float alpha, float beta, float sps, float max_offset);
+noaa_hrpt_sync_fb_sptr
+noaa_make_hrpt_sync_fb(float alpha, float beta, float sps, float max_offset);
 
-class noaa_hrpt_sync_ff : public gr_block
+class noaa_hrpt_sync_fb : public gr_block
 {
-  friend noaa_hrpt_sync_ff_sptr noaa_make_hrpt_sync_ff(float alpha, float beta, float sps, float max_offset);
-  noaa_hrpt_sync_ff(float alpha, float beta, float sps, float max_offset);
+  friend noaa_hrpt_sync_fb_sptr noaa_make_hrpt_sync_fb(float alpha, float beta, float sps, float max_offset);
+  noaa_hrpt_sync_fb(float alpha, float beta, float sps, float max_offset);
 
   float d_alpha;		// 1st order loop constant
   float d_beta;			// 2nd order loop constant
@@ -55,4 +55,4 @@ class noaa_hrpt_sync_ff : public gr_block
   void set_max_offset(float max_offset) { d_max_offset = max_offset; }
 };
 
-#endif /* INCLUDED_NOAA_HRPT_SYNC_FF_H */
+#endif /* INCLUDED_NOAA_HRPT_SYNC_FB_H */
diff --git a/gr-noaa/swig/Makefile.am b/gr-noaa/swig/Makefile.am
index 2f98738ca0..e1584227f2 100644
--- a/gr-noaa/swig/Makefile.am
+++ b/gr-noaa/swig/Makefile.am
@@ -54,7 +54,7 @@ noaa_swig_python = \
 noaa_swig_swiginclude_headers =	\
 	noaa_swig.i \
 	noaa_hrpt_pll_cf.i \
-	noaa_hrpt_sync_ff.i
+	noaa_hrpt_sync_fb.i
 
 include $(top_srcdir)/Makefile.swig
 
diff --git a/gr-noaa/swig/noaa_hrpt_sync_ff.i b/gr-noaa/swig/noaa_hrpt_sync_fb.i
index f3b1594ba3..a8e5b21ddb 100644
--- a/gr-noaa/swig/noaa_hrpt_sync_ff.i
+++ b/gr-noaa/swig/noaa_hrpt_sync_fb.i
@@ -20,15 +20,15 @@
  * Boston, MA 02110-1301, USA.
  */
 
-GR_SWIG_BLOCK_MAGIC(noaa,hrpt_sync_ff)
+GR_SWIG_BLOCK_MAGIC(noaa,hrpt_sync_fb)
 
-noaa_hrpt_sync_ff_sptr
-noaa_make_hrpt_sync_ff(float alpha, float beta, float sps, float max_offset);
+noaa_hrpt_sync_fb_sptr
+noaa_make_hrpt_sync_fb(float alpha, float beta, float sps, float max_offset);
 
-class noaa_hrpt_sync_ff : public gr_sync_block
+class noaa_hrpt_sync_fb : public gr_sync_block
 {
 private:
-  noaa_hrpt_sync_ff();
+  noaa_hrpt_sync_fb();
 
 public:
   void set_alpha(float alpha);
diff --git a/gr-noaa/swig/noaa_swig.i b/gr-noaa/swig/noaa_swig.i
index a3e5dd7839..8223eedb99 100644
--- a/gr-noaa/swig/noaa_swig.i
+++ b/gr-noaa/swig/noaa_swig.i
@@ -24,8 +24,8 @@
 
 %{
 #include <noaa_hrpt_pll_cf.h>
-#include <noaa_hrpt_sync_ff.h>
+#include <noaa_hrpt_sync_fb.h>
 %}
 
 %include "noaa_hrpt_pll_cf.i"
-%include "noaa_hrpt_sync_ff.i"
+%include "noaa_hrpt_sync_fb.i"
author	Johnathan Corgan <jcorgan@corganenterprises.com>	2009-09-08 16:52:37 -0700
committer	Johnathan Corgan <jcorgan@corganenterprises.com>	2009-09-20 09:39:27 -0700
commit	b7d1c551fb374a0e5219fbb4d118f3f19f448393 (patch)
tree	d8635c7eea59530f07b5c8ca2c43980c38cd0d8a /gr-noaa
parent	65bcd58b65219408268e5db1b8fbafb2d3ccc215 (diff)