fec: wip: allowing ber block to be used as a streaming block.

author: Tom Rondeau <tom@trondeau.com> 2014-04-13 15:29:01 -0400
committer: Tom Rondeau <tom@trondeau.com> 2014-05-17 17:45:13 -0400
commit: e6fe7b1151dbf1ff056c267dbb887a81e8504a8e (patch)
tree: f1c3fe2f8d38459ea44aa5c60e6db0b736679686
parent: 941ce6ab00b60bc9d4dea598226e37af8c04538a (diff)
5 files changed, 703 insertions, 528 deletions
diff --git a/gr-digital/examples/demod/fec_corr_and_sync.grc b/gr-digital/examples/demod/fec_corr_and_sync.grc
index a9b177fdbb..dae7094552 100644
--- a/gr-digital/examples/demod/fec_corr_and_sync.grc
+++ b/gr-digital/examples/demod/fec_corr_and_sync.grc
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='ASCII'?>
 <flow_graph>
-  <timestamp>Fri Mar 28 16:25:09 2014</timestamp>
+  <timestamp>Thu Apr 10 11:46:45 2014</timestamp>
   <block>
     <key>options</key>
     <param>
@@ -64,7 +64,7 @@
     <key>variable</key>
     <param>
       <key>id</key>
-      <value>bb_filter</value>
+      <value>framebits</value>
     </param>
     <param>
       <key>_enabled</key>
@@ -72,11 +72,11 @@
     </param>
     <param>
       <key>value</key>
-      <value>firdes.root_raised_cosine(sps, sps, 1, eb, 101)</value>
+      <value>payload_size*8</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(509, 16)</value>
+      <value>(148, 1020)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -87,7 +87,7 @@
     <key>variable</key>
     <param>
       <key>id</key>
-      <value>matched_filter</value>
+      <value>rate</value>
     </param>
     <param>
       <key>_enabled</key>
@@ -95,11 +95,11 @@
     </param>
     <param>
       <key>value</key>
-      <value>firdes.root_raised_cosine(nfilts, nfilts, 1, eb, int(11*sps*nfilts))</value>
+      <value>2</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(510, 87)</value>
+      <value>(175, 948)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -110,7 +110,7 @@
     <key>variable</key>
     <param>
       <key>id</key>
-      <value>preamble</value>
+      <value>polys</value>
     </param>
     <param>
       <key>_enabled</key>
@@ -118,11 +118,11 @@
     </param>
     <param>
       <key>value</key>
-      <value>[1,-1,1,-1,1,1,-1,-1,1,1,-1,1,1,1,-1,1,1,-1,1,-1,-1,1,-1,-1,1,1,1,-1,-1,-1,1,-1,1,1,1,1,-1,-1,1,-1,1,-1,-1,-1,1,1,-1,-1,-1,-1,1,-1,-1,-1,-1,-1,1,1,1,1,1,1,-1,-1]</value>
+      <value>[79, 109]</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(317, 16)</value>
+      <value>(34, 1020)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -133,7 +133,7 @@
     <key>variable</key>
     <param>
       <key>id</key>
-      <value>sps</value>
+      <value>k</value>
     </param>
     <param>
       <key>_enabled</key>
@@ -141,11 +141,11 @@
     </param>
     <param>
       <key>value</key>
-      <value>4</value>
+      <value>7</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(328, 87)</value>
+      <value>(93, 947)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -156,7 +156,7 @@
     <key>variable</key>
     <param>
       <key>id</key>
-      <value>eb</value>
+      <value>bb_filter</value>
     </param>
     <param>
       <key>_enabled</key>
@@ -164,11 +164,11 @@
     </param>
     <param>
       <key>value</key>
-      <value>0.35</value>
+      <value>firdes.root_raised_cosine(sps, sps, 1, eb, 101)</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(409, 87)</value>
+      <value>(509, 16)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -179,7 +179,7 @@
     <key>variable</key>
     <param>
       <key>id</key>
-      <value>gap</value>
+      <value>matched_filter</value>
     </param>
     <param>
       <key>_enabled</key>
@@ -187,11 +187,11 @@
     </param>
     <param>
       <key>value</key>
-      <value>500</value>
+      <value>firdes.root_raised_cosine(nfilts, nfilts, 1, eb, int(11*sps*nfilts))</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(240, 87)</value>
+      <value>(510, 87)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -202,7 +202,7 @@
     <key>variable</key>
     <param>
       <key>id</key>
-      <value>payload_size</value>
+      <value>preamble</value>
     </param>
     <param>
       <key>_enabled</key>
@@ -210,11 +210,11 @@
     </param>
     <param>
       <key>value</key>
-      <value>120</value>
+      <value>[1,-1,1,-1,1,1,-1,-1,1,1,-1,1,1,1,-1,1,1,-1,1,-1,-1,1,-1,-1,1,1,1,-1,-1,-1,1,-1,1,1,1,1,-1,-1,1,-1,1,-1,-1,-1,1,1,-1,-1,-1,-1,1,-1,-1,-1,-1,-1,1,1,1,1,1,1,-1,-1]</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(119, 87)</value>
+      <value>(317, 16)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -225,7 +225,7 @@
     <key>variable</key>
     <param>
       <key>id</key>
-      <value>samp_rate</value>
+      <value>sps</value>
     </param>
     <param>
       <key>_enabled</key>
@@ -233,11 +233,11 @@
     </param>
     <param>
       <key>value</key>
-      <value>100000</value>
+      <value>4</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(11, 86)</value>
+      <value>(328, 87)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -248,7 +248,7 @@
     <key>variable</key>
     <param>
       <key>id</key>
-      <value>rrc_taps</value>
+      <value>eb</value>
     </param>
     <param>
       <key>_enabled</key>
@@ -256,11 +256,11 @@
     </param>
     <param>
       <key>value</key>
-      <value>firdes.root_raised_cosine(nfilts, nfilts, 1.0/float(sps), eb, 5*sps*nfilts)</value>
+      <value>0.35</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(1301, 82)</value>
+      <value>(409, 87)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -271,7 +271,7 @@
     <key>variable</key>
     <param>
       <key>id</key>
-      <value>nfilts</value>
+      <value>gap</value>
     </param>
     <param>
       <key>_enabled</key>
@@ -279,11 +279,11 @@
     </param>
     <param>
       <key>value</key>
-      <value>32</value>
+      <value>500</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(1301, 12)</value>
+      <value>(240, 87)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -294,7 +294,7 @@
     <key>variable</key>
     <param>
       <key>id</key>
-      <value>k</value>
+      <value>payload_size</value>
     </param>
     <param>
       <key>_enabled</key>
@@ -302,11 +302,11 @@
     </param>
     <param>
       <key>value</key>
-      <value>7</value>
+      <value>120</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(93, 878)</value>
+      <value>(119, 87)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -317,7 +317,7 @@
     <key>variable</key>
     <param>
       <key>id</key>
-      <value>polys</value>
+      <value>samp_rate</value>
     </param>
     <param>
       <key>_enabled</key>
@@ -325,11 +325,11 @@
     </param>
     <param>
       <key>value</key>
-      <value>[79, 109]</value>
+      <value>100000</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(34, 951)</value>
+      <value>(11, 86)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -340,7 +340,7 @@
     <key>variable</key>
     <param>
       <key>id</key>
-      <value>rate</value>
+      <value>rrc_taps</value>
     </param>
     <param>
       <key>_enabled</key>
@@ -348,11 +348,11 @@
     </param>
     <param>
       <key>value</key>
-      <value>2</value>
+      <value>firdes.root_raised_cosine(nfilts, nfilts, 1.0/float(sps), eb, 5*sps*nfilts)</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(175, 879)</value>
+      <value>(1301, 82)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -363,7 +363,7 @@
     <key>variable</key>
     <param>
       <key>id</key>
-      <value>framebits</value>
+      <value>nfilts</value>
     </param>
     <param>
       <key>_enabled</key>
@@ -371,11 +371,11 @@
     </param>
     <param>
       <key>value</key>
-      <value>payload_size*8</value>
+      <value>32</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(148, 951)</value>
+      <value>(1301, 12)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -618,108 +618,6 @@
     </param>
   </block>
   <block>
-    <key>blocks_throttle</key>
-    <param>
-      <key>id</key>
-      <value>blocks_throttle_0</value>
-    </param>
-    <param>
-      <key>_enabled</key>
-      <value>True</value>
-    </param>
-    <param>
-      <key>type</key>
-      <value>complex</value>
-    </param>
-    <param>
-      <key>samples_per_second</key>
-      <value>samp_rate</value>
-    </param>
-    <param>
-      <key>vlen</key>
-      <value>1</value>
-    </param>
-    <param>
-      <key>ignoretag</key>
-      <value>True</value>
-    </param>
-    <param>
-      <key>affinity</key>
-      <value></value>
-    </param>
-    <param>
-      <key>minoutbuf</key>
-      <value>0</value>
-    </param>
-    <param>
-      <key>maxoutbuf</key>
-      <value>0</value>
-    </param>
-    <param>
-      <key>_coordinate</key>
-      <value>(321, 188)</value>
-    </param>
-    <param>
-      <key>_rotation</key>
-      <value>0</value>
-    </param>
-  </block>
-  <block>
-    <key>channels_channel_model</key>
-    <param>
-      <key>id</key>
-      <value>channels_channel_model_0</value>
-    </param>
-    <param>
-      <key>_enabled</key>
-      <value>True</value>
-    </param>
-    <param>
-      <key>noise_voltage</key>
-      <value>noise</value>
-    </param>
-    <param>
-      <key>freq_offset</key>
-      <value>freq_offset</value>
-    </param>
-    <param>
-      <key>epsilon</key>
-      <value>time_offset</value>
-    </param>
-    <param>
-      <key>taps</key>
-      <value>1.0</value>
-    </param>
-    <param>
-      <key>seed</key>
-      <value>0</value>
-    </param>
-    <param>
-      <key>block_tags</key>
-      <value>False</value>
-    </param>
-    <param>
-      <key>affinity</key>
-      <value></value>
-    </param>
-    <param>
-      <key>minoutbuf</key>
-      <value>0</value>
-    </param>
-    <param>
-      <key>maxoutbuf</key>
-      <value>0</value>
-    </param>
-    <param>
-      <key>_coordinate</key>
-      <value>(568, 161)</value>
-    </param>
-    <param>
-      <key>_rotation</key>
-      <value>0</value>
-    </param>
-  </block>
-  <block>
     <key>digital_correlate_and_sync_cc</key>
     <param>
       <key>id</key>
@@ -928,61 +826,6 @@
     </param>
   </block>
   <block>
-    <key>variable_qtgui_range</key>
-    <param>
-      <key>id</key>
-      <value>noise</value>
-    </param>
-    <param>
-      <key>_enabled</key>
-      <value>True</value>
-    </param>
-    <param>
-      <key>label</key>
-      <value>Noise</value>
-    </param>
-    <param>
-      <key>value</key>
-      <value>0</value>
-    </param>
-    <param>
-      <key>start</key>
-      <value>0</value>
-    </param>
-    <param>
-      <key>stop</key>
-      <value>2</value>
-    </param>
-    <param>
-      <key>step</key>
-      <value>0.005</value>
-    </param>
-    <param>
-      <key>widget</key>
-      <value>slider</value>
-    </param>
-    <param>
-      <key>orient</key>
-      <value>Qt.Horizontal</value>
-    </param>
-    <param>
-      <key>min_len</key>
-      <value>200</value>
-    </param>
-    <param>
-      <key>gui_hint</key>
-      <value>3,0,1,1</value>
-    </param>
-    <param>
-      <key>_coordinate</key>
-      <value>(704, 14)</value>
-    </param>
-    <param>
-      <key>_rotation</key>
-      <value>0</value>
-    </param>
-  </block>
-  <block>
     <key>blocks_null_sink</key>
     <param>
       <key>id</key>
@@ -1151,88 +994,6 @@
     </param>
   </block>
   <block>
-    <key>digital_correlate_access_code_xx_ts</key>
-    <param>
-      <key>id</key>
-      <value>digital_correlate_access_code_xx_ts_0</value>
-    </param>
-    <param>
-      <key>_enabled</key>
-      <value>True</value>
-    </param>
-    <param>
-      <key>type</key>
-      <value>float</value>
-    </param>
-    <param>
-      <key>access_code</key>
-      <value>0101001100100010010110110001110100001101011100111101111100000011</value>
-    </param>
-    <param>
-      <key>threshold</key>
-      <value>0</value>
-    </param>
-    <param>
-      <key>tagname</key>
-      <value>good</value>
-    </param>
-    <param>
-      <key>affinity</key>
-      <value></value>
-    </param>
-    <param>
-      <key>minoutbuf</key>
-      <value>0</value>
-    </param>
-    <param>
-      <key>maxoutbuf</key>
-      <value>0</value>
-    </param>
-    <param>
-      <key>_coordinate</key>
-      <value>(688, 604)</value>
-    </param>
-    <param>
-      <key>_rotation</key>
-      <value>0</value>
-    </param>
-  </block>
-  <block>
-    <key>digital_constellation_soft_decoder_cf</key>
-    <param>
-      <key>id</key>
-      <value>digital_constellation_soft_decoder_cf_0</value>
-    </param>
-    <param>
-      <key>_enabled</key>
-      <value>True</value>
-    </param>
-    <param>
-      <key>constellation</key>
-      <value>constel</value>
-    </param>
-    <param>
-      <key>affinity</key>
-      <value></value>
-    </param>
-    <param>
-      <key>minoutbuf</key>
-      <value>0</value>
-    </param>
-    <param>
-      <key>maxoutbuf</key>
-      <value>0</value>
-    </param>
-    <param>
-      <key>_coordinate</key>
-      <value>(348, 622)</value>
-    </param>
-    <param>
-      <key>_rotation</key>
-      <value>0</value>
-    </param>
-  </block>
-  <block>
     <key>qtgui_time_sink_x</key>
     <param>
       <key>id</key>
@@ -1823,10 +1584,374 @@
     </param>
   </block>
   <block>
+    <key>blocks_throttle</key>
+    <param>
+      <key>id</key>
+      <value>blocks_throttle_0</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>type</key>
+      <value>complex</value>
+    </param>
+    <param>
+      <key>samples_per_second</key>
+      <value>samp_rate</value>
+    </param>
+    <param>
+      <key>vlen</key>
+      <value>1</value>
+    </param>
+    <param>
+      <key>ignoretag</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>affinity</key>
+      <value></value>
+    </param>
+    <param>
+      <key>minoutbuf</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>maxoutbuf</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(325, 187)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>channels_channel_model</key>
+    <param>
+      <key>id</key>
+      <value>channels_channel_model_0</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>noise_voltage</key>
+      <value>noise</value>
+    </param>
+    <param>
+      <key>freq_offset</key>
+      <value>freq_offset</value>
+    </param>
+    <param>
+      <key>epsilon</key>
+      <value>time_offset</value>
+    </param>
+    <param>
+      <key>taps</key>
+      <value>1.0</value>
+    </param>
+    <param>
+      <key>seed</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>block_tags</key>
+      <value>False</value>
+    </param>
+    <param>
+      <key>affinity</key>
+      <value></value>
+    </param>
+    <param>
+      <key>minoutbuf</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>maxoutbuf</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(568, 163)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>blocks_ctrlport_monitor_performance</key>
+    <param>
+      <key>id</key>
+      <value>blocks_ctrlport_monitor_performance_0</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>False</value>
+    </param>
+    <param>
+      <key>en</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(24, 624)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>digital_constellation_soft_decoder_cf</key>
+    <param>
+      <key>id</key>
+      <value>digital_constellation_soft_decoder_cf_0</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>constellation</key>
+      <value>constel</value>
+    </param>
+    <param>
+      <key>affinity</key>
+      <value></value>
+    </param>
+    <param>
+      <key>minoutbuf</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>maxoutbuf</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(367, 572)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>variable_cc_decoder_def</key>
+    <param>
+      <key>id</key>
+      <value>dec</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>value</key>
+      <value>"ok"</value>
+    </param>
+    <param>
+      <key>ndim</key>
+      <value>1</value>
+    </param>
+    <param>
+      <key>dim1</key>
+      <value>16</value>
+    </param>
+    <param>
+      <key>dim2</key>
+      <value>1</value>
+    </param>
+    <param>
+      <key>framebits</key>
+      <value>framebits</value>
+    </param>
+    <param>
+      <key>k</key>
+      <value>k</value>
+    </param>
+    <param>
+      <key>rate</key>
+      <value>rate</value>
+    </param>
+    <param>
+      <key>polys</key>
+      <value>polys</value>
+    </param>
+    <param>
+      <key>state_start</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>state_end</key>
+      <value>-1</value>
+    </param>
+    <param>
+      <key>strb</key>
+      <value>"terminated"</value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(257, 947)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>parameter</key>
+    <param>
+      <key>id</key>
+      <value>puncpat</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>label</key>
+      <value></value>
+    </param>
+    <param>
+      <key>value</key>
+      <value>'11'</value>
+    </param>
+    <param>
+      <key>type</key>
+      <value>string</value>
+    </param>
+    <param>
+      <key>short_id</key>
+      <value></value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(159, 1091)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>digital_correlate_access_code_xx_ts</key>
+    <param>
+      <key>id</key>
+      <value>digital_correlate_access_code_xx_ts_0</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>type</key>
+      <value>float</value>
+    </param>
+    <param>
+      <key>access_code</key>
+      <value>0101001100100010010110110001110100001101011100111101111100000011</value>
+    </param>
+    <param>
+      <key>threshold</key>
+      <value>3</value>
+    </param>
+    <param>
+      <key>tagname</key>
+      <value>good</value>
+    </param>
+    <param>
+      <key>affinity</key>
+      <value></value>
+    </param>
+    <param>
+      <key>minoutbuf</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>maxoutbuf</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(688, 556)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>mod_with_ac</key>
+    <param>
+      <key>id</key>
+      <value>mod_with_ac_0</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>constel</key>
+      <value>constel</value>
+    </param>
+    <param>
+      <key>eb</key>
+      <value>eb</value>
+    </param>
+    <param>
+      <key>payload_size</key>
+      <value>payload_size</value>
+    </param>
+    <param>
+      <key>gap</key>
+      <value>gap</value>
+    </param>
+    <param>
+      <key>sps</key>
+      <value>sps</value>
+    </param>
+    <param>
+      <key>preamble</key>
+      <value>preamble</value>
+    </param>
+    <param>
+      <key>puncpat</key>
+      <value>'11'</value>
+    </param>
+    <param>
+      <key>affinity</key>
+      <value></value>
+    </param>
+    <param>
+      <key>minoutbuf</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>maxoutbuf</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(68, 297)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
     <key>variable_qtgui_range</key>
     <param>
       <key>id</key>
-      <value>delay</value>
+      <value>noise</value>
     </param>
     <param>
       <key>_enabled</key>
@@ -1834,7 +1959,7 @@
     </param>
     <param>
       <key>label</key>
-      <value>delay</value>
+      <value>Noise</value>
     </param>
     <param>
       <key>value</key>
@@ -1846,11 +1971,11 @@
     </param>
     <param>
       <key>stop</key>
-      <value>200</value>
+      <value>2</value>
     </param>
     <param>
       <key>step</key>
-      <value>1</value>
+      <value>0.005</value>
     </param>
     <param>
       <key>widget</key>
@@ -1866,11 +1991,11 @@
     </param>
     <param>
       <key>gui_hint</key>
-      <value>5,0,1,2</value>
+      <value>3,0,1,1</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(569, 874)</value>
+      <value>(704, 14)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -1878,34 +2003,38 @@
     </param>
   </block>
   <block>
-    <key>parameter</key>
+    <key>blocks_char_to_float</key>
     <param>
       <key>id</key>
-      <value>puncpat</value>
+      <value>blocks_char_to_float_0_0_0_0</value>
     </param>
     <param>
       <key>_enabled</key>
-      <value>True</value>
+      <value>False</value>
     </param>
     <param>
-      <key>label</key>
-      <value></value>
+      <key>vlen</key>
+      <value>1</value>
     </param>
     <param>
-      <key>value</key>
-      <value>'11'</value>
+      <key>scale</key>
+      <value>1</value>
     </param>
     <param>
-      <key>type</key>
-      <value>string</value>
+      <key>affinity</key>
+      <value></value>
     </param>
     <param>
-      <key>short_id</key>
-      <value></value>
+      <key>minoutbuf</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>maxoutbuf</key>
+      <value>0</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(159, 1022)</value>
+      <value>(1132, 472)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -1920,7 +2049,7 @@
     </param>
     <param>
       <key>_enabled</key>
-      <value>True</value>
+      <value>False</value>
     </param>
     <param>
       <key>type</key>
@@ -2212,7 +2341,7 @@
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(1353, 483)</value>
+      <value>(1317, 448)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -2220,22 +2349,65 @@
     </param>
   </block>
   <block>
-    <key>blocks_char_to_float</key>
+    <key>fec_extended_decoder</key>
     <param>
       <key>id</key>
-      <value>blocks_char_to_float_0_0_0_0</value>
+      <value>fec_extended_decoder_0</value>
     </param>
     <param>
       <key>_enabled</key>
       <value>True</value>
     </param>
     <param>
-      <key>vlen</key>
-      <value>1</value>
+      <key>value</key>
+      <value>fec_extended_decoder</value>
     </param>
     <param>
-      <key>scale</key>
-      <value>1</value>
+      <key>decoder_list</key>
+      <value>dec</value>
+    </param>
+    <param>
+      <key>threadtype</key>
+      <value>capillary</value>
+    </param>
+    <param>
+      <key>ann</key>
+      <value>None</value>
+    </param>
+    <param>
+      <key>puncpat</key>
+      <value>puncpat</value>
+    </param>
+    <param>
+      <key>affinity</key>
+      <value></value>
+    </param>
+    <param>
+      <key>minoutbuf</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>maxoutbuf</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(1079, 570)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>digital_binary_slicer_fb</key>
+    <param>
+      <key>id</key>
+      <value>digital_binary_slicer_fb_0</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>False</value>
     </param>
     <param>
       <key>affinity</key>
@@ -2251,7 +2423,7 @@
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(1140, 511)</value>
+      <value>(725, 678)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -2266,7 +2438,7 @@
     </param>
     <param>
       <key>_enabled</key>
-      <value>False</value>
+      <value>True</value>
     </param>
     <param>
       <key>type</key>
@@ -2558,7 +2730,7 @@
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(941, 755)</value>
+      <value>(1349, 808)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -2573,7 +2745,7 @@
     </param>
     <param>
       <key>_enabled</key>
-      <value>False</value>
+      <value>True</value>
     </param>
     <param>
       <key>type</key>
@@ -2601,7 +2773,7 @@
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(766, 770)</value>
+      <value>(1192, 819)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -2609,30 +2781,22 @@
     </param>
   </block>
   <block>
-    <key>blocks_delay</key>
+    <key>fec_ber_bf</key>
     <param>
       <key>id</key>
-      <value>blocks_delay_0</value>
+      <value>fec_ber_bf_0</value>
     </param>
     <param>
       <key>_enabled</key>
-      <value>False</value>
-    </param>
-    <param>
-      <key>type</key>
-      <value>float</value>
-    </param>
-    <param>
-      <key>delay</key>
-      <value>int(delay)</value>
+      <value>True</value>
     </param>
     <param>
-      <key>num_ports</key>
-      <value>1</value>
+      <key>berminerrors</key>
+      <value>100</value>
     </param>
     <param>
-      <key>vlen</key>
-      <value>1</value>
+      <key>berlimit</key>
+      <value>-7.0</value>
     </param>
     <param>
       <key>affinity</key>
@@ -2648,7 +2812,7 @@
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(576, 808)</value>
+      <value>(1125, 916)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -2656,159 +2820,130 @@
     </param>
   </block>
   <block>
-    <key>blocks_char_to_float</key>
+    <key>qtgui_number_sink</key>
     <param>
       <key>id</key>
-      <value>blocks_char_to_float_0_0_0</value>
+      <value>qtgui_number_sink_0</value>
     </param>
     <param>
       <key>_enabled</key>
-      <value>False</value>
-    </param>
-    <param>
-      <key>vlen</key>
-      <value>1</value>
-    </param>
-    <param>
-      <key>scale</key>
-      <value>1</value>
+      <value>True</value>
     </param>
     <param>
-      <key>affinity</key>
-      <value></value>
+      <key>type</key>
+      <value>float</value>
     </param>
     <param>
-      <key>minoutbuf</key>
-      <value>0</value>
+      <key>autoscale</key>
+      <value>False</value>
     </param>
     <param>
-      <key>maxoutbuf</key>
+      <key>avg</key>
       <value>0</value>
     </param>
     <param>
-      <key>_coordinate</key>
-      <value>(558, 753)</value>
-    </param>
-    <param>
-      <key>_rotation</key>
-      <value>0</value>
+      <key>graph_type</key>
+      <value>qtgui.NUM_GRAPH_HORIZ</value>
     </param>
-  </block>
-  <block>
-    <key>blocks_char_to_float</key>
     <param>
-      <key>id</key>
-      <value>blocks_char_to_float_0</value>
+      <key>nconnections</key>
+      <value>1</value>
     </param>
     <param>
-      <key>_enabled</key>
-      <value>False</value>
+      <key>min</key>
+      <value>-1</value>
     </param>
     <param>
-      <key>vlen</key>
+      <key>max</key>
       <value>1</value>
     </param>
     <param>
-      <key>scale</key>
-      <value>1</value>
+      <key>update_time</key>
+      <value>0.10</value>
     </param>
     <param>
-      <key>affinity</key>
+      <key>gui_hint</key>
       <value></value>
     </param>
     <param>
-      <key>minoutbuf</key>
-      <value>0</value>
-    </param>
-    <param>
-      <key>maxoutbuf</key>
-      <value>0</value>
+      <key>label1</key>
+      <value></value>
     </param>
     <param>
-      <key>_coordinate</key>
-      <value>(344, 808)</value>
+      <key>color1</key>
+      <value>("black", "black")</value>
     </param>
     <param>
-      <key>_rotation</key>
-      <value>0</value>
+      <key>label2</key>
+      <value></value>
     </param>
-  </block>
-  <block>
-    <key>mod_with_ac</key>
     <param>
-      <key>id</key>
-      <value>mod_with_ac_0</value>
+      <key>color2</key>
+      <value>("black", "black")</value>
     </param>
     <param>
-      <key>_enabled</key>
-      <value>True</value>
+      <key>label3</key>
+      <value></value>
     </param>
     <param>
-      <key>constel</key>
-      <value>constel</value>
+      <key>color3</key>
+      <value>("black", "black")</value>
     </param>
     <param>
-      <key>eb</key>
-      <value>eb</value>
+      <key>label4</key>
+      <value></value>
     </param>
     <param>
-      <key>payload_size</key>
-      <value>payload_size</value>
+      <key>color4</key>
+      <value>("black", "black")</value>
     </param>
     <param>
-      <key>gap</key>
-      <value>gap</value>
+      <key>label5</key>
+      <value></value>
     </param>
     <param>
-      <key>sps</key>
-      <value>sps</value>
+      <key>color5</key>
+      <value>("black", "black")</value>
     </param>
     <param>
-      <key>preamble</key>
-      <value>preamble</value>
+      <key>label6</key>
+      <value></value>
     </param>
     <param>
-      <key>puncpat</key>
-      <value>'11'</value>
+      <key>color6</key>
+      <value>("black", "black")</value>
     </param>
     <param>
-      <key>affinity</key>
+      <key>label7</key>
       <value></value>
     </param>
     <param>
-      <key>minoutbuf</key>
-      <value>0</value>
+      <key>color7</key>
+      <value>("black", "black")</value>
     </param>
     <param>
-      <key>maxoutbuf</key>
-      <value>0</value>
+      <key>label8</key>
+      <value></value>
     </param>
     <param>
-      <key>_coordinate</key>
-      <value>(68, 297)</value>
+      <key>color8</key>
+      <value>("black", "black")</value>
     </param>
     <param>
-      <key>_rotation</key>
-      <value>0</value>
-    </param>
-  </block>
-  <block>
-    <key>blocks_ctrlport_monitor_performance</key>
-    <param>
-      <key>id</key>
-      <value>blocks_ctrlport_monitor_performance_0</value>
+      <key>label9</key>
+      <value></value>
     </param>
     <param>
-      <key>_enabled</key>
-      <value>True</value>
+      <key>color9</key>
+      <value>("black", "black")</value>
     </param>
     <param>
-      <key>en</key>
-      <value>True</value>
+      <key>affinity</key>
+      <value></value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(699, 542)</value>
+      <value>(1349, 913)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -2816,34 +2951,22 @@
     </param>
   </block>
   <block>
-    <key>fec_extended_decoder</key>
+    <key>blocks_char_to_float</key>
     <param>
       <key>id</key>
-      <value>fec_extended_decoder_0</value>
+      <value>blocks_char_to_float_0_0_0</value>
     </param>
     <param>
       <key>_enabled</key>
       <value>True</value>
     </param>
     <param>
-      <key>value</key>
-      <value>fec_extended_decoder</value>
-    </param>
-    <param>
-      <key>decoder_list</key>
-      <value>dec</value>
-    </param>
-    <param>
-      <key>threadtype</key>
-      <value>capillary</value>
-    </param>
-    <param>
-      <key>ann</key>
-      <value>None</value>
+      <key>vlen</key>
+      <value>1</value>
     </param>
     <param>
-      <key>puncpat</key>
-      <value>puncpat</value>
+      <key>scale</key>
+      <value>1</value>
     </param>
     <param>
       <key>affinity</key>
@@ -2859,7 +2982,7 @@
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(1056, 595)</value>
+      <value>(773, 815)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -2867,62 +2990,38 @@
     </param>
   </block>
   <block>
-    <key>variable_cc_decoder_def</key>
+    <key>blocks_char_to_float</key>
     <param>
       <key>id</key>
-      <value>dec</value>
+      <value>blocks_char_to_float_0</value>
     </param>
     <param>
       <key>_enabled</key>
       <value>True</value>
     </param>
     <param>
-      <key>value</key>
-      <value>"ok"</value>
-    </param>
-    <param>
-      <key>ndim</key>
+      <key>vlen</key>
       <value>1</value>
     </param>
     <param>
-      <key>dim1</key>
-      <value>16</value>
-    </param>
-    <param>
-      <key>dim2</key>
+      <key>scale</key>
       <value>1</value>
     </param>
     <param>
-      <key>framebits</key>
-      <value>framebits</value>
-    </param>
-    <param>
-      <key>k</key>
-      <value>k</value>
-    </param>
-    <param>
-      <key>rate</key>
-      <value>rate</value>
-    </param>
-    <param>
-      <key>polys</key>
-      <value>polys</value>
+      <key>affinity</key>
+      <value></value>
     </param>
     <param>
-      <key>state_start</key>
+      <key>minoutbuf</key>
       <value>0</value>
     </param>
     <param>
-      <key>state_end</key>
-      <value>-1</value>
-    </param>
-    <param>
-      <key>strb</key>
-      <value>"terminated"</value>
+      <key>maxoutbuf</key>
+      <value>0</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(257, 878)</value>
+      <value>(773, 862)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -3014,6 +3113,36 @@
     <sink_key>0</sink_key>
   </connection>
   <connection>
+    <source_block_id>fec_extended_decoder_0</source_block_id>
+    <sink_block_id>blocks_char_to_float_0_0_0_0</sink_block_id>
+    <source_key>0</source_key>
+    <sink_key>0</sink_key>
+  </connection>
+  <connection>
+    <source_block_id>mod_with_ac_0</source_block_id>
+    <sink_block_id>blocks_char_to_float_0</sink_block_id>
+    <source_key>1</source_key>
+    <sink_key>0</sink_key>
+  </connection>
+  <connection>
+    <source_block_id>digital_correlate_access_code_xx_ts_0</source_block_id>
+    <sink_block_id>digital_binary_slicer_fb_0</sink_block_id>
+    <source_key>0</source_key>
+    <sink_key>0</sink_key>
+  </connection>
+  <connection>
+    <source_block_id>digital_binary_slicer_fb_0</source_block_id>
+    <sink_block_id>blocks_char_to_float_0_0_0</sink_block_id>
+    <source_key>0</source_key>
+    <sink_key>0</sink_key>
+  </connection>
+  <connection>
+    <source_block_id>fec_extended_decoder_0</source_block_id>
+    <sink_block_id>blocks_char_to_float_0_0_0</sink_block_id>
+    <source_key>0</source_key>
+    <sink_key>0</sink_key>
+  </connection>
+  <connection>
     <source_block_id>blocks_char_to_float_0_0_0_0</source_block_id>
     <sink_block_id>qtgui_time_sink_x_0_1</sink_block_id>
     <source_key>0</source_key>
@@ -3021,43 +3150,43 @@
   </connection>
   <connection>
     <source_block_id>fec_extended_decoder_0</source_block_id>
-    <sink_block_id>blocks_char_to_float_0_0_0_0</sink_block_id>
+    <sink_block_id>fec_ber_bf_0</sink_block_id>
     <source_key>0</source_key>
     <sink_key>0</sink_key>
   </connection>
   <connection>
     <source_block_id>mod_with_ac_0</source_block_id>
-    <sink_block_id>blocks_char_to_float_0</sink_block_id>
+    <sink_block_id>fec_ber_bf_0</sink_block_id>
     <source_key>1</source_key>
-    <sink_key>0</sink_key>
+    <sink_key>1</sink_key>
   </connection>
   <connection>
-    <source_block_id>blocks_sub_xx_0</source_block_id>
-    <sink_block_id>qtgui_time_sink_x_0_1_0</sink_block_id>
+    <source_block_id>digital_binary_slicer_fb_0</source_block_id>
+    <sink_block_id>fec_ber_bf_0</sink_block_id>
     <source_key>0</source_key>
     <sink_key>0</sink_key>
   </connection>
   <connection>
-    <source_block_id>blocks_delay_0</source_block_id>
+    <source_block_id>blocks_char_to_float_0_0_0</source_block_id>
     <sink_block_id>blocks_sub_xx_0</sink_block_id>
     <source_key>0</source_key>
-    <sink_key>1</sink_key>
+    <sink_key>0</sink_key>
   </connection>
   <connection>
-    <source_block_id>blocks_char_to_float_0_0_0</source_block_id>
-    <sink_block_id>blocks_sub_xx_0</sink_block_id>
+    <source_block_id>blocks_sub_xx_0</source_block_id>
+    <sink_block_id>qtgui_time_sink_x_0_1_0</sink_block_id>
     <source_key>0</source_key>
     <sink_key>0</sink_key>
   </connection>
   <connection>
     <source_block_id>blocks_char_to_float_0</source_block_id>
-    <sink_block_id>blocks_delay_0</sink_block_id>
+    <sink_block_id>blocks_sub_xx_0</sink_block_id>
     <source_key>0</source_key>
-    <sink_key>0</sink_key>
+    <sink_key>1</sink_key>
   </connection>
   <connection>
-    <source_block_id>fec_extended_decoder_0</source_block_id>
-    <sink_block_id>blocks_char_to_float_0_0_0</sink_block_id>
+    <source_block_id>fec_ber_bf_0</source_block_id>
+    <sink_block_id>qtgui_number_sink_0</sink_block_id>
     <source_key>0</source_key>
     <sink_key>0</sink_key>
   </connection>
diff --git a/gr-fec/grc/fec_ber_bf.xml b/gr-fec/grc/fec_ber_bf.xml
index e4a070fe8b..6d8d85e9ff 100644
--- a/gr-fec/grc/fec_ber_bf.xml
+++ b/gr-fec/grc/fec_ber_bf.xml
@@ -3,13 +3,29 @@
   <name>BER</name>
   <key>fec_ber_bf</key>
   <import>from gnuradio import fec</import>
-  <make>fec.ber_bf($berminerrors, $berlimit)</make>
+  <make>fec.ber_bf($test_mode, $berminerrors, $berlimit)</make>
+
+  <param>
+    <name>Test Mode</name>
+    <key>test_mode</key>
+    <value>False</value>
+    <type>enum</type>
+    <option>
+      <name>False</name>
+      <key>False</key>
+    </option>
+    <option>
+      <name>True</name>
+      <key>True</key>
+    </option>
+  </param>
 
   <param>
     <name>BER Min. Errors</name>
     <key>berminerrors</key>
     <value>100</value>
     <type>int</type>
+    <hide>#if $test_mode() then 'part' else 'all'#</hide>
   </param>
 
   <param>
@@ -17,6 +33,7 @@
     <key>berlimit</key>
     <value>-7.0</value>
     <type>float</type>
+    <hide>#if $test_mode() then 'part' else 'all'#</hide>
   </param>
 
   <sink>
diff --git a/gr-fec/include/gnuradio/fec/ber_bf.h b/gr-fec/include/gnuradio/fec/ber_bf.h
index 9f3691fa21..cc42bcebe6 100644
--- a/gr-fec/include/gnuradio/fec/ber_bf.h
+++ b/gr-fec/include/gnuradio/fec/ber_bf.h
@@ -43,7 +43,7 @@ namespace gr {
       // gr::fec::ber_bf::sptr
       typedef boost::shared_ptr<ber_bf> sptr;
 
-      static sptr make(int berminerrors = 100, float ber_limit = -7.0);
+      static sptr make(bool test_mode = false, int berminerrors=100, float ber_limit=-7.0);
     };
 
   } /* namespace fec */
diff --git a/gr-fec/lib/ber_bf_impl.cc b/gr-fec/lib/ber_bf_impl.cc
index 566b70b88a..d7282ea699 100644
--- a/gr-fec/lib/ber_bf_impl.cc
+++ b/gr-fec/lib/ber_bf_impl.cc
@@ -27,24 +27,25 @@
 #include "ber_bf_impl.h"
 #include "ber_tools.h"
 #include <gnuradio/io_signature.h>
+#include <volk/volk.h>
 #include <math.h>
 
 namespace gr {
   namespace fec {
 
     ber_bf::sptr
-    ber_bf::make(int berminerrors, float ber_limit)
+    ber_bf::make(bool test_mode, int berminerrors, float ber_limit)
     {
       return gnuradio::get_initial_sptr
-        (new ber_bf_impl(berminerrors, ber_limit));
+        (new ber_bf_impl(test_mode, berminerrors, ber_limit));
     }
 
-    ber_bf_impl::ber_bf_impl(int berminerrors, float ber_limit)
+    ber_bf_impl::ber_bf_impl(bool test_mode, int berminerrors, float ber_limit)
       : block("fec_ber_bf",
               io_signature::make(2, 2, sizeof(unsigned char)),
               io_signature::make(1, 1, sizeof(float))),
-        d_total_errors(0), d_berminerrors(berminerrors),
-        d_ber_limit(ber_limit), d_total(0)
+        d_total_errors(0), d_total(0), d_test_mode(test_mode),
+        d_berminerrors(berminerrors), d_ber_limit(ber_limit)
     {
     }
 
@@ -66,48 +67,75 @@ namespace gr {
                               gr_vector_const_void_star &input_items,
                               gr_vector_void_star &output_items)
     {
-      if(d_total_errors >= d_berminerrors) {
-	return -1;
+      if(d_test_mode) {
+        if(d_total_errors >= d_berminerrors) {
+          return -1;
+        }
+        else {
+          unsigned char *inbuffer0 = (unsigned char *)input_items[0];
+          unsigned char *inbuffer1 = (unsigned char *)input_items[1];
+          float *outbuffer = (float *)output_items[0];
+
+          int items = ninput_items[0] <= ninput_items[1] ? ninput_items[0] : ninput_items[1];
+
+          if(items > 0) {
+            /*
+            for(int i = 0; i < items; ++i) {
+              if(inbuffer0[i] != inbuffer1[i]) {
+                GR_LOG_INFO(d_logger, boost::format("%1%/%2%:   %3% versus %4%") \
+                            % i % items % inbuffer0[i] % inbuffer1[i]);
+              }
+            }
+            GR_LOG_INFO(d_logger, boost::format("%1% errors")           \
+                        % (compber(inbuffer0, inbuffer1, items)));
+            */
+
+            d_total_errors += compber(inbuffer0, inbuffer1, items);
+            d_total += items;
+          }
+          consume_each(items);
+
+          if(d_total_errors >= d_berminerrors) {
+            outbuffer[0] = log10(((double)d_total_errors)/(d_total * 8.0));
+            GR_LOG_INFO(d_logger, boost::format("    %1% over %2% --> %3%") \
+                        % d_total_errors % (d_total * 8) % outbuffer[0]);
+            return 1;
+          }
+          else if(log10(((double)d_berminerrors)/(d_total * 8.0)) < d_ber_limit) {
+            GR_LOG_INFO(d_logger, "    Min. BER limit reached");
+            outbuffer[0] = d_ber_limit;
+            d_total_errors = d_berminerrors + 1;
+            return 1;
+          }
+          else {
+            return 0;
+          }
+        }
       }
-      else {
+      else { // streaming mode
         unsigned char *inbuffer0 = (unsigned char *)input_items[0];
-	unsigned char *inbuffer1 = (unsigned char *)input_items[1];
-	float *outbuffer = (float *)output_items[0];
+        unsigned char *inbuffer1 = (unsigned char *)input_items[1];
+        float *outbuffer = (float *)output_items[0];
 
-	int items = ninput_items[0] <= ninput_items[1] ? ninput_items[0] : ninput_items[1];
+        int items = ninput_items[0] <= ninput_items[1] ? ninput_items[0] : ninput_items[1];
 
-	if(items > 0) {
-          /*
-          for(int i = 0; i < items; ++i) {
-            if(inbuffer0[i] != inbuffer1[i]) {
-              GR_LOG_INFO(d_logger, boost::format("%1%/%2%:   %3% versus %4%") \
-                          % i % items % inbuffer0[i] % inbuffer1[i]);
-            }
+        if(items > 0) {
+          uint32_t ret;
+          for(int i = 0; i < items; i++) {
+            volk_32u_popcnt(&ret, static_cast<uint32_t>(inbuffer0[i]^inbuffer1[i]));
+            d_total_errors += ret;
           }
-          GR_LOG_INFO(d_logger, boost::format("%1% errors") \
-                      % (compber(inbuffer0, inbuffer1, items)));
-          */
 
-          d_total_errors += compber(inbuffer0, inbuffer1, items);
           d_total += items;
-	}
-	consume_each(items);
-
-	if(d_total_errors >= d_berminerrors) {
           outbuffer[0] = log10(((double)d_total_errors)/(d_total * 8.0));
-          GR_LOG_INFO(d_logger, boost::format("    %1% over %2% --> %3%")     \
-                      % d_total_errors % (d_total * 8) % outbuffer[0]);
-          return 1;
-	}
-	else if(log10(((double)d_berminerrors)/(d_total * 8.0)) < d_ber_limit) {
-          GR_LOG_INFO(d_logger, "    Min. BER limit reached");
-          outbuffer[0] = d_ber_limit;
-          d_total_errors = d_berminerrors + 1;
+
+          consume_each(items);
           return 1;
-	}
-	else {
+        }
+        else {
+          consume_each(0);
           return 0;
-	}
+        }
       }
     }
 
diff --git a/gr-fec/lib/ber_bf_impl.h b/gr-fec/lib/ber_bf_impl.h
index 326c6be03e..c7faf123ab 100644
--- a/gr-fec/lib/ber_bf_impl.h
+++ b/gr-fec/lib/ber_bf_impl.h
@@ -32,21 +32,22 @@ namespace gr {
     {
     private:
       int d_total_errors;
+      int d_total;
+      bool d_test_mode;
       int d_berminerrors;
       float d_ber_limit;
-      int d_total;
 
     public:
-    ber_bf_impl(int berminerrors = 100, float ber_limit = -7.0);
-    ~ber_bf_impl();
+      ber_bf_impl(bool d_test_mode = false, int berminerrors=100, float ber_limit=-7.0);
+      ~ber_bf_impl();
 
-    int general_work(int noutput_items,
-                     gr_vector_int& ninput_items,
-                     gr_vector_const_void_star &input_items,
-                     gr_vector_void_star &output_items);
+      int general_work(int noutput_items,
+                       gr_vector_int& ninput_items,
+                       gr_vector_const_void_star &input_items,
+                       gr_vector_void_star &output_items);
 
-    void forecast(int noutput_items,
-		  gr_vector_int& ninput_items_required);
+      void forecast(int noutput_items,
+                    gr_vector_int& ninput_items_required);
     };
 
   } /* namespace fec */
author	Tom Rondeau <tom@trondeau.com>	2014-04-13 15:29:01 -0400
committer	Tom Rondeau <tom@trondeau.com>	2014-05-17 17:45:13 -0400
commit	e6fe7b1151dbf1ff056c267dbb887a81e8504a8e (patch)
tree	f1c3fe2f8d38459ea44aa5c60e6db0b736679686
parent	941ce6ab00b60bc9d4dea598226e37af8c04538a (diff)