From 69363dd4d081ad9c759bdc81599e4eea5aace093 Mon Sep 17 00:00:00 2001
From: cmayer <Christoph.Mayer@cern.ch>
Date: Mon, 20 May 2019 15:00:33 +0200
Subject: [PATCH] more debugging logs added

---
 lib/adaptive_dfe_impl.cc          |  4 +++-
 lib/doppler_correction_cc_impl.cc | 10 ++++++----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/lib/adaptive_dfe_impl.cc b/lib/adaptive_dfe_impl.cc
index b04ef59..455bb37 100644
--- a/lib/adaptive_dfe_impl.cc
+++ b/lib/adaptive_dfe_impl.cc
@@ -143,9 +143,11 @@ adaptive_dfe_impl::general_work(int noutput_items,
 
   const int nin = ninput_items[0];
 
+//  GR_LOG_DEBUG(d_logger, str(boost::format("work: %d %d") % ninput_items[0] % (2*_nGuard + _nB + _nF + 1)));
   assert(ninput_items[0] >= 2*_nGuard + _nB + _nF + 1);
   if (ninput_items[0] < 2*_nGuard + _nB + _nF + 1)
     return 0;
+
   int const ninput = ninput_items[0] - _nGuard - _nF;
 
   int nout = 0; // counter for produced output items
@@ -429,7 +431,7 @@ void adaptive_dfe_impl::update_frame_info(pmt::pmt_t data)
   gr::digital::constellation_sptr constell = _constellations[_constellation_index];
   for (int i=0, n=scr_xor.size(); i<n; ++i) {
     for (int j=0, m=constell->bits_per_symbol(); j<m; ++j) {
-      _scramble_xor[i][m-j-1] = 1 - 2*bool(scr_xor[i] & (1<<j));
+      _scramble_xor[i][j] = 1 - 2*bool(scr_xor[i] & (1<<(m-1-j)));
       // GR_LOG_DEBUG(d_logger, str(boost::format("XOR %3d %3d %d") % i % j % _scramble_xor[i][j]));
     }
   }
diff --git a/lib/doppler_correction_cc_impl.cc b/lib/doppler_correction_cc_impl.cc
index 8d4a23b..0bf0040 100644
--- a/lib/doppler_correction_cc_impl.cc
+++ b/lib/doppler_correction_cc_impl.cc
@@ -60,6 +60,7 @@ doppler_correction_cc_impl::doppler_correction_cc_impl(unsigned int preamble_len
   message_port_register_in (_port_name);
   set_msg_handler(_port_name, boost::bind(&doppler_correction_cc_impl::handle_message, this, _1));
   set_tag_propagation_policy(TPP_DONT);
+  set_min_output_buffer(0, _preamble_length<<1);
 }
 
 doppler_correction_cc_impl::~doppler_correction_cc_impl()
@@ -91,8 +92,8 @@ doppler_correction_cc_impl::handle_message(pmt::pmt_t msg)
 void
 doppler_correction_cc_impl::forecast(int noutput_items, gr_vector_int &ninput_items_required)
 {
-  ninput_items_required[0] = _preamble_length + 1;
-//  GR_LOG_DEBUG(d_logger, str(boost::format("forecast: %d %d %d") % noutput_items % ninput_items_required[0] % _preamble_length));
+  ninput_items_required[0] = std::max(int(_preamble_length + 1), noutput_items);
+  // GR_LOG_DEBUG(d_logger, str(boost::format("forecast: %d %d %d") % noutput_items % ninput_items_required[0] % _preamble_length));
 }
 
 int
@@ -103,9 +104,10 @@ doppler_correction_cc_impl::work(int noutput_items,
   gr::thread::scoped_lock lock(d_setlock);
   gr_complex const* in = (gr_complex const*)input_items[0];
   gr_complex *out = (gr_complex *) output_items[0];
-  // GR_LOG_DEBUG(d_logger, str(boost::format("work: %d %d") % noutput_items % _preamble_length));
-  if (noutput_items < _preamble_length)
+  if (noutput_items < _preamble_length) {
+    GR_LOG_DEBUG(d_logger, str(boost::format("work: %d %d") % noutput_items % _preamble_length));
     return 0;
+  }
   noutput_items -= _preamble_length;
   int nout = 0;
   switch (_state) {