Implemented crude timing recovery using zero crossings but no resampling

1 files changed, 236 insertions, 277 deletions

diff --git a/gr-noaa/grc/usrp_rx_hrpt.grc b/gr-noaa/grc/usrp_rx_hrpt.grc
index d3c6603ad..b304bd359 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>Sat Aug 29 11:48:56 2009</timestamp>
+  <timestamp>Sat Aug 29 13:16:19 2009</timestamp>
   <block>
     <key>options</key>
     <param>
@@ -257,85 +257,56 @@
     </param>
   </block>
   <block>
-    <key>wxgui_fftsink2</key>
+    <key>variable</key>
     <param>
       <key>id</key>
-      <value>rx_fftsink</value>
+      <value>max_carrier_offset</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>
+      <key>value</key>
+      <value>2*math.pi*100e3/sample_rate</value>
     </param>
     <param>
-      <key>fft_size</key>
-      <value>1024</value>
+      <key>_coordinate</key>
+      <value>(668, 107)</value>
     </param>
     <param>
-      <key>fft_rate</key>
-      <value>30</value>
+      <key>_rotation</key>
+      <value>0</value>
     </param>
+  </block>
+  <block>
+    <key>variable</key>
     <param>
-      <key>peak_hold</key>
-      <value>False</value>
+      <key>id</key>
+      <value>max_sync_offset</value>
     </param>
     <param>
-      <key>average</key>
+      <key>_enabled</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>
+      <key>value</key>
+      <value>0.01</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(194, 263)</value>
+      <value>(665, 173)</value>
     </param>
     <param>
       <key>_rotation</key>
-      <value>180</value>
+      <value>0</value>
     </param>
   </block>
   <block>
     <key>wxgui_scopesink2</key>
     <param>
       <key>id</key>
-      <value>wxgui_scopesink2_0</value>
+      <value>wxgui_scopesink2_0_0</value>
     </param>
     <param>
       <key>_enabled</key>
@@ -347,7 +318,7 @@
     </param>
     <param>
       <key>title</key>
-      <value>RX Waveform</value>
+      <value>Post-PLL</value>
     </param>
     <param>
       <key>samp_rate</key>
@@ -355,7 +326,7 @@
     </param>
     <param>
       <key>v_scale</key>
-      <value>0</value>
+      <value>0.5</value>
     </param>
     <param>
       <key>t_scale</key>
@@ -375,15 +346,15 @@
     </param>
     <param>
       <key>grid_pos</key>
-      <value>1, 0, 1, 1</value>
+      <value>0, 0, 1, 1</value>
     </param>
     <param>
       <key>notebook</key>
-      <value>displays, 0</value>
+      <value>displays, 1</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(198, 609)</value>
+      <value>(618, 335)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -391,38 +362,34 @@
     </param>
   </block>
   <block>
-    <key>gr_agc_xx</key>
+    <key>notebook</key>
     <param>
       <key>id</key>
-      <value>agr</value>
+      <value>displays</value>
     </param>
     <param>
       <key>_enabled</key>
       <value>True</value>
     </param>
     <param>
-      <key>type</key>
-      <value>complex</value>
-    </param>
-    <param>
-      <key>rate</key>
-      <value>1e-6</value>
+      <key>style</key>
+      <value>wx.NB_TOP</value>
     </param>
     <param>
-      <key>reference</key>
-      <value>1.0</value>
+      <key>labels</key>
+      <value>['RX','PLL','SYNC']</value>
     </param>
     <param>
-      <key>gain</key>
-      <value>1.0</value>
+      <key>grid_pos</key>
+      <value>1, 0, 1, 2</value>
     </param>
     <param>
-      <key>max_gain</key>
-      <value>1.0</value>
+      <key>notebook</key>
+      <value></value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(261, 494)</value>
+      <value>(9, 99)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -430,10 +397,10 @@
     </param>
   </block>
   <block>
-    <key>gr_moving_average_xx</key>
+    <key>wxgui_scopesink2</key>
     <param>
       <key>id</key>
-      <value>gr_moving_average_xx_0</value>
+      <value>wxgui_scopesink2_0_0_0</value>
     </param>
     <param>
       <key>_enabled</key>
@@ -444,66 +411,79 @@
       <value>complex</value>
     </param>
     <param>
-      <key>length</key>
-      <value>hs</value>
+      <key>title</key>
+      <value>Post-PLL</value>
     </param>
     <param>
-      <key>scale</key>
-      <value>1.0/hs</value>
+      <key>samp_rate</key>
+      <value>sample_rate</value>
     </param>
     <param>
-      <key>max_iter</key>
-      <value>4000</value>
+      <key>v_scale</key>
+      <value>0.5</value>
     </param>
     <param>
-      <key>_coordinate</key>
-      <value>(434, 502)</value>
+      <key>t_scale</key>
+      <value>20.0/sample_rate</value>
     </param>
     <param>
-      <key>_rotation</key>
-      <value>0</value>
+      <key>ac_couple</key>
+      <value>False</value>
     </param>
-  </block>
-  <block>
-    <key>variable</key>
     <param>
-      <key>id</key>
-      <value>max_carrier_offset</value>
+      <key>xy_mode</key>
+      <value>True</value>
     </param>
     <param>
-      <key>_enabled</key>
-      <value>True</value>
+      <key>num_inputs</key>
+      <value>1</value>
     </param>
     <param>
-      <key>value</key>
-      <value>2*math.pi*100e3/sample_rate</value>
+      <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>(668, 107)</value>
+      <value>(618, 614)</value>
     </param>
     <param>
       <key>_rotation</key>
-      <value>0</value>
+      <value>180</value>
     </param>
   </block>
   <block>
-    <key>variable</key>
+    <key>noaa_hrpt_sync_cc</key>
     <param>
       <key>id</key>
-      <value>max_sync_offset</value>
+      <value>sync</value>
     </param>
     <param>
       <key>_enabled</key>
       <value>True</value>
     </param>
     <param>
-      <key>value</key>
-      <value>0.01</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>(665, 173)</value>
+      <value>(865, 494)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -511,140 +491,156 @@
     </param>
   </block>
   <block>
-    <key>variable_slider</key>
+    <key>wxgui_scopesink2</key>
     <param>
       <key>id</key>
-      <value>pll_alpha</value>
+      <value>wxgui_scopesink2_0_0_0_0</value>
     </param>
     <param>
       <key>_enabled</key>
       <value>True</value>
     </param>
     <param>
-      <key>label</key>
-      <value>PLL Alpha</value>
+      <key>type</key>
+      <value>complex</value>
     </param>
     <param>
-      <key>value</key>
-      <value>0.005</value>
+      <key>title</key>
+      <value>Post-SYNC</value>
     </param>
     <param>
-      <key>min</key>
-      <value>0.0</value>
+      <key>samp_rate</key>
+      <value>sym_rate</value>
     </param>
     <param>
-      <key>max</key>
+      <key>v_scale</key>
       <value>0.5</value>
     </param>
     <param>
-      <key>num_steps</key>
-      <value>500</value>
+      <key>t_scale</key>
+      <value>20.0/sym_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>True</value>
+    </param>
+    <param>
+      <key>num_inputs</key>
+      <value>1</value>
     </param>
     <param>
       <key>grid_pos</key>
-      <value>0, 0, 1, 1</value>
+      <value>1, 0, 1, 1</value>
     </param>
     <param>
       <key>notebook</key>
-      <value></value>
+      <value>displays, 2</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(192, 100)</value>
+      <value>(872, 607)</value>
     </param>
     <param>
       <key>_rotation</key>
-      <value>0</value>
+      <value>180</value>
     </param>
   </block>
   <block>
-    <key>variable_slider</key>
+    <key>wxgui_scopesink2</key>
     <param>
       <key>id</key>
-      <value>sync_alpha</value>
+      <value>wxgui_scopesink2_0_0_1</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.005</value>
+      <key>title</key>
+      <value>Post-SYNC</value>
     </param>
     <param>
-      <key>min</key>
-      <value>0.0</value>
+      <key>samp_rate</key>
+      <value>sym_rate</value>
     </param>
     <param>
-      <key>max</key>
+      <key>v_scale</key>
       <value>0.5</value>
     </param>
     <param>
-      <key>num_steps</key>
-      <value>500</value>
+      <key>t_scale</key>
+      <value>20.0/sym_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>0, 0, 1, 1</value>
     </param>
     <param>
       <key>notebook</key>
-      <value></value>
+      <value>displays, 2</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(344, 101)</value>
+      <value>(872, 341)</value>
     </param>
     <param>
       <key>_rotation</key>
-      <value>0</value>
+      <value>180</value>
     </param>
   </block>
   <block>
-    <key>noaa_hrpt_pll_cc</key>
+    <key>gr_agc_xx</key>
     <param>
       <key>id</key>
-      <value>noaa_hrpt_pll_cc_0</value>
+      <value>agr</value>
     </param>
     <param>
       <key>_enabled</key>
       <value>True</value>
     </param>
     <param>
-      <key>alpha</key>
-      <value>pll_alpha</value>
+      <key>type</key>
+      <value>complex</value>
     </param>
     <param>
-      <key>beta</key>
-      <value>pll_alpha**2/4.0</value>
+      <key>rate</key>
+      <value>1e-6</value>
     </param>
     <param>
-      <key>max_offset</key>
-      <value>max_carrier_offset</value>
+      <key>reference</key>
+      <value>1.0</value>
+    </param>
+    <param>
+      <key>gain</key>
+      <value>1.0</value>
+    </param>
+    <param>
+      <key>max_gain</key>
+      <value>1.0</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(628, 502)</value>
+      <value>(261, 494)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -652,69 +648,41 @@
     </param>
   </block>
   <block>
-    <key>wxgui_scopesink2</key>
+    <key>noaa_hrpt_pll_cc</key>
     <param>
       <key>id</key>
-      <value>wxgui_scopesink2_0_0</value>
+      <value>noaa_hrpt_pll_cc_0</value>
     </param>
     <param>
       <key>_enabled</key>
       <value>True</value>
     </param>
     <param>
-      <key>type</key>
-      <value>complex</value>
-    </param>
-    <param>
-      <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>
+      <key>alpha</key>
+      <value>pll_alpha</value>
     </param>
     <param>
-      <key>grid_pos</key>
-      <value>0, 0, 1, 1</value>
+      <key>beta</key>
+      <value>pll_alpha**2/4.0</value>
     </param>
     <param>
-      <key>notebook</key>
-      <value>displays, 1</value>
+      <key>max_offset</key>
+      <value>max_carrier_offset</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(618, 335)</value>
+      <value>(628, 502)</value>
     </param>
     <param>
       <key>_rotation</key>
-      <value>180</value>
+      <value>0</value>
     </param>
   </block>
   <block>
-    <key>wxgui_scopesink2</key>
+    <key>wxgui_fftsink2</key>
     <param>
       <key>id</key>
-      <value>wxgui_scopesink2_0_0_1</value>
+      <value>rx_fftsink</value>
     </param>
     <param>
       <key>_enabled</key>
@@ -726,78 +694,59 @@
     </param>
     <param>
       <key>title</key>
-      <value>Post-SYNC</value>
+      <value>RX Spectrum</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>
+      <key>baseband_freq</key>
+      <value>1698e6</value>
     </param>
     <param>
-      <key>num_inputs</key>
-      <value>1</value>
+      <key>y_per_div</key>
+      <value>5</value>
     </param>
     <param>
-      <key>grid_pos</key>
-      <value>0, 0, 1, 1</value>
+      <key>y_divs</key>
+      <value>8</value>
     </param>
     <param>
-      <key>notebook</key>
-      <value>displays, 2</value>
+      <key>ref_level</key>
+      <value>20</value>
     </param>
     <param>
-      <key>_coordinate</key>
-      <value>(872, 341)</value>
+      <key>fft_size</key>
+      <value>1024</value>
     </param>
     <param>
-      <key>_rotation</key>
-      <value>180</value>
+      <key>fft_rate</key>
+      <value>30</value>
     </param>
-  </block>
-  <block>
-    <key>notebook</key>
     <param>
-      <key>id</key>
-      <value>displays</value>
+      <key>peak_hold</key>
+      <value>False</value>
     </param>
     <param>
-      <key>_enabled</key>
+      <key>average</key>
       <value>True</value>
     </param>
     <param>
-      <key>style</key>
-      <value>wx.NB_TOP</value>
-    </param>
-    <param>
-      <key>labels</key>
-      <value>['RX','PLL','SYNC']</value>
+      <key>avg_alpha</key>
+      <value>0.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, 0</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(9, 99)</value>
+      <value>(433, 297)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -808,7 +757,7 @@
     <key>wxgui_scopesink2</key>
     <param>
       <key>id</key>
-      <value>wxgui_scopesink2_0_0_0</value>
+      <value>wxgui_scopesink2_0</value>
     </param>
     <param>
       <key>_enabled</key>
@@ -820,7 +769,7 @@
     </param>
     <param>
       <key>title</key>
-      <value>Post-PLL</value>
+      <value>RX Waveform</value>
     </param>
     <param>
       <key>samp_rate</key>
@@ -828,7 +777,7 @@
     </param>
     <param>
       <key>v_scale</key>
-      <value>0.5</value>
+      <value>0</value>
     </param>
     <param>
       <key>t_scale</key>
@@ -840,7 +789,7 @@
     </param>
     <param>
       <key>xy_mode</key>
-      <value>True</value>
+      <value>False</value>
     </param>
     <param>
       <key>num_inputs</key>
@@ -852,46 +801,66 @@
     </param>
     <param>
       <key>notebook</key>
-      <value>displays, 1</value>
+      <value>displays, 0</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(618, 614)</value>
+      <value>(434, 603)</value>
     </param>
     <param>
       <key>_rotation</key>
-      <value>180</value>
+      <value>0</value>
     </param>
   </block>
   <block>
-    <key>noaa_hrpt_sync_cc</key>
+    <key>variable_slider</key>
     <param>
       <key>id</key>
-      <value>sync</value>
+      <value>pll_alpha</value>
     </param>
     <param>
       <key>_enabled</key>
       <value>True</value>
     </param>
     <param>
-      <key>alpha</key>
-      <value>sync_alpha</value>
+      <key>label</key>
+      <value>PLL Alpha</value>
     </param>
     <param>
-      <key>beta</key>
-      <value>sync_alpha**2/4.0</value>
+      <key>value</key>
+      <value>0.001</value>
     </param>
     <param>
-      <key>sps</key>
-      <value>sps</value>
+      <key>min</key>
+      <value>0.0</value>
     </param>
     <param>
-      <key>max_offset</key>
-      <value>max_sync_offset</value>
+      <key>max</key>
+      <value>0.5</value>
+    </param>
+    <param>
+      <key>num_steps</key>
+      <value>500</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>
+    </param>
+    <param>
+      <key>notebook</key>
+      <value></value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(865, 494)</value>
+      <value>(192, 100)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -899,62 +868,58 @@
     </param>
   </block>
   <block>
-    <key>wxgui_scopesink2</key>
+    <key>variable_slider</key>
     <param>
       <key>id</key>
-      <value>wxgui_scopesink2_0_0_0_0</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>title</key>
-      <value>Post-SYNC</value>
+      <key>value</key>
+      <value>0.001</value>
     </param>
     <param>
-      <key>samp_rate</key>
-      <value>sample_rate</value>
+      <key>min</key>
+      <value>0.0</value>
     </param>
     <param>
-      <key>v_scale</key>
+      <key>max</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>
+      <key>num_steps</key>
+      <value>500</value>
     </param>
     <param>
-      <key>xy_mode</key>
-      <value>True</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, 2</value>
+      <value></value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(872, 607)</value>
+      <value>(344, 101)</value>
     </param>
     <param>
       <key>_rotation</key>
-      <value>180</value>
+      <value>0</value>
     </param>
   </block>
   <connection>
@@ -971,12 +936,6 @@
   </connection>
   <connection>
     <source_block_id>agr</source_block_id>
-    <sink_block_id>gr_moving_average_xx_0</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_key>0</source_key>
     <sink_key>0</sink_key>
@@ -988,12 +947,6 @@
     <sink_key>0</sink_key>
   </connection>
   <connection>
-    <source_block_id>gr_moving_average_xx_0</source_block_id>
-    <sink_block_id>noaa_hrpt_pll_cc_0</sink_block_id>
-    <source_key>0</source_key>
-    <sink_key>0</sink_key>
-  </connection>
-  <connection>
     <source_block_id>noaa_hrpt_pll_cc_0</source_block_id>
     <sink_block_id>wxgui_scopesink2_0_0</sink_block_id>
     <source_key>0</source_key>
@@ -1023,4 +976,10 @@
     <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_cc_0</sink_block_id>
+    <source_key>0</source_key>
+    <sink_key>0</sink_key>
+  </connection>
 </flow_graph>